diff options
| author | Martin Trigaux <mat@odoo.com> | 2021-01-25 13:04:18 +0000 |
|---|---|---|
| committer | Martin Trigaux <mat@odoo.com> | 2021-01-25 13:09:41 +0000 |
| commit | 4c8a21d086846ce555dc13e8900cb25aad3b41a8 (patch) | |
| tree | 0927e79cc8650434f6891fb38b928de44d2ab0f6 | |
| parent | a79e8f528bc9fe21bee4650f99f0a6b68428af9e (diff) | |
[FIX] web: translate remaining days
This is the javascript equivalent of `_("Foo %s" % bar)`
https://www.odoo.com/documentation/master/reference/translations.html#variables
closes odoo/odoo#65004
Related: odoo/enterprise#15936
Signed-off-by: Martin Trigaux (mat) <mat@odoo.com>
| -rw-r--r-- | addons/web/i18n/web.pot | 20 | ||||
| -rw-r--r-- | addons/web/static/src/js/fields/basic_fields.js | 4 |
2 files changed, 12 insertions, 12 deletions
diff --git a/addons/web/i18n/web.pot b/addons/web/i18n/web.pot index 546ee1cce91..66976d44a79 100644 --- a/addons/web/i18n/web.pot +++ b/addons/web/i18n/web.pot @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: Odoo Server 14.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-01-04 08:58+0000\n" -"PO-Revision-Date: 2021-01-04 08:58+0000\n" +"POT-Creation-Date: 2021-01-25 13:06+0000\n" +"PO-Revision-Date: 2021-01-25 13:06+0000\n" "Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" @@ -38,13 +38,6 @@ msgstr "" #. module: web #. openerp-web -#: code:addons/web/static/src/js/fields/basic_fields.js:0 -#, python-format -msgid "${-diffDays} days ago" -msgstr "" - -#. module: web -#. openerp-web #: code:addons/web/static/src/js/core/translation.js:0 #, python-format msgid "%d days ago" @@ -87,6 +80,13 @@ msgstr "" #. module: web #. openerp-web +#: code:addons/web/static/src/js/fields/basic_fields.js:0 +#, python-format +msgid "%s days ago" +msgstr "" + +#. module: web +#. openerp-web #: code:addons/web/static/src/js/fields/field_utils.js:0 #, python-format msgid "'%s' is not a correct date" @@ -2095,7 +2095,7 @@ msgstr "" #. openerp-web #: code:addons/web/static/src/js/fields/basic_fields.js:0 #, python-format -msgid "In ${diffDays} days" +msgid "In %s days" msgstr "" #. module: web diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index 0ca1e27de4e..ddda72e59db 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -994,9 +994,9 @@ const RemainingDays = AbstractField.extend({ } else if (diffDays === 0) { text = _t("Today"); } else if (diffDays < 0) { - text = diffDays === -1 ? _t("Yesterday") : _t(`${-diffDays} days ago`); + text = diffDays === -1 ? _t("Yesterday") : _.str.sprintf(_t('%s days ago'), -diffDays); } else { - text = diffDays === 1 ? _t("Tomorrow") : _t(`In ${diffDays} days`); + text = diffDays === 1 ? _t("Tomorrow") : _.str.sprintf(_t('In %s days'), diffDays); } this.$el.text(text).attr('title', this._formatValue(this.value, 'date')); this.$el.toggleClass('text-bf', diffDays <= 0); |