Merge pull request #73 from Soulou/internationalization

Select language according to http accept-language parameter
voxe · Jun 9, 2013 · 4c20fdc · 4c20fdc
2 parents 3e17e7f + 13d454a
commit 4c20fdc
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 6 deletions.
diff --git a/Gemfile b/Gemfile
@@ -108,3 +108,6 @@ gem 'koala'
 
 # Additional features for text searching with mongoid
 gem 'mongoid_fulltext'
+
+# Internationalization according to http accept-language
+gem 'http_accept_language'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -154,6 +154,7 @@ GEM
       tilt (>= 1.3.3)
     hike (1.2.2)
     hirefireapp (0.1.2)
+    http_accept_language (1.0.2)
     i18n (0.6.1)
     jammit (0.6.6)
       cssmin (>= 1.0.3)
@@ -317,6 +318,7 @@ DEPENDENCIES
   haml-rails
   haml_coffee_assets
   hirefireapp
+  http_accept_language
   jammit
   jquery-rails (= 2.1.4)
   koala

diff --git a/app/controllers/web/application_controller.rb b/app/controllers/web/application_controller.rb
@@ -1,12 +1,22 @@
 class Web::ApplicationController < ApplicationController
-
+  before_filter :set_locale
+
   # will be reset every deploy
   caches_action :index
 
   def index
     @options = {}
   end
 
+  AVAILABLE_LANGUAGES = I18n.available_locales.map do |l| l.to_s end
+  def set_locale
+    unless request.user_preferred_languages.empty?
+      I18n.locale = request.preferred_language_from(AVAILABLE_LANGUAGES)
+    else
+      I18n.locale = I18n.default_locale
+    end
+  end
+
   private
     def set_election
       @only_published_candidacies = true

diff --git a/app/views/web/application/_templates.mustache.haml b/app/views/web/application/_templates.mustache.haml
@@ -182,7 +182,7 @@
     {{/user.name}}
 
     {{^user.name}}
-      <a href="#" class="connect">Connexion</a>
+      <a href="#" class="connect">#{ t 'account.sign_in' }</a>
     {{/user.name}}
 
 %script#users-new-template{type: "text/html"}

diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -1,6 +1,9 @@
 Joinplato::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
+  # Setting up locale
+  config.i18n.default_locale = :en
+
   # In the development environment your application's code is reloaded on
   # every request.  This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -74,6 +74,9 @@
   # the I18n.default_locale when a translation can not be found)
   config.i18n.fallbacks = true
 
+  # Setting up default locale
+  config.i18n.default_locale = :en
+
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
 

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -35,5 +35,5 @@ en:
     password: Password
     sign_up: Sign up
     already_on_voxe_sign_in: Already on Voxe? Sign in.
-    sign_in: Sign in
+    sign_in: Log in
     edit_my_profile: Edit my profile
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -5,9 +5,9 @@ fr:
   navigation:
     about: Projet
     how: Sources
-    press: On parle de nous
+    press: Presse
     apps: Apps
-    API: Développeurs
+    API: API
     hackathon: Hackathon
     method: Méthode
     donate: Soutenir
@@ -35,5 +35,5 @@ fr:
     password: Mot de passe
     sign_up: S'inscrire
     already_on_voxe_sign_in: Déjà sur Voxe? Se connecter.
-    sign_in: Se connecter
+    sign_in: Connexion
     edit_my_profile: Editer mon profile