wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #17691 from nextcloud/enh/17673/fix-first-day-week

Browse source 
Show first day of the week in correct language
This commit is contained in:
Roeland Jago Douma 2019-10-26 20:32:11 +02:00 committed by GitHub
commit 790efdf787
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.eslintrc.js
View file

@ -6,7 +6,9 @@ module.exports = {
$: true,
moment: true,
escapeHTML: true,
oc_userconfig: true
oc_userconfig: true,
dayNames: true,
firstDay: true
},
extends: ['nextcloud']
}

10
apps/settings/js/settings/personalInfo.js
View file

@ -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;