pluf2 Commit Details

Date:

2009-10-07 07:53:35 (15 years 2 months ago)

Author:

Loic d'Anterroches

Branch:

master

Commit:

490e44385f0b99641983e38abf66fbb33db7a885

Parents:

6f2a8e11ea6057fc49f6d17205f6e7487b944176

Message:

Refactored the loading of the translation files.

Changes:

File differences

-40
41 41
42 42
43
43 44
44 45
45 46
+        $GLOBALS['_PX_starttime'] = microtime(true);␊
        $GLOBALS['_PX_uniqid'] = uniqid($GLOBALS['_PX_starttime'], true);␊
        $GLOBALS['_PX_signal'] = array();␊
        $GLOBALS['_PX_locale'] = array();␊
        Pluf::loadConfig($config);␊
        date_default_timezone_set(Pluf::f('time_zone', 'Europe/Berlin'));␊
        mb_internal_encoding(Pluf::f('encoding', 'UTF-8'));␊
         $GLOBALS['_PX_starttime'] = microtime(true);␊
         $GLOBALS['_PX_uniqid'] = uniqid($GLOBALS['_PX_starttime'], true);␊
         $GLOBALS['_PX_signal'] = array();␊
+        $GLOBALS['_PX_locale'] = array();␊
         Pluf::loadConfig($config);␊
         date_default_timezone_set(Pluf::f('time_zone', 'Europe/Berlin'));␊
         mb_internal_encoding(Pluf::f('encoding', 'UTF-8'));␊

-58
59 59
60 60
61 
62 
63 
64 
65 
66 
67 
68 
61
69 62
70 63
71 64
+            // will default to 'en'␊
            $lang = Pluf_Translation::getAcceptedLanguage(Pluf::f('languages', array('en')));␊
        }␊
        $GLOBALS['_PX_current_locale'] = $lang;␊
        $GLOBALS['_PX_locale'] = array();␊
        $GLOBALS['_PX_locale'][$lang] = array();␊
        foreach (Pluf::f('installed_apps') as $app) {␊
            if (false != ($pofile=Pluf::fileExists($app.'/locale/'.$lang.'/'.strtolower($app).'.po'))) {␊
                $GLOBALS['_PX_locale'][$lang] += Pluf_Translation::readPoFile($pofile);␊
            }␊
        }␊
        Pluf_Translation::loadSetLocale($lang);␊
        $request->language_code = $lang;␊
        return false;␊
    }␊
             // will default to 'en'␊
             $lang = Pluf_Translation::getAcceptedLanguage(Pluf::f('languages', array('en')));␊
         }␊
-        $GLOBALS['_PX_current_locale'] = $lang;␊
-        $GLOBALS['_PX_locale'] = array();␊
-        $GLOBALS['_PX_locale'][$lang] = array();␊
-        foreach (Pluf::f('installed_apps') as $app) {␊
-            if (false != ($pofile=Pluf::fileExists($app.'/locale/'.$lang.'/'.strtolower($app).'.po'))) {␊
-                $GLOBALS['_PX_locale'][$lang] += Pluf_Translation::readPoFile($pofile);␊
-            }␊
-        }␊
+        Pluf_Translation::loadSetLocale($lang);␊
         $request->language_code = $lang;␊
         return false;␊
     }␊

-52
53 53
54 54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
55 74
56 75
57 76
+                         'de' => 'plural_2not1',␊
                                        );␊
␊
    public static function loadSetLocale($lang)␊
    {␊
        $GLOBALS['_PX_current_locale'] = $lang;␊
        if (isset($GLOBALS['_PX_locale'][$lang])) {␊
            return; // We consider that it was already loaded.␊
        }␊
        $GLOBALS['_PX_locale'][$lang] = array();␊
        foreach (Pluf::f('installed_apps') as $app) {␊
            if (false != ($pofile=Pluf::fileExists($app.'/locale/'.$lang.'/'.strtolower($app).'.po'))) {␊
                $GLOBALS['_PX_locale'][$lang] += Pluf_Translation::readPoFile($pofile);␊
            }␊
        }␊
    }␊
␊
    public static function getLocale()␊
    {␊
        return $GLOBALS['_PX_current_locale'];␊
    }␊
␊
    /**␊
     * Get the plural form for a given locale.␊
     */␊
                          'de' => 'plural_2not1',␊
                                         );␊
 ␊
+    public static function loadSetLocale($lang)␊
+    {␊
+        $GLOBALS['_PX_current_locale'] = $lang;␊
+        if (isset($GLOBALS['_PX_locale'][$lang])) {␊
+            return; // We consider that it was already loaded.␊
+        }␊
+        $GLOBALS['_PX_locale'][$lang] = array();␊
+        foreach (Pluf::f('installed_apps') as $app) {␊
+            if (false != ($pofile=Pluf::fileExists($app.'/locale/'.$lang.'/'.strtolower($app).'.po'))) {␊
+                $GLOBALS['_PX_locale'][$lang] += Pluf_Translation::readPoFile($pofile);␊
+            }␊
+        }␊
+    }␊
+␊
+    public static function getLocale()␊
+    {␊
+        return $GLOBALS['_PX_current_locale'];␊
+    }␊
+␊
     /**␊
      * Get the plural form for a given locale.␊
      */␊

Download the corresponding diff file

pluf2

File differences

Branches