3 files changed, 60 insertions, 6 deletions

diff --git a/modules/user/helpers/user.php b/modules/user/helpers/user.php
index 40acc2ec..b9162b92 100644
--- a/modules/user/helpers/user.php
+++ b/modules/user/helpers/user.php
@@ -87,6 +87,9 @@ class user_Core {
 
   private static function _add_locale_dropdown(&$form, $user=null) {
     $locales = locales::installed();
+    foreach ($locales as $locale => $display_name) {
+      $locales[$locale] = SafeString::of_safe_html($display_name);
+    }
     if (count($locales) > 1) {
       // Put "none" at the first position in the array
       $locales = array_merge(array("" => t("« none »")), $locales);
@@ -336,4 +339,19 @@ class user_Core {
     }
     return $salt . md5($salt . $password);
   }
+
+  static function cookie_locale() {
+    $cookie_data = Input::instance()->cookie("g_locale");
+    $locale = null;
+    if ($cookie_data) {
+      if (preg_match("/^([a-z]{2,3}(?:_[A-Z]{2})?)$/", trim($cookie_data), $matches)) {
+        $requested_locale = $matches[1];
+        $installed_locales = locales::installed();
+        if (isset($installed_locales[$requested_locale])) {
+          $locale = $requested_locale;
+        }
+      }
+    }
+    return $locale;
+  }
 }
\ No newline at end of file
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index 4bde224b..ede4e515 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -23,12 +23,7 @@ class user_event_Core {
    */
   static function gallery_ready() {
     user::load_user();
-
-    $locale = user::active()->locale;
-    if (!empty($locale)) {
-      // TODO(andy_st): Check session data as well.
-      I18n::instance()->locale($locale);
-    }
+    self::set_request_locale();
   }
 
   static function admin_menu($menu, $theme) {
@@ -38,4 +33,21 @@ class user_event_Core {
                      ->label(t("Users/Groups"))
                      ->url(url::site("admin/users")));
   }
+
+  static function set_request_locale() {
+    // 1. Check the session specific preference (cookie)
+    $locale = user::cookie_locale();
+    // 2. Check the user's preference
+    if (!$locale) {
+      $locale = user::active()->locale;
+    }
+    // 3. Check the browser's / OS' preference
+    if (!$locale) {
+      $locale = locales::locale_from_http_request();
+    }
+    // If we have any preference, override the site's default locale
+    if ($locale) {
+      I18n::instance()->locale($locale);
+    }
+  }
 }
diff --git a/modules/user/helpers/user_theme.php b/modules/user/helpers/user_theme.php
index 8de2d248..5b973ef3 100644
--- a/modules/user/helpers/user_theme.php
+++ b/modules/user/helpers/user_theme.php
@@ -18,6 +18,14 @@
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
  */
 class user_theme_Core {
+  static function head($theme) {
+    if (count(locales::installed())) {
+      // Needed by the languages block
+      $theme->script("jquery.cookie.js");
+    }
+    return "";
+  }
+
   static function header_top($theme) {
     if ($theme->page_type != "login") {
       $view = new View("login.html");
@@ -25,4 +33,20 @@ class user_theme_Core {
       return $view->render();
     }
   }
+
+  static function sidebar_blocks($theme) {
+    $locales = locales::installed();
+    foreach ($locales as $locale => $display_name) {
+      $locales[$locale] = SafeString::of_safe_html($display_name);
+    }
+    if (count($locales) > 1) {
+      $block = new Block();
+      $block->css_id = "gUserLanguageBlock";
+      $block->title = t("Select Language Preference");
+      $block->content = new View("user_languages_block.html");
+      $block->content->installed_locales = array_merge(array("" => t("« none »")), $locales);
+      $block->content->selected = (string) user::cookie_locale();
+      return $block;
+    }
+  }
 }