mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FEATURE: Load translation overrides without JS eval
This commit is contained in:
@@ -137,9 +137,10 @@ module I18n
|
||||
|
||||
def overrides_by_locale(locale)
|
||||
return unless @overrides_enabled
|
||||
|
||||
return {} if GlobalSetting.skip_db?
|
||||
|
||||
execute_reload if @requires_reload
|
||||
|
||||
site = RailsMultisite::ConnectionManagement.current_db
|
||||
|
||||
by_site = @overrides_by_site[site]
|
||||
@@ -170,11 +171,6 @@ module I18n
|
||||
end
|
||||
end
|
||||
|
||||
def client_overrides_json(locale)
|
||||
client_json = (overrides_by_locale(locale) || {}).select { |k, _| k[/^(admin_js|js)\./] }
|
||||
MultiJson.dump(client_json)
|
||||
end
|
||||
|
||||
def translate(*args)
|
||||
execute_reload if @requires_reload
|
||||
|
||||
|
||||
Reference in New Issue
Block a user