github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-01 17:28:07 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: error overriding user notification string with valid keys (#12510)

Browse Source 
When overriding the translation for i18n keys used in user notifications
like user_notifications.reply_by_email, errors were returned for
valid interpolation keys. Keys like topic_title_url_encoded are
supported, so no error should be raised.

https://meta.discourse.org/t/-/50305/7
This commit is contained in:
Neil Lalonde
2021-03-24 15:58:24 -04:00
committed by GitHub
parent b8822c7a87
commit ca4bc9b8c7
2 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/translation_override.rb
View File

@ -5,7 +5,12 @@ require "i18n/i18n_interpolation_keys_finder"
class TranslationOverride < ActiveRecord::Base
# Allowlist i18n interpolation keys that can be included when customizing translations
ALLOWED_CUSTOM_INTERPOLATION_KEYS = {
"user_notifications.user_" => %w{
[
"user_notifications.user_",
"user_notifications.only_reply_by_email",
"user_notifications.reply_by_email",
"user_notifications.visit_link_to_respond",
] => %w{
topic_title_url_encoded
site_title_url_encoded
context
@ -18,6 +23,7 @@ class TranslationOverride < ActiveRecord::Base
topic_title
}
}
include ActiveSupport::Deprecation::DeprecatedConstantAccessor
deprecate_constant 'CUSTOM_INTERPOLATION_KEYS_WHITELIST', 'TranslationOverride::ALLOWED_CUSTOM_INTERPOLATION_KEYS'
@ -107,8 +113,8 @@ class TranslationOverride < ActiveRecord::Base
custom_interpolation_keys = []
ALLOWED_CUSTOM_INTERPOLATION_KEYS.select do |key, value|
if transformed_key.start_with?(key)
ALLOWED_CUSTOM_INTERPOLATION_KEYS.select do |keys, value|
if keys.any? { |key| transformed_key.start_with?(key) }
custom_interpolation_keys = value
end
end