Changeset 6937

Timestamp:

10/05/08 09:35:26 (2 months ago)

Author:

p_lindheimer

Message:

additional localization tweaks, if a module does not have an i18n, then use amp and not the modules's for certain 'hooks'

Files:

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

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

@@ -863 +863 @@
-                $function = $mod."_check_extensions";
-                if (function_exists($function)) {
+                        $prev_domain = textdomain(NULL);
-                        if (isset($_COOKIE['lang']) && is_dir("./modules/$mod/i18n/".$_COOKIE['lang'])) {
-                                $prev_domain = textdomain(NULL);
-                                bindtextdomain($mod,"./modules/$mod/i18n");
-                                bind_textdomain_codeset($mod, 'utf8');
-                                textdomain($mod);
-                                $module_usage = $function($exten);
-                                textdomain($prev_domain);
-                        } else {
+                                textdomain('amp');
-                                $module_usage = $function($exten);
-                        }
@@ -876 +876 @@
-                                $exten_usage[$mod] = $module_usage;
-                        }
+                        textdomain($prev_domain);
-                }
-        }
@@ -924 +925 @@
-                $function = $mod."_check_destinations";
-                if (function_exists($function)) {
+                        $prev_domain = textdomain(NULL);
-                        if (isset($_COOKIE['lang']) && is_dir("./modules/$mod/i18n/".$_COOKIE['lang'])) {
-                                $prev_domain = textdomain(NULL);
-                                bindtextdomain($mod,"./modules/$mod/i18n");
-                                bind_textdomain_codeset($mod, 'utf8');
-                                textdomain($mod);
-                                $module_usage = $function($dest);
-                                textdomain($prev_domain);
-                        } else {
+                                textdomain('amp');
-                                $module_usage = $function($dest);
-                        }
@@ -937 +938 @@
-                                $dest_usage[$mod] = $module_usage;
-                        }
+                        textdomain($prev_domain);
-                }
-        }
@@ -1084 +1086 @@
-                                $function = $mod."_getdestinfo";
-                                if (function_exists($function)) {
+                                        $prev_domain = textdomain(NULL);
-                                        if (isset($_COOKIE['lang']) && is_dir("./modules/$mod/i18n/".$_COOKIE['lang'])) {
-                                                $prev_domain = textdomain(NULL);
-                                                bindtextdomain($mod,"./modules/$mod/i18n");
-                                                bind_textdomain_codeset($mod, 'utf8');
-                                                textdomain($mod);
-                                                $check_module = $function($target);
-                                                textdomain($prev_domain);
-                                        } else {
+                                                textdomain('amp');
-                                                $check_module = $function($target);
-                                        }
+                                        textdomain($prev_domain);
-                                        if ($check_module !== false) {
-                                                $found_owner = true;