Changeset 628

Timestamp:

05/19/2011 01:27:29 AM (12 months ago)

Author:

ofer

Message:

Selected default language now sets the default language for the entire wordpress, allowing MU users sites to have different locales (as WP_LANG can't be set per site)

File:

• trunk/WordPress/plugin/transposh/transposh.php (modified) (3 diffs)

trunk/WordPress/plugin/transposh/transposh.php

@@ -290 +290 @@
             // This one allows to redirect to a static element which we can find, since the redirection will remove
             // the target language, we are able to avoid nasty redirection loops
-            if (is_404 ()) {
+            if (is_404()) {
                 global $wp;
                 if (isset($wp->query_vars['pagename']) && file_exists(ABSPATH . $wp->query_vars['pagename'])) { // Hmm
@@ -1093 +1093 @@
             $lang = '';
         }
-        if (!$lang) return $locale;
+        if (!$lang) $lang = $this->options->get_default_language();
         list ($l, $n, $f, $locale) = explode(',', transposh_consts::$languages[$lang]);
         if ($locale) {
@@ -1100 +1100 @@
             return $lang;
         }
-        return $locale;
+        return $this->options->get_default_language();
     }