Changeset 22085

Timestamp:

2012/11/08 14:01:51 (11 years ago)

Author:

pineray

Message:

#163 テキスト出力多言語対応

文字列のキーが英文となったことをうけた変更.

Location:

branches/version-2_12-multilang/data

Files:

• class/SC_I18n.php (modified) (2 diffs)
• class/SC_Initial.php (modified) (2 diffs)
• class/helper/SC_Helper_Locale.php (modified) (2 diffs)
• include/plural_forms.inc (modified) (1 diff)

branches/version-2_12-multilang/data/class/SC_I18n.php

@@ -44 +44 @@
         // If language code is not specified, use site default.
         if (empty($options['lang_code'])) {
-            $options['lang_code'] = LANG_CODE;
+            if (defined(LANG_CODE)) {
+                $options['lang_code'] = LANG_CODE;
+            } else {
+                $options['lang_code'] = 'en';
+            }
         }
         // If device type ID is not specified, detect the viewing device.
@@ -82 +86 @@
         // If language code is not specified, use site default.
         if (empty($options['lang_code'])) {
-            $options['lang_code'] = LANG_CODE;
+            if (defined(LANG_CODE)) {
+                $options['lang_code'] = LANG_CODE;
+            } else {
+                $options['lang_code'] = 'en';
+            }
         }
         // If device type ID is not specified, detect the viewing device.

branches/version-2_12-multilang/data/class/SC_Initial.php

@@ -190 +190 @@
 
             $mtb_constants = file_get_contents(CACHE_REALDIR . '../mtb_constants_init.php');
-            $errorMessage = SC_I18n_Ex::t('SC_Initial_001', array('T_CACHE_REALDIR' => CACHE_REALDIR), array('lang_code' => 'ja', 'device_type_id' => FALSE));
+            $errorMessage = SC_I18n_Ex::t('SC_Initial_001', array('T_CACHE_REALDIR' => CACHE_REALDIR), array('device_type_id' => FALSE));
             if (is_writable(CACHE_REALDIR)) {
                 $handle = fopen(CACHE_REALDIR . 'mtb_constants.php', 'w');
@@ -206 +206 @@
             }
         } else {
-            die(SC_I18n_Ex::t('SC_Initial_002', array('T_CACHE_REALDIR' => CACHE_REALDIR), array('lang_code' => 'ja', 'device_type_id' => FALSE)));
+            die(SC_I18n_Ex::t('SC_Initial_002', array('T_CACHE_REALDIR' => CACHE_REALDIR), array('device_type_id' => FALSE)));
         }
     }

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

@@ -50 +50 @@
         // Set language code when it is not set.
         if ($lang_code === FALSE) {
-            $lang_code = LANG_CODE;
+            if (defined(LANG_CODE)) {
+                $lang_code = LANG_CODE;
+            } else {
+                $lang_code = 'en';
+            }
         }
         // Get string list of specified language.
-        $translations = $this->get_translations($lang_code, $device_type_id);
-        // Whether a string which corresponding with alias is exist.
-        if (isset($translations[$string])) {
-            return $translations[$string];
-        }
-        else {
+        if ($lang_code == 'en') {
             return $string;
+        } else {
+            $translations = $this->get_translations($lang_code, $device_type_id);
+            // Whether a string which corresponding with alias is exist.
+            if (isset($translations[$string])) {
+                return $translations[$string];
+            }
+            else {
+                return $string;
+            }
         }
     }
@@ -151 +159 @@
         // Set language code when it is not set.
         if ($lang_code === FALSE) {
-            $lang_code = LANG_CODE;
+            if (defined(LANG_CODE)) {
+                $lang_code = LANG_CODE;
+            } else {
+                $lang_code = 'en';
+            }
         }
         // Get a formula

branches/version-2_12-multilang/data/include/plural_forms.inc

@@ -5 +5 @@
 
 return array(
-    'ja' => "nplurals=2; plural=(n!=1);"
+    'en' => "nplurals=2; plural=(n!=1);",
+    'ja' => "nplurals=2; plural=(n!=1);",
 );