IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2026-08-13 06:25:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor to our own Discourse I18n backend

Browse Source 
This removes some monkey patches and makes testing easier.
It will also support database backed I18n changes.
This commit is contained in:
Robin Ward
2015-11-13 16:35:02 -05:00
parent 43614439e6
commit 3720783c1b
8 changed files with 103 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/application_controller.rb
+2 -7
View File
@@ -138,13 +138,8 @@ class ApplicationController < ActionController::Base
end
def set_locale
I18n.locale = if current_user
current_user.effective_locale
else
SiteSetting.default_locale
end
I18n.fallbacks.ensure_loaded!
I18n.locale = current_user.try(:effective_locale) || SiteSetting.default_locale
I18n.ensure_all_loaded!
end
def store_preloaded(key, json)
app/jobs/base.rb
+1 -1
View File
@@ -149,7 +149,7 @@ module Jobs
begin
RailsMultisite::ConnectionManagement.establish_connection(db: db)
I18n.locale = SiteSetting.default_locale
I18n.fallbacks.ensure_loaded!
I18n.ensure_all_loaded!
begin
execute(opts)
rescue => e