2 files changed, 7 insertions, 0 deletions
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index 21848e2e..4af1d22f 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -23,5 +23,11 @@ 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()->setLocale($locale);
+    }
   }
 }
diff --git a/modules/user/helpers/user_installer.php b/modules/user/helpers/user_installer.php
index 8f2f25a6..806ed14b 100644
--- a/modules/user/helpers/user_installer.php
+++ b/modules/user/helpers/user_installer.php
@@ -35,6 +35,7 @@ class user_installer {
                    `guest` BOOLEAN default 0,
                    `hash` char(32) default NULL,
                    `url` varchar(255) default NULL,
+                   `locale` char(10) default NULL,
                    PRIMARY KEY (`id`),
                    UNIQUE KEY(`hash`),
                    UNIQUE KEY(`name`))