[Gforge-commits] gforge/www/include BaseLanguage.class,1.18,1.19

[gsmet]

Update of /cvsroot/gforge/gforge/www/include
In directory db.perdue.net:/tmp/cvs-serv25502/www/include

Modified Files:
        BaseLanguage.class 
Log Message:
fixed conflicts

Index: BaseLanguage.class
===================================================================
RCS file: /cvsroot/gforge/gforge/www/include/BaseLanguage.class,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- BaseLanguage.class  22 Jul 2004 09:08:23 -0000      1.18
+++ BaseLanguage.class  22 Jul 2004 09:40:40 -0000      1.19
@@ -144,14 +144,7 @@
         * @param string $lang language name
         */     
        function loadLanguage($lang) {
-<<<<<<< BaseLanguage.class
-               $cachePath = $this->getLocalizationCachePath($lang);
-
-               $pluginManager =& plugin_manager_get_object();
-               $pluginNames =& $pluginManager->getPlugins();
-=======
                $cachePath = $this->getLocalizationCachePath($lang);
->>>>>>> 1.17
 
                $pluginManager =& plugin_manager_get_object();
                $pluginNames =& $pluginManager->getPlugins();
@@ -168,20 +161,8 @@
                }
                $this->loadGlobalLanguage($lang);
 
-<<<<<<< BaseLanguage.class
-               $this->dependencies = array();
-               if($lang != 'Base') {
-                       $this->loadGlobalLanguage('Base');
-               }
-               $this->loadGlobalLanguage($lang);
-
-               $this->pluginDependencies = array();
-               if($lang != 'Base') {
-                       $this->loadPluginSpecificLanguage('Base', $pluginNames);
-=======
                $this->pluginDependencies = array();
-               if ( $lang != 'Base' )
-               {
+               if ( $lang != 'Base' ) {
                        $this->loadPluginSpecificLanguage('Base', $pluginNames);
                }
                $this->loadPluginSpecificLanguage($lang, $pluginNames);
@@ -189,14 +170,6 @@
                $this->lang = $lang ;
                if($GLOBALS['sys_localization_enable_caching']) {
                        $this->writeLocalizationCache($cachePath);
->>>>>>> 1.17
-               }
-<<<<<<< BaseLanguage.class
-               $this->loadPluginSpecificLanguage($lang, $pluginNames);
-               
-               $this->lang = $lang ;
-               if($GLOBALS['sys_localization_enable_caching']) {
-                       $this->writeLocalizationCache($cachePath);
                }
        }
 
@@ -207,17 +180,6 @@
         */
        function loadGlobalLanguage($lang) {
                global $sys_theme, $sys_urlroot;
-=======
-       }
-
-       /**
-        * loadGlobalLanguage - load localized strings of the selected language 
for the global site
-        *
-        * @param string $lang language name
-        */
-       function loadGlobalLanguage($lang) {
-               global $sys_theme, $sys_urlroot;
->>>>>>> 1.17
 
                // Customization by language in 
$sys_urlroot/include/languages/<Language>.tab
                $fname = $sys_urlroot.'/include/languages/'.$lang.'.tab';
@@ -237,7 +199,6 @@
                if (file_exists ($fltname)) {
                        $this->loadLanguageFile($fltname) ;
                }
-<<<<<<< BaseLanguage.class
        }
 
        /**
@@ -257,28 +218,6 @@
                                $this->loadLanguageFile($specificLanguagePath);
                        }
                        $this->pluginDependencies[] = $pluginName;
-=======
-       }
-
-       /**
-        * loadPluginSpecificLanguage - load localized strings of the selected 
language for installed plugins
-        *
-        * @param string $lang language name
-        * @param string $pluginNames plugin names
-        */
-       function loadPluginSpecificLanguage($lang, $pluginNames) {
-               foreach($pluginNames AS $pluginName) {
-                       $plugin =& plugin_get_object($pluginName);
-                       $languagePath = $plugin->getLanguagePath().$lang.'.tab';
-                       $specificLanguagePath = 
$plugin->getSpecificLanguagePath().$lang.'.tab';
-                       if(file_exists($languagePath)) {
-                               $this->loadLanguageFile($languagePath);
-                       }
-                       if(file_exists($specificLanguagePath)) {
-                               $this->loadLanguageFile($specificLanguagePath);
-                       }
-                       $this->pluginDependencies[] = $pluginName;
->>>>>>> 1.17
                }
        }