diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2019-10-26 20:32:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-26 20:32:11 +0200 |
| commit | 790efdf78735d70e947415351a58db09a8152d59 (patch) | |
| tree | 1d17d54fd03c9ae1ecb33f0e126182848c6997ee | |
| parent | 7904ddd06a2d83e83f121140eec7e7cda4cca650 (diff) | |
| parent | a7f4d54d0f3651c756d627de7ccbf9c0d74b6e8b (diff) | |
| download | nextcloud-server-790efdf78735d70e947415351a58db09a8152d59.tar.gz nextcloud-server-790efdf78735d70e947415351a58db09a8152d59.zip | |
Merge pull request #17691 from nextcloud/enh/17673/fix-first-day-week
Show first day of the week in correct language
| -rw-r--r-- | .eslintrc.js | 4 | ||||
| -rw-r--r-- | apps/settings/js/settings/personalInfo.js | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.eslintrc.js b/.eslintrc.js index b86372955e4..be6da20033a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -6,7 +6,9 @@ module.exports = { $: true, moment: true, escapeHTML: true, - oc_userconfig: true + oc_userconfig: true, + dayNames: true, + firstDay: true }, extends: ['nextcloud'] } diff --git a/apps/settings/js/settings/personalInfo.js b/apps/settings/js/settings/personalInfo.js index 454374b303d..9a683b30c00 100644 --- a/apps/settings/js/settings/personalInfo.js +++ b/apps/settings/js/settings/personalInfo.js @@ -369,11 +369,9 @@ $(document).ready(function () { }); window.setInterval(function() { - $('#localeexample-time').text(moment().format('LTS')); - $('#localeexample-date').text(moment().format('L')); - $('#localeexample-fdow').text(t('settings', 'Week starts on {fdow}', - {fdow: moment().weekday(0).format('dddd')})); - -}, 1000); + $('#localeexample-time').text(moment().format('LTS')) + $('#localeexample-date').text(moment().format('L')) + $('#localeexample-fdow').text(t('settings', 'Week starts on {fdow}', { fdow: dayNames[firstDay] })) +}, 1000) OC.Settings.updateAvatar = updateAvatar; |