Changeset 639 for trunk

Timestamp:

06/22/2011 01:11:53 PM (11 months ago)

Author:

ofer

Message:

Add the option to enable/disable default locale overriding

Location:

trunk/WordPress/plugin/transposh

Files:

• transposh.php (modified) (1 diff)
• wp/transposh_admin.php (modified) (2 diffs)
• wp/transposh_options.php (modified) (5 diffs)

trunk/WordPress/plugin/transposh/transposh.php

@@ -1087 +1087 @@
     }
 
+    /**
+     * This function makes sure wordpress sees the appropriate locale on translated pages for .po/.mo and mu integration
+     * @param string $locale
+     * @return string 
+     */
     function transposh_locale_filter($locale) {
-        //logger($locale);
         $lang = transposh_utils::get_language_from_url($_SERVER['REQUEST_URI'], $this->home_url);
         if (!$this->options->is_viewable_language($lang)) {
             $lang = '';
         }
-        if (!$lang) $lang = $this->options->get_default_language();
+        if (!$lang) {
+            if (!$this->options->get_transposh_default_locale_override()) {
+                return $locale;
+            }
+            $lang = $this->options->get_default_language();
+        }
         list ($l, $n, $f, $locale) = explode(',', transposh_consts::$languages[$lang]);
-        if ($locale) {
-            return $locale;
-        } else {
-            return $lang;
-        }
-        return $this->options->get_default_language();
+
+        return ($locale) ? $locale : $lang;
     }
 

trunk/WordPress/plugin/transposh/wp/transposh_admin.php

@@ -114 +114 @@
         $this->transposh->options->set_enable_url_translate($_POST[ENABLE_URL_TRANSLATE]);
         $this->transposh->options->set_transposh_gettext_integration($_POST[TRANSPOSH_GETTEXT_INTEGRATION]);
+        $this->transposh->options->set_transposh_default_locale_override($_POST[TRANSPOSH_DEFAULT_LOCALE_OVERRIDE]);
         $this->transposh->options->set_preferred_translator($_POST[PREFERRED_TRANSLATOR]);
         $this->transposh->options->set_transposh_key($_POST[TRANSPOSH_KEY]);
@@ -452 +453 @@
         echo '<input type="checkbox" value="1" name="' . TRANSPOSH_GETTEXT_INTEGRATION . '" ' . $this->checked($this->transposh->options->get_transposh_gettext_integration()) . '/> ' .
         __('Enable integration of Transposh with existing gettext interface (.po/.mo files)', TRANSPOSH_TEXT_DOMAIN);
+
+        /**
+         * Insert the option to enable default locale override
+         * Enabled by default.
+         * @since 0.7.5
+         */
+        echo '<h4>' . __('Enable override for default locale', TRANSPOSH_TEXT_DOMAIN) . '</h4>';
+        echo '<input type="checkbox" value="1" name="' . TRANSPOSH_DEFAULT_LOCALE_OVERRIDE . '" ' . $this->checked($this->transposh->options->get_transposh_default_locale_override()) . '/> ' .
+        __('Enable overriding the default locale that is set in WP_LANG on default languages pages (such as untranslated pages and admin pages)', TRANSPOSH_TEXT_DOMAIN);
     }
 

trunk/WordPress/plugin/transposh/wp/transposh_options.php

@@ -47 +47 @@
 //Option to enable/disable url translation @since 0.5.3
 define('ENABLE_URL_TRANSLATE', 'enable_url_translate');
+//Make the gettext interface optional (@since 0.6.4)
+define('TRANSPOSH_GETTEXT_INTEGRATION', 'transposh_gettext_integration');
+//Allow override for default locale (@since 0.7.5)
+define('TRANSPOSH_DEFAULT_LOCALE_OVERRIDE', 'transposh_locale_override');
 //Option to enable/disable rewrite of permalinks
 define('ENABLE_PERMALINKS', 'enable_permalinks');
@@ -69 +73 @@
 //Stores the site key to transposh services (backup @since 0.5.0)
 define('TRANSPOSH_BACKUP_SCHEDULE', 'transposh_backup_schedule');
-//Make the gettext interface optional (@since 0.6.4)
-define('TRANSPOSH_GETTEXT_INTEGRATION', 'transposh_gettext_integration');
 
 class transposh_plugin_options {
@@ -93 +95 @@
         $this->set_default_option_value(PREFERRED_TRANSLATOR, 1);
         $this->set_default_option_value(TRANSPOSH_GETTEXT_INTEGRATION, 1);
+        $this->set_default_option_value(TRANSPOSH_DEFAULT_LOCALE_OVERRIDE, 1);
         $this->set_default_option_value(VIEWABLE_LANGS);
         $this->set_default_option_value(EDITABLE_LANGS);
@@ -260 +263 @@
     }
 
+    function get_transposh_default_locale_override() {
+        return $this->options[TRANSPOSH_DEFAULT_LOCALE_OVERRIDE];
+    }
+
     /**
      * Sets a value at the options array
@@ -389 +396 @@
         $val = ($val) ? 1 : 0;
         $this->set_value($val, $this->options[TRANSPOSH_GETTEXT_INTEGRATION]);
+    }
+
+    function set_transposh_default_locale_override($val) {
+        $val = ($val) ? 1 : 0;
+        $this->set_value($val, $this->options[TRANSPOSH_DEFAULT_LOCALE_OVERRIDE]);
     }