diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-10-23 16:09:47 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-10-23 16:09:47 +0200 |
| commit | e26a16afea14df7428dd614906fc94521538dfe3 (patch) | |
| tree | e5c6f7acc4c4f1cea119d43884037c9dd0cd0697 /core | |
| parent | 770f643e5cf78493dde576f85fee9c4b66a31f38 (diff) | |
| parent | fa9a7442005e66d73923a88ad905f21eb714291f (diff) | |
| download | nextcloud-server-e26a16afea14df7428dd614906fc94521538dfe3.tar.gz nextcloud-server-e26a16afea14df7428dd614906fc94521538dfe3.zip | |
Merge pull request #11549 from owncloud/add-more-localizations-master
implement localizations based on punic
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/config.php | 4 | ||||
| -rw-r--r-- | core/l10n/l10n-de.php | 7 | ||||
| -rw-r--r-- | core/l10n/l10n-en.php | 7 | ||||
| -rw-r--r-- | core/l10n/l10n-es.php | 7 |
4 files changed, 2 insertions, 23 deletions
diff --git a/core/js/config.php b/core/js/config.php index 6994f2ed8a2..52405725f23 100644 --- a/core/js/config.php +++ b/core/js/config.php @@ -39,7 +39,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->l('jsdate', 'jsdate')), + "datepickerFormatDate" => json_encode($l->getDateFormat()), "dayNames" => json_encode( array( (string)$l->t('Sunday'), @@ -67,7 +67,7 @@ $array = array( (string)$l->t('December') ) ), - "firstDay" => json_encode($l->l('firstday', 'firstday')) , + "firstDay" => json_encode($l->getFirstWeekDay()) , "oc_config" => json_encode( array( 'session_lifetime' => min(\OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')), ini_get('session.gc_maxlifetime')), diff --git a/core/l10n/l10n-de.php b/core/l10n/l10n-de.php deleted file mode 100644 index 77d35af4936..00000000000 --- a/core/l10n/l10n-de.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php -$LOCALIZATIONS = array( - 'jsdate' => 'dd.mm.yy', - 'date' => '%d.%m.%Y', - 'datetime' => '%d.%m.%Y %H:%M:%S', - 'time' => '%H:%M:%S', - 'firstday' => 0 ); diff --git a/core/l10n/l10n-en.php b/core/l10n/l10n-en.php deleted file mode 100644 index 9ee748bee23..00000000000 --- a/core/l10n/l10n-en.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php -$LOCALIZATIONS = array( - 'jsdate' => 'MM d, yy', - 'date' => '%B %e, %Y', - 'datetime' => '%B %e, %Y %H:%M', - 'time' => '%H:%M:%S', - 'firstday' => 0 ); diff --git a/core/l10n/l10n-es.php b/core/l10n/l10n-es.php deleted file mode 100644 index 13db2ec5d4c..00000000000 --- a/core/l10n/l10n-es.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php -$LOCALIZATIONS = array( - 'jsdate' => "d 'de' MM 'de' yy", - 'date' => '%e de %B de %Y', - 'datetime' => '%e de %B de %Y %H:%M', - 'time' => '%H:%M:%S', - 'firstday' => 1 ); |