Changeset 22266 for branches/version-2_12-multilang/data/class/helper/SC_Helper_Locale.php

Timestamp:

2013/01/17 10:34:51 (11 years ago)

Author:

m_uehara

Message:

#2026 en → en-US に変更しました。

File:

• branches/version-2_12-multilang/data/class/helper/SC_Helper_Locale.php (modified) (2 diffs)

branches/version-2_12-multilang/data/class/helper/SC_Helper_Locale.php

@@ -55 +55 @@
         // If language code is not specified, use site default.
         if (empty($options['lang_code'])) {
-            $lang_code = $options['lang_code'] = defined('LANG_CODE') ? LANG_CODE : 'en';
+            $lang_code = $options['lang_code'] = defined('LANG_CODE') ? LANG_CODE : 'en-US';
         } else {
             $lang_code = $options['lang_code'];
@@ -73 +73 @@
 
         // Get string list of specified language.
-        if ($lang_code != 'en') {
-            $translations = SC_Helper_Locale_Ex::$_instance->get_translations($lang_code, $device_type_id);
-            // Whether a string which corresponding with alias is exist.
-            if (isset($translations[$return])) {
-                $return = $translations[$return];
-            }
+        $translations = SC_Helper_Locale_Ex::$_instance->get_translations($lang_code, $device_type_id);
+        // Whether a string which corresponding with alias is exist.
+        if (isset($translations[$return])) {
+            $return = $translations[$return];
         }