Pluf Framework Commit Details

Date:

2011-03-10 03:38:38 (14 years 8 months ago)

Author:

William Martin

Branch:

develop, master

Commit:

cdd0c69102fb4b2ba068c100f10f2518f8eeaa2a

Parents:

ee85e01f9faff7fc3989dd43d6bba8d1cb660308

Message:

Use only the language part of the locale to resolve the name of the configured / available language (closes code review )

Changes:

File differences

-831
832 832
833 833
834 
834
835
835 836
836 837
837 838
+        $l = array();␊
        $nl = self::getNativeLanguages();␊
        foreach (Pluf::f('languages', array('en')) as $lang) {␊
            $l[mb_convert_case($nl[$lang], MB_CASE_TITLE, 'UTF-8')] = $lang;␊
            $lang2 = substr($lang, 0, 2);␊
            $l[mb_convert_case($nl[$lang2], MB_CASE_TITLE, 'UTF-8')] = $lang;␊
        }␊
        return $l;␊
    }␊
         $l = array();␊
         $nl = self::getNativeLanguages();␊
         foreach (Pluf::f('languages', array('en')) as $lang) {␊
-            $l[mb_convert_case($nl[$lang], MB_CASE_TITLE, 'UTF-8')] = $lang;␊
+            $lang2 = substr($lang, 0, 2);␊
+            $l[mb_convert_case($nl[$lang2], MB_CASE_TITLE, 'UTF-8')] = $lang;␊
         }␊
         return $l;␊
     }␊