Changeset 6901

Timestamp:

09/30/08 14:58:51 (2 months ago)

Author:

p_lindheimer

Message:

more textdomain changes to make sure callbacks have the proper translation domain for the hosting modules

Files:

• freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php (modified) (7 diffs)

freepbx/branches/2.5/amp_conf/htdocs/admin/functions.inc.php

@@ -669 +669 @@
-                                        textdomain($thismod);
-                        
-                                        freepbx_debug("applying hook for $thismod with domain: $saved_domain");
-                                        if ($hookReturn = $funct($target_menuid, $viewing_itemid)) {
-                                                $this->hookHtml .= $hookReturn;
@@ -675 +674 @@
-
-                                        textdomain('amp');
-                                        freepbx_debug("returned to $thismod with domain: $saved_domain");
-                                } else {
-                                        if ($hookReturn = $funct($target_menuid, $viewing_itemid)) {
@@ -861 +859 @@
-                $exten = array($exten);
-        }
+
-        foreach(array_keys($module_hash) as $mod) {
-                $function = $mod."_check_extensions";
-                if (function_exists($function)) {
-
+
+
+
+
+
+
+
+
+
+
-                        if (!empty($module_usage)) {
-                                $exten_usage[$mod] = $module_usage;
@@ -901 +909 @@
-function framework_check_destination_usage($dest=true, $module_hash=false) {
-        global $active_modules;
+
-        $dest_usage = array();
-        $dest_matches = array();
@@ -911 +920 @@
-                $dest = array($dest);
-        }
+
-        foreach(array_keys($module_hash) as $mod) {
-                $function = $mod."_check_destinations";
-                if (function_exists($function)) {
-
+
+
+
+
+
+
+
+
+
+
+
-                        if (!empty($module_usage)) {
-                                $dest_usage[$mod] = $module_usage;
@@ -1022 +1042 @@
-                }
-                $object = $usage_count > 1 ? _("Objects"):_("Object");
-_(
+dgettext('amp',
-                             'tooltip' => $str,
-                                                                );
@@ -1061 +1081 @@
-                        $dest_results[$target] = $dest_cache[$target];
-                } else {
-
-                        $found_owner = false;
-                        foreach(array_keys($module_hash) as $mod) {
-                                $function = $mod."_getdestinfo";
-                                if (function_exists($function)) {
-
+
+
+
+
+
+
+
+
+
+
-                                        if ($check_module !== false) {
-                                                $found_owner = true;