From 04db58fbd8aaa52d5d3e7dbfdfe5c7d997d204cd Mon Sep 17 00:00:00 2001 From: David Taylor Date: Fri, 9 Jul 2021 14:34:08 +0100 Subject: [PATCH] UX: Translate the action type in watched words regex error (#13680) Previously we were using the untranslated key from the code --- app/models/admin_dashboard_data.rb | 3 ++- config/locales/server.en.yml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/models/admin_dashboard_data.rb b/app/models/admin_dashboard_data.rb index 7185abb654..7e21f4b91e 100644 --- a/app/models/admin_dashboard_data.rb +++ b/app/models/admin_dashboard_data.rb @@ -233,7 +233,8 @@ class AdminDashboardData begin WordWatcher.word_matcher_regexp(action, raise_errors: true) rescue RegexpError => e - return I18n.t('dashboard.watched_word_regexp_error', base_path: Discourse.base_path, action: action) + translated_action = I18n.t("admin_js.admin.watched_words.actions.#{action}") + I18n.t('dashboard.watched_word_regexp_error', base_path: Discourse.base_path, action: translated_action) end end nil diff --git a/config/locales/server.en.yml b/config/locales/server.en.yml index c815b967ef..9f875654af 100644 --- a/config/locales/server.en.yml +++ b/config/locales/server.en.yml @@ -1459,7 +1459,7 @@ en: force_https_warning: "Your website is using SSL. But `force_https` is not yet enabled in your site settings." out_of_date_themes: "Updates are available for the following themes:" unreachable_themes: "We were unable to check for updates on the following themes:" - watched_word_regexp_error: "The regular expression for %{action} watched words is invalid. Please check your Watched Word settings, or disable the 'watched words regular expressions' site setting." + watched_word_regexp_error: "The regular expression for '%{action}' watched words is invalid. Please check your Watched Word settings, or disable the 'watched words regular expressions' site setting." site_settings: display_local_time_in_user_card: "Display the local time based on a user's timezone when their user card is opened."