Changeset 22049

Timestamp:

2012/10/02 08:57:27 (12 years ago)

Author:

pineray

Message:

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

引数のデフォルト値を定数から変更.

File:

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

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 = FALSE) {
+    function get_locale($string, $lang_code = FALSE, $device_type_id = FALSE) {
+        // Set language code when it is not set.
+        if ($lang_code === FALSE) {
+            $lang_code = LANG_CODE;
+        }
         // Get string list of specified language.
         $translations = $this->get_translations($lang_code, $device_type_id);
@@ -66 +70 @@
      * @return  array   strings
      */
-    function get_translations($lang_code = LANG_CODE, $device_type_id = FALSE) {
+    function get_translations($lang_code, $device_type_id = FALSE) {
         $translations_key = "translations_" . $lang_code . "_" . $device_type_id;
         // If the strings of specified language is not loaded
@@ -97 +101 @@
      * @return  array   file list
      */
-    function get_locale_file_list($lang_code = LANG_CODE, $device_type_id = FALSE) {
+    function get_locale_file_list($lang_code, $device_type_id = FALSE) {
         $file_list = array();
 
@@ -108 +112 @@
 
         // Get a list of enabled plugins.
-        $arrPluginDataList = SC_Plugin_Util_Ex::getEnablePlugin();
-        // Get the plugins directory.
-        $arrPluginDirectory = SC_Plugin_Util_Ex::getPluginDirectory();
-        foreach ($arrPluginDataList as $arrPluginData) {
-            // Check that the plugin filename is contained in the list of plugins directory.
-            if (array_search($arrPluginData['plugin_code'], $arrPluginDirectory) !== false) {
-                // Path to the plugin locale file.
-                $plugin_locale_path = PLUGIN_UPLOAD_REALDIR . $arrPluginData['plugin_code'] . "/locales/{$lang_code}.mo";
-                // If a locale file of specified language is exist, add to the file list.
-                if (file_exists($plugin_locale_path)) {
-                    $file_list[] = $plugin_locale_path;
+        if (defined(PLUGIN_UPLOAD_REALDIR)) {
+            $arrPluginDataList = SC_Plugin_Util_Ex::getEnablePlugin();
+            // Get the plugins directory.
+            $arrPluginDirectory = SC_Plugin_Util_Ex::getPluginDirectory();
+            foreach ($arrPluginDataList as $arrPluginData) {
+                // Check that the plugin filename is contained in the list of plugins directory.
+                if (array_search($arrPluginData['plugin_code'], $arrPluginDirectory) !== false) {
+                    // Path to the plugin locale file.
+                    $plugin_locale_path = PLUGIN_UPLOAD_REALDIR . $arrPluginData['plugin_code'] . "/locales/{$lang_code}.mo";
+                    // If a locale file of specified language is exist, add to the file list.
+                    if (file_exists($plugin_locale_path)) {
+                        $file_list[] = $plugin_locale_path;
+                    }
                 }
             }
@@ -142 +148 @@
      * @return integer  index
      */
-    function get_plural_index($count, $lang_code = LANG_CODE) {
+    function get_plural_index($count, $lang_code = FALSE) {
+        // Set language code when it is not set.
+        if ($lang_code === FALSE) {
+            $lang_code = LANG_CODE;
+        }
         // Get a formula
         $string = $this->get_plural_forms($lang_code);
@@ -164 +174 @@
      * @return  string  formula
      */
-    function get_plural_forms($lang_code = LANG_CODE) {
+    function get_plural_forms($lang_code) {
         // If formula is empty, include the file.
         if(empty($this->_plural_forms)){