Added Site Setting to change locale.

andylou · Feb 28, 2013 · 628927a · 628927a
1 parent e37c7f1
commit 628927a
Show file tree

Hide file tree

Showing 23 changed files with 640 additions and 97 deletions.
diff --git a/Gemfile b/Gemfile
@@ -21,7 +21,7 @@ gem 'fastimage'
 gem 'fog', require: false
 gem 'has_ip_address'
 gem 'hiredis'
-gem 'i18n-js'
+
 # note: for image_optim to correctly work you need
 # sudo apt-get install -y advancecomp gifsicle jpegoptim libjpeg-progs optipng pngcrush
 gem 'image_optim'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -203,8 +203,6 @@ GEM
     hiredis (0.4.5)
     httpauth (0.2.0)
     i18n (0.6.1)
-    i18n-js (2.1.2)
-      i18n
     image_optim (0.7.2)
       fspath (~> 2.0.3)
       image_size (~> 1.1)
@@ -479,7 +477,6 @@ DEPENDENCIES
   guard-spork
   has_ip_address
   hiredis
-  i18n-js
   image_optim
   jasminerice
   jquery-rails

diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
@@ -20,11 +20,6 @@
 
 // The rest of the externals
 //= require_tree ./external
-//= require i18n
-
-// The following needs to go right after including i18n, because other scripts
-// below require correctly set locale already
-//= require init_locale
 
 //= require ./discourse/helpers/i18n_helpers
 //= require ./discourse

diff --git a/app/assets/javascripts/init_locale.js b/app/assets/javascripts/init_locale.js
diff --git a/app/assets/javascripts/locales/en.js.erb b/app/assets/javascripts/locales/en.js.erb
@@ -1,2 +1,3 @@
 //= depend_on 'client.en.yml'
-<%= JsLocaleHelper.output_locale(:en); %>
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:en) %>
diff --git a/app/assets/javascripts/locales/fr.js.erb b/app/assets/javascripts/locales/fr.js.erb
@@ -1,2 +1,3 @@
 //= depend_on 'client.fr.yml'
-<%= JsLocaleHelper.output_locale(:fr); %>
+//= require locales/i18n
+<%= JsLocaleHelper.output_locale(:fr) %>