Changeset 22045

Timestamp:

2012/10/01 08:54:42 (12 years ago)

Author:

pineray

Message:

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

デバイス別の言語ファイルを読み込まないオプションを追加.

Location:

branches/version-2_12-multilang/data/class

Files:

• SC_I18n.php (modified) (2 diffs)
• SC_Initial.php (modified) (1 diff)
• helper/SC_Helper_Locale.php (modified) (5 diffs)

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

@@ -47 +47 @@
         }
         // If device type ID is not specified, detect the viewing device.
-        if (empty($options['device_type_id'])) {
+        if (!isset($options['device_type_id']) || ($options['device_type_id'] !== FALSE && !strlen($options['device_type_id']))) {
             $options['device_type_id'] = SC_Display_Ex::detectDevice();
         }
@@ -85 +85 @@
         }
         // If device type ID is not specified, detect the viewing device.
-        if (empty($options['device_type_id'])) {
+        if (!isset($options['device_type_id']) || ($options['device_type_id'] !== FALSE && !strlen($options['device_type_id']))) {
             $options['device_type_id'] = SC_Display_Ex::detectDevice();
         }

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

@@ -207 +207 @@
             }
         } else {
-            die(SC_I18n_Ex::t('SC_INITIAL_ERROR_NOT_FOUND', array('T_CACHE_REALDIR' => CACHE_REALDIR), array('lang_code' => 'ja', 'device_type_id' => 10)));
+            die(SC_I18n_Ex::t('SC_INITIAL_ERROR_NOT_FOUND', array('T_CACHE_REALDIR' => CACHE_REALDIR), array('lang_code' => 'ja', 'device_type_id' => FALSE)));
         }
     }

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

@@ -47 +47 @@
      * @return  string  a string corresponding with message alias
      */
-    function get_locale($string, $lang_code = LANG_CODE, $device_type_id = DEVICE_TYPE_PC) {
+    function get_locale($string, $lang_code = LANG_CODE, $device_type_id = FALSE) {
         // Get string list of specified language.
         $translations = $this->get_translations($lang_code, $device_type_id);
@@ -66 +66 @@
      * @return  array   strings
      */
-    function get_translations($lang_code = LANG_CODE, $device_type_id = DEVICE_TYPE_PC) {
+    function get_translations($lang_code = LANG_CODE, $device_type_id = FALSE) {
+        $translations_key = "translations_" . $lang_code . "_" . $device_type_id;
         // If the strings of specified language is not loaded
-        if (empty($this->_translations[$lang_code][$device_type_id])) {
+        if (empty($this->_translations[$translations_key])) {
             $translations = array();
 
@@ -83 +84 @@
             }
 
-            $this->_translations[$lang_code][$device_type_id] = $translations;
+            $this->_translations[$translations_key] = $translations;
         }
 
-        return $this->_translations[$lang_code][$device_type_id];
+        return $this->_translations[$translations_key];
     }
 
@@ -96 +97 @@
      * @return  array   file list
      */
-    function get_locale_file_list($lang_code = LANG_CODE, $device_type_id = DEVICE_TYPE_PC) {
+    function get_locale_file_list($lang_code = LANG_CODE, $device_type_id = FALSE) {
         $file_list = array();
 
@@ -123 +124 @@
 
         // Path to the template locale file.
-        $template_locale_path = HTML_REALDIR . SC_Helper_PageLayout_Ex::getUserDir($device_type_id, true) . "locales/{$lang_code}.mo";
-        // If a locale file of specified language is exist, add to the file list.
-        if (file_exists($template_locale_path)) {
-            $file_list[] = $template_locale_path;
+        if ($device_type_id !== FALSE) {
+            $template_locale_path = HTML_REALDIR . SC_Helper_PageLayout_Ex::getUserDir($device_type_id, true) . "locales/{$lang_code}.mo";
+            // If a locale file of specified language is exist, add to the file list.
+            if (file_exists($template_locale_path)) {
+                $file_list[] = $template_locale_path;
+            }
         }