summaryrefslogtreecommitdiffstats
path: root/core/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-10-27 10:30:47 +0100
committerVincent Petry <pvince81@owncloud.com>2014-10-27 10:30:47 +0100
commitaee1edf6b5d12852b04e734486a42a5b042dfc65 (patch)
tree13bf969a98e59d4a4050681fdc3f89f7ef598422 /core/js
parent5d391910c52309d7c538a2494927b3720dc06d0a (diff)
parentca5abe57440e415b1a6b99d7461dacab21b67b71 (diff)
downloadnextcloud-server-aee1edf6b5d12852b04e734486a42a5b042dfc65.tar.gz
nextcloud-server-aee1edf6b5d12852b04e734486a42a5b042dfc65.zip
Merge pull request #11708 from owncloud/fix-momentjs
Setting moment locale based on user selection
Diffstat (limited to 'core/js')
-rw-r--r--core/js/js.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/js/js.js b/core/js/js.js
index 566a3d4d8cd..94b78a2e9a9 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -967,6 +967,12 @@ function object(o) {
function initCore() {
/**
+ * Set users local to moment.js as soon as possible
+ */
+ moment.locale($('html').prop('lang'));
+
+
+ /**
* Calls the server periodically to ensure that session doesn't
* time out
*/