]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b7fa644)
Setting moment locale based on user selection
authorClark Tomlinson <fallen013@gmail.com>
Wed, 22 Oct 2014 14:38:17 +0000 (10:38 -0400)
committerClark Tomlinson <fallen013@gmail.com>
Thu, 23 Oct 2014 14:32:47 +0000 (10:32 -0400)
core/js/js.js patch | blob | history
core/templates/layout.base.php patch | blob | history
core/templates/layout.guest.php patch | blob | history
core/templates/layout.user.php patch | blob | history
lib/private/templatelayout.php patch | blob | history

diff --git a/core/js/js.js b/core/js/js.js
index 566a3d4d8cd8db4eb9def4769651550f2c5424f4..94b78a2e9a9c89d536b285d12f61091dc2cf6ad7 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -966,6 +966,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
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 963bf4cf5451f6fa592ee2ecb575a77ec9ec84e6..3325bc9165e4f6f7bd298b1de5ff23dfd4e4359a 100644 (file)
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]-->
-<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]-->
-<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]-->
+<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]-->
+<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
 
        <head>
                <title>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index da40fd83ad8044a736cb937caa43d7f54badcb19..0ad2ea4d8073b69467d34eda63f60e8d137e62d0 100644 (file)
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]-->
-<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]-->
-<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]-->
+<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]-->
+<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
 
        <head data-requesttoken="<?php p($_['requesttoken']); ?>">
                <title>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9445175efcfda6f9a6f3425cbd5dbb67f8de4e44..645a4c306562dd3c95f7f0cf37a5cce3fc100fce 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]-->
-<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]-->
-<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]-->
+<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]-->
+<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
 
        <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
                <title>
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index f5f079c8b2a3950ef3825fe70fd11a7a026cfe94..b294cef55e753c57efb1d404dc7577b8a69f5025 100644 (file)
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -33,7 +33,6 @@ class OC_TemplateLayout extends OC_Template {
                $this->config = \OC::$server->getConfig();
 
                // Decide which page we show
-
                if( $renderAs == 'user' ) {
                        parent::__construct( 'core', 'layout.user' );
                        if(in_array(OC_APP::getCurrentApp(), array('settings','admin', 'help'))!==false) {
@@ -84,7 +83,11 @@ class OC_TemplateLayout extends OC_Template {
                        $this->assign('bodyid', 'body-login');
                } else {
                        parent::__construct('core', 'layout.base');
+
                }
+               // Send the language to our layouts
+               $this->assign('language', OC_L10N::findLanguage());
+
 
                if(empty(self::$versionHash)) {
                        self::$versionHash = md5(implode(',', OC_App::getAppVersions()));
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server