From 8945a752f2a6090cb1c83499d5d15dfde2c8651c Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Tue, 29 Sep 2020 15:58:13 -0400 Subject: [PATCH] FIX: Deprecation overwriting `translatedText` CP This allows us to pass a `textParams` object for options that will be translated via i18n. --- .../discourse/app/components/discourse-linked-text.js | 4 ++-- .../discourse/app/templates/components/pwa-install-banner.hbs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/app/components/discourse-linked-text.js b/app/assets/javascripts/discourse/app/components/discourse-linked-text.js index 0c60dd1b6d6..acbb88021a2 100644 --- a/app/assets/javascripts/discourse/app/components/discourse-linked-text.js +++ b/app/assets/javascripts/discourse/app/components/discourse-linked-text.js @@ -5,10 +5,10 @@ import discourseComputed from "discourse-common/utils/decorators"; export default Component.extend({ tagName: "span", - @discourseComputed("text") + @discourseComputed("text", "textParams") translatedText(text) { if (text) { - return I18n.t(text); + return I18n.t(...arguments); } }, diff --git a/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs b/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs index 1235c03ad0e..a4ab37cc7ed 100644 --- a/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs +++ b/app/assets/javascripts/discourse/app/templates/components/pwa-install-banner.hbs @@ -4,7 +4,8 @@ {{discourse-linked-text action=(action "turnOn") - translatedText=(i18n "pwa.install_banner" title=siteSettings.title) + text="pwa.install_banner" + textParams=(hash title=siteSettings.title) }} {{d-button