IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Different fix (#7815)

Browse Source
This commit is contained in:
Osama Sayegh
2019-07-02 04:53:16 +03:00
committed by Sam
parent 4dcc5f16f1
commit f1c67729de
10 changed files with 78 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/admin/email_templates_controller.rb
View File

@@ -108,7 +108,7 @@ class Admin::EmailTemplatesController < Admin::AdminController
end
def index
render_serialized(self.class.email_keys, AdminEmailTemplateSerializer, root: 'email_templates', rest_serializer: true)
render_serialized(self.class.email_keys, AdminEmailTemplateSerializer, root: 'email_templates', rest_serializer: true, overridden_keys: overridden_keys)
end
private
@@ -151,4 +151,8 @@ class Admin::EmailTemplatesController < Admin::AdminController
message = update_result[:error_messages].join("<br>")
I18n.t("errors.format_with_full_message", attribute: attribute, message: message)
end
def overridden_keys
TranslationOverride.where(locale: I18n.locale).pluck(:translation_key)
end
end

6
app/controllers/admin/site_texts_controller.rb
View File

@@ -45,7 +45,7 @@ class Admin::SiteTextsController < Admin::AdminController
end
extras[:has_more] = true if results.size > 50
render_serialized(results[0..49], SiteTextSerializer, root: 'site_texts', rest_serializer: true, extras: extras)
render_serialized(results[0..49], SiteTextSerializer, root: 'site_texts', rest_serializer: true, extras: extras, overridden_keys: overridden_keys)
end
def show
@@ -172,4 +172,8 @@ class Admin::SiteTextsController < Admin::AdminController
[k, value[k] || fallback_value[k] || fallback_value[:other]]
end.to_h
end
def overridden_keys
TranslationOverride.where(locale: I18n.locale).pluck(:translation_key)
end
end