diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-27 09:37:00 +0100 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-01-27 09:37:00 +0100 |
| commit | 1594371c8c0124af2469bd70b9b917bfd845ae19 (patch) | |
| tree | a7fb0546707e05984fa78f45a53563514b9c9d4d /core | |
| parent | 5b7a1b13f3514f60650e1da41d8dc046ee0252c5 (diff) | |
| parent | 3a6390031cb7e6575edd8d4a5271614eb8ba9470 (diff) | |
| download | nextcloud-server-1594371c8c0124af2469bd70b9b917bfd845ae19.tar.gz nextcloud-server-1594371c8c0124af2469bd70b9b917bfd845ae19.zip | |
Merge pull request #21741 from owncloud/l10n-improvements
Move methods to the factory that are not related to translating, but to guessing/finding the language
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/config.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/js/config.php b/core/js/config.php index 0670df60abd..708da777ee4 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -67,7 +67,7 @@ $array = array( "oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false', "oc_webroot" => "\"".OC::$WEBROOT."\"", "oc_appswebroots" => str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution - "datepickerFormatDate" => json_encode($l->getDateFormat()), + "datepickerFormatDate" => json_encode($l->l('jsdate', null)), "dayNames" => json_encode( array( (string)$l->t('Sunday'), @@ -133,7 +133,7 @@ $array = array( (string)$l->t('Dec.') ) ), - "firstDay" => json_encode($l->getFirstWeekDay()) , + "firstDay" => json_encode($l->l('firstday', null)) , "oc_config" => json_encode( array( 'session_lifetime' => min(\OCP\Config::getSystemValue('session_lifetime', OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')), OC::$server->getIniWrapper()->getNumeric('session.gc_maxlifetime')), |