Changeset 6583

Timestamp:

09/06/08 17:34:17 (3 months ago)

Author:

p_lindheimer

Message:

closes #3166 includes compatibility mode. translation using module's i18n is done first. If the translated text is the same as the original text, then translation is done against the the default _() which is amp.po at that point. So for previous translation work, it will continue to pull the old translations. All modules should move towards providing their own translations for menu items as this point despite this.

Files:

• freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx_admin.php (modified) (3 diffs)

freepbx/branches/2.5/amp_conf/htdocs/admin/views/freepbx_admin.php

@@ -13 +13 @@
-        $sort_name = Array();
-        $sort_type = Array();
+        $framework_text_domain = Array();
-        // Sorting menu by category and name
-        foreach ($fpbx_menu as $key => $row) {
@@ -19 +20 @@
-                $sort_name[$key] = $row['name'];
-                $sort_type[$key] = $row['type'];
+
+                if (extension_loaded('gettext') && is_dir("modules/".$key."/i18n")) {
+                        bindtextdomain($key,"modules/".$framework_text_domain."/i18n");
+                        bind_textdomain_codeset($key, 'utf8');
+                        $framework_text_domain[$key] = true;
+                } else {
+                        $framework_text_domain[$key] = false;
+                }
-        }
-        
@@ -95 +104 @@
-
-                echo "\t<li class=\"".implode(' ',$li_classes)."\">";
+                if ($framework_text_domain[$key]) {
+                        $label_text = dgettext($key,$row['name']);
+                        if ($label_text == $row['name']) {
+                                $label_text = _($label_text);
+                        }
+                } else {
+                        $label_text = _($row['name']);
+                }
-                if (isset($row['disabled']) && $row['disabled']) {
-_($row['name'])
+$label_text
-                } else {
-_($row['name']).
+ $label_text . 
-                }
-                echo "</li>\n";