Merge pull request #1922 from joallard/language-toggle

Allow users to toggle interface language in their preferences

app/assets/javascripts/discourse/controllers/preferences_controller.js

@@ -11,6 +11,10 @@ Discourse.PreferencesController = Discourse.ObjectController.extend({
     return Discourse.SiteSettings.allow_uploaded_avatars;
   }.property(),
 
+  allowUserLocale: function() {
+    return Discourse.SiteSettings.allow_user_locale;
+  }.property(),
+
   // By default we haven't saved anything
   saved: false,
 
@@ -30,6 +34,12 @@ Discourse.PreferencesController = Discourse.ObjectController.extend({
     return Discourse.SiteSettings.enable_names;
   }.property(),
 
+  availableLocales: function() {
+    return Discourse.SiteSettings.available_locales.split('|').map( function(s) {
+      return {name: s, value: s};
+    });
+  }.property(),
+
   digestFrequencies: [{ name: I18n.t('user.email_digests.daily'), value: 1 },
                       { name: I18n.t('user.email_digests.weekly'), value: 7 },
                       { name: I18n.t('user.email_digests.bi_weekly'), value: 14 }],

app/assets/javascripts/discourse/models/user.js

@@ -170,6 +170,7 @@ Discourse.User = Discourse.Model.extend({
                                'bio_raw',
                                'website',
                                'name',
+                               'locale',
                                'email_digests',
                                'email_direct',
                                'email_always',

app/assets/javascripts/discourse/templates/user/preferences.js.handlebars

@@ -72,6 +72,18 @@
       </div>
     </div>
 
+    {{#if allowUserLocale}}
+      <div class="control-group">
+        <label class="control-label">{{i18n user.locale.title}}</label>
+        <div class="controls">
+          {{combobox valueAttribute="value" content=availableLocales value=locale none="user.locale.default"}}
+        </div>
+        <div class='instructions'>
+          {{i18n user.locale.instructions}}
+        </div>
+      </div>
+    {{/if}}
+
     <div class="control-group">
       <label class="control-label">{{i18n user.bio}}</label>
       <div class="controls">

app/controllers/application_controller.rb

@@ -109,7 +109,11 @@ class ApplicationController < ActionController::Base
   end
 
   def set_locale
-    I18n.locale = SiteSetting.default_locale
+    I18n.locale = if SiteSetting.allow_user_locale && current_user && current_user.locale.present?
+                    current_user.locale
+                  else
+                    SiteSetting.default_locale
+                  end
   end
 
   def store_preloaded(key, json)

app/models/site_setting.rb

@@ -23,6 +23,11 @@ class SiteSetting < ActiveRecord::Base
     load_settings(file)
   end
 
+  SiteSettingExtension.class_variable_get(:@@client_settings) << :available_locales
+
+  def self.available_locales
+    LocaleSiteSetting.values.map{ |e| e[:value] }.join('|')
+  end
 
   def self.call_discourse_hub?
     self.enforce_global_nicknames? && self.discourse_org_access_key.present?

app/serializers/user_serializer.rb

@@ -47,6 +47,7 @@ class UserSerializer < BasicUserSerializer
   end
 
   private_attributes :email,
+                     :locale,
                      :email_digests,
                      :email_private_messages,
                      :email_direct,

app/services/user_updater.rb

@@ -27,6 +27,7 @@ class UserUpdater
 
     user.bio_raw = attributes.fetch(:bio_raw) { user.bio_raw }
     user.name = attributes.fetch(:name) { user.name }
+    user.locale = attributes.fetch(:locale) { user.locale }
     user.digest_after_days = attributes.fetch(:digest_after_days) { user.digest_after_days }
 
     if attributes[:auto_track_topics_after_msecs]

config/locales/client.en.yml

@@ -325,6 +325,11 @@ en:
         enter_email: 'Username found. Enter matching email.'
         prefilled: "Email matches this registered username."
 
+      locale:
+        title: "Interface language"
+        instructions: "The language used by the forum interface. It will change when you refresh the page."
+        default: "(default)"
+
       password_confirmation:
         title: "Password Again"
 

config/locales/client.fr.yml

@@ -299,6 +299,11 @@ fr:
         enter_email: 'Pseudo trouvé. Entrez l''adresse email correspondante.'
         prefilled: "L'adresse email correspond à ce pseudo enregistré."
 
+      locale:
+        title: "Langue de l'interface"
+        instructions: "La langue utilisée dans l'interface du forum. Le changement se fait lorsque vous rechargez la page."
+        default: "(par défaut)"
+
       password_confirmation:
         title: "Confirmation"
 

config/locales/server.en.yml

@@ -550,6 +550,7 @@ en:
 
   site_settings:
     default_locale: "The default language of this Discourse instance (ISO 639-1 Code)"
+    allow_user_locale: "Allow users to choose their own language interface preference"
     min_post_length: "Minimum post length in characters"
     min_private_message_post_length: "Minimum post length in characters for private messages"
     max_post_length: "Maximum post length in characters"

config/locales/server.fr.yml

@@ -484,6 +484,7 @@ fr:
       description: "HTML qui sera ajouté au pied de toutes les pages"
   site_settings:
     default_locale: "Le langage par défaut de cette instance de Discourse (code ISO 639-1)"
+    allow_user_locale: "Permettre aux utilisateurs de choisir leur propre préférence de langue pour l'interface"
     min_post_length: "Longueur minimale des messages en nombre de caractères"
     min_private_message_post_length: "Longueur minimale des messages privés en nombre de caractères"
     max_post_length: "Longueur maximale des messages en nombres de caractères"

config/site_settings.yml

@@ -24,6 +24,9 @@ basic:
   default_locale:
     default: 'en'
     enum: 'LocaleSiteSetting'
+  allow_user_locale:
+    client: true
+    default: false
   ga_tracking_code:
     client: true
     default: ''

db/migrate/20140206044818_add_locale_to_user.rb

@@ -0,0 +1,5 @@
+class AddLocaleToUser < ActiveRecord::Migration
+  def change
+    add_column :users, :locale, :string, limit: 10
+  end
+end

spec/controllers/application_controller_spec.rb

@@ -44,6 +44,28 @@ describe TopicsController do
 
   end
 
+  describe 'set_locale' do
+    it 'sets the one the user prefers' do
+      SiteSetting.stubs(:allow_user_locale).returns(true)
+
+      user = Fabricate(:user, locale: :fr)
+      log_in_user(user)
+
+      get :show, {topic_id: topic.id}
+
+      I18n.locale.should == :fr
+    end
+
+    it 'is sets the default locale when the setting not enabled' do
+      user = Fabricate(:user, locale: :fr)
+      log_in_user(user)
+
+      get :show, {topic_id: topic.id}
+
+      I18n.locale.should == :en
+    end
+  end
+
 end
 
 describe 'api' do