Changeset 22266 for branches/version-2_12-multilang/data

Timestamp:

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

Author:

m_uehara

Message:

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

Location:

branches/version-2_12-multilang/data

Files:

• Smarty/templates/default_en-US (moved) (moved from branches/version-2_12-multilang/data/Smarty/templates/default_en)
• Smarty/templates/sphone_en-US (moved) (moved from branches/version-2_12-multilang/data/Smarty/templates/sphone_en)
• class/helper/SC_Helper_Locale.php (modified) (2 diffs)
• include/common.php (modified) (3 diffs)
• locales/en-US.mo (moved) (moved from branches/version-2_12-multilang/data/locales/en.mo)
• locales/en-US.po (moved) (moved from branches/version-2_12-multilang/data/locales/en.po)
• mtb_constants_init_en-US.php (moved) (moved from branches/version-2_12-multilang/data/mtb_constants_init_en.php) (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];
         }
 

branches/version-2_12-multilang/data/include/common.php

@@ -68 +68 @@
         $translated_single = $single;
         $translated_plural = $plural;
-        $options['lang_code'] = 'en';
+        $options['lang_code'] = 'en-US';
     }
 
@@ -103 +103 @@
  * @return integer  index
  */
-function get_plural_index($count, $lang_code = 'en') {
+function get_plural_index($count, $lang_code = 'en-US') {
     static $plural_indexes = array();
 
@@ -124 +124 @@
             $plural_indexes[$lang_code][$count] = $plural;
         // If there is no plural formula for English
-        } elseif ($lang_code == 'en') {
+        } elseif ($lang_code == 'en-US') {
             $plural_indexes[$lang_code][$count] = (int) ($count != 1);
         // Otherwise, return -1 (unknown).

branches/version-2_12-multilang/data/mtb_constants_init_en-US.php

@@ -31 +31 @@
 define('UPDATE_HTTP', "http://www.ec-cube.net/info/index.php");
 /** Language code */
-define('LANG_CODE', "en");
+define('LANG_CODE', "en-US");
 /** Text code */
 define('CHAR_CODE', "UTF-8");
@@ -324 +324 @@
 define('SLTEXT_LEN', 500);
 /** Default template name (PC) */
-define('DEFAULT_TEMPLATE_NAME', "default_en");
+define('DEFAULT_TEMPLATE_NAME', "default_en-US");
 /** Default template name (mobile) */
 define('MOBILE_DEFAULT_TEMPLATE_NAME', "mobile");
 /** Default template name (smartphone) */
-define('SMARTPHONE_DEFAULT_TEMPLATE_NAME', "sphone_en");
+define('SMARTPHONE_DEFAULT_TEMPLATE_NAME', "sphone_en-US");
 /** Template name */
-define('TEMPLATE_NAME', "default_en");
+define('TEMPLATE_NAME', "default_en-US");
 /** Mobile template name */
 define('MOBILE_TEMPLATE_NAME', "mobile");
 /** Smartphone template name */
-define('SMARTPHONE_TEMPLATE_NAME', "sphone_en");
+define('SMARTPHONE_TEMPLATE_NAME', "sphone_en-US");
 /** SMARTY template */
 define('SMARTY_TEMPLATES_REALDIR',  DATA_REALDIR . "Smarty/templates/");