Pluf Framework Commit Details

Date:

2009-03-09 12:03:26 (15 years 9 months ago)

Author:

Loic d'Anterroches

Branch:

develop, master

Commit:

ea0db1b83c98a4fb598837e42313111a5920afc4

Parents:

87772252b02d03d107d6580eef4588f83466e7e5

Message:

Fixed issue 150, prevent loading empty .po file.

Changes:

File differences

-62
63 63
64 64
65 
66 
65
66
67
67 68
68 69
69 70
+        $GLOBALS['_PX_locale'] = array();␊
        $GLOBALS['_PX_locale'][$lang] = array();␊
        foreach (Pluf::f('installed_apps') as $app) {␊
            $pofile = Pluf::fileExists($app.'/locale/'.$lang.'/'.strtolower($app).'.po');␊
            $GLOBALS['_PX_locale'][$lang] += Pluf_Translation::readPoFile($pofile);␊
            if (false != ($pofile=Pluf::fileExists($app.'/locale/'.$lang.'/'.strtolower($app).'.po'))) {␊
                $GLOBALS['_PX_locale'][$lang] += Pluf_Translation::readPoFile($pofile);␊
            }␊
        }␊
        $request->language_code = $lang;␊
        return false;␊
         $GLOBALS['_PX_locale'] = array();␊
         $GLOBALS['_PX_locale'][$lang] = array();␊
         foreach (Pluf::f('installed_apps') as $app) {␊
-            $pofile = Pluf::fileExists($app.'/locale/'.$lang.'/'.strtolower($app).'.po');␊
-            $GLOBALS['_PX_locale'][$lang] += Pluf_Translation::readPoFile($pofile);␊
+            if (false != ($pofile=Pluf::fileExists($app.'/locale/'.$lang.'/'.strtolower($app).'.po'))) {␊
+                $GLOBALS['_PX_locale'][$lang] += Pluf_Translation::readPoFile($pofile);␊
+            }␊
         }␊
         $request->language_code = $lang;␊
         return false;␊