mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #21780 from nextcloud/backport/21778/stable19 

[stable19] Set the moment locale even earlier
This commit is contained in:
Roeland Jago Douma 2020-07-09 20:27:31 +02:00 committed by GitHub
parent b3c9b166a3 9c7a659b5b
commit 1e695d4a43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/dist/main.js vendored
View File

File diff suppressed because one or more lines are too long

8
core/src/init.js
View File

@ -98,15 +98,15 @@ const initLiveTimestamps = () => {
}, 30 * 1000) }, 30 * 1000)
} }
/**
* Initializes core
*/
export const initCore = () => {
/** /**
* Set users locale to moment.js as soon as possible * Set users locale to moment.js as soon as possible
*/ */
moment.locale(OC.getLocale()) moment.locale(OC.getLocale())
/**
* Initializes core
*/
export const initCore = () => {
const userAgent = window.navigator.userAgent const userAgent = window.navigator.userAgent
const msie = userAgent.indexOf('MSIE ') const msie = userAgent.indexOf('MSIE ')
const trident = userAgent.indexOf('Trident/') const trident = userAgent.indexOf('Trident/')