diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-06 15:05:45 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-06 15:05:45 +0000 |
| commit | 6298e32f27283abb87883b1d5f5ac93c16791fe8 (patch) | |
| tree | a7a093695f44792a30abf9dd94e0ae6340b76e41 | |
| parent | 86e2f1339bdfe477e6d1d630cded24c21d778cdb (diff) | |
| parent | 12b6a1d52cda50d6c1e3be16e70e99deb3633ce5 (diff) | |
| download | gitlab-ce-6298e32f27283abb87883b1d5f5ac93c16791fe8.tar.gz | |
Merge branch 'js-i18n-datetime' into 'master'
i18n datetime_utility file
See merge request gitlab-org/gitlab-ce!29193
| -rw-r--r-- | app/assets/javascripts/lib/utils/datetime_utility.js | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/lib/utils/datetime_utility.js b/app/assets/javascripts/lib/utils/datetime_utility.js index d3e6851496b..d521c462ad8 100644 --- a/app/assets/javascripts/lib/utils/datetime_utility.js +++ b/app/assets/javascripts/lib/utils/datetime_utility.js @@ -81,7 +81,7 @@ export const getDayName = date => */ export const formatDate = datetime => { if (_.isString(datetime) && datetime.match(/\d+-\d+\d+ /)) { - throw new Error('Invalid date'); + throw new Error(__('Invalid date')); } return dateFormat(datetime, 'mmm d, yyyy h:MMtt Z'); }; diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 7f2fa16f809..9f3b3213a3e 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -5369,6 +5369,9 @@ msgstr "" msgid "Invalid Login or password" msgstr "" +msgid "Invalid date" +msgstr "" + msgid "Invalid feature" msgstr "" |