Gettext switching clenaup.

diff --git a/applications/application.php b/applications/application.php
index 052c6861d4b5fa052da5045ed8155d0adcbf6192..ec0de00da541ba80241b26d1ab6a892e4f5031bb 100644 (file)
--- a/applications/application.php
+++ b/applications/application.php
@@ -132,16 +132,18 @@
                                if (@$mod['active'] && isset($mod['entries']))
                                        foreach($mod['entries'] as $entry) {
                                                if ($entry['tab_id'] == $this->id) {
-                                                       $_SESSION['get_text']->add_domain($_SESSION['language']->code, 
-                                                               $mod['path']."/lang");
+                                                       set_ext_domain($mod['path']);
+//                                                     $_SESSION['get_text']->add_domain($_SESSION['language']->code, 
+//                                                             $mod['path']."/lang");
 
                                                        $this->add_rapp_function(
                                                                isset($entry['section']) ? $entry['section'] : 2,
                                                                _($entry['title']), $path_to_root.'/'.$mod['path'].'/'.$entry['url'],
                                                                isset($entry["access"]) ? $entry["access"] : 'SA_OPEN' );
 
-                                                       $_SESSION['get_text']->add_domain($_SESSION['language']->code, 
-                                                               $path_to_root."/lang", $_SESSION['language']->version);
+                                                       set_ext_domain();
+//                                                     $_SESSION['get_text']->add_domain($_SESSION['language']->code, 
+//                                                             $path_to_root."/lang", $_SESSION['language']->version);
                                                }
                                        }
                        }

diff --git a/frontaccounting.php b/frontaccounting.php
index 3324d6bb4bdcd14b978305979626d659b296863c..d3662cd7f293619bb2a591189cea94b9b4f1fad9 100644 (file)
--- a/frontaccounting.php
+++ b/frontaccounting.php
@@ -99,8 +99,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
                        foreach ($extensions as $ext)
                        {
                                if (@($ext['active'] && isset($ext['tabs']))) { // supressed warnings before 2.2 upgrade
-                                       $_SESSION['get_text']->add_domain($_SESSION['language']->code, 
-                                               $ext['path']."/lang");
+                                       set_ext_domain($ext['path']);
                                        foreach($ext['tabs'] as $tab) {
                                                $class = $tab['tab_id']."_app";
                                                if (class_exists($class))
@@ -108,8 +107,7 @@ if (!isset($path_to_root) || isset($_GET['path_to_root']) || isset($_POST['path_
                                        }
                                }
                        }
-                       $_SESSION['get_text']->add_domain($_SESSION['language']->code, 
-                               $path_to_root."/lang", $_SESSION['language']->version);
+                       set_ext_domain();
                        $this->add_application(new setup_app());
                }
 }