diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2012-10-18 08:09:58 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2012-10-18 08:09:58 -0700 |
| commit | e4c0bb59e52a2cc7be21cdc4180a7f1aa64b18b5 (patch) | |
| tree | 1a308bbbe6f474b83a581107b3c24dc0a6439a5b /lib | |
| parent | e307bf31c801b554a44afddd37e8e6f425fab567 (diff) | |
| parent | d8eb62232e2b3003925c87b316b66ed6b39ff100 (diff) | |
| download | nextcloud-server-e4c0bb59e52a2cc7be21cdc4180a7f1aa64b18b5.tar.gz nextcloud-server-e4c0bb59e52a2cc7be21cdc4180a7f1aa64b18b5.zip | |
Merge pull request #39 from scambra/date-l10n-fixes
Date l10n fixes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/l10n.php | 11 | ||||
| -rwxr-xr-x | lib/util.php | 4 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lib/l10n.php b/lib/l10n.php index 4eb4c323d88..26611537175 100644 --- a/lib/l10n.php +++ b/lib/l10n.php @@ -58,9 +58,9 @@ class OC_L10N{ * Localization */ private $localizations = array( - 'date' => 'd.m.Y', - 'datetime' => 'd.m.Y H:i:s', - 'time' => 'H:i:s'); + 'date' => '%d.%m.%Y', + 'datetime' => '%d.%m.%Y %H:%M:%S', + 'time' => '%H:%M:%S'); /** * get an L10N instance @@ -216,7 +216,10 @@ class OC_L10N{ case 'time': if($data instanceof DateTime) return $data->format($this->localizations[$type]); elseif(is_string($data)) $data = strtotime($data); - return date($this->localizations[$type], $data); + $locales = array(self::findLanguage()); + if (strlen($locales[0]) == 2) $locales[] = $language.'_'.strtoupper($language); + setlocale(LC_TIME, $locales); + return strftime($this->localizations[$type], $data); break; default: return false; diff --git a/lib/util.php b/lib/util.php index 5771b89f265..880a519d347 100755 --- a/lib/util.php +++ b/lib/util.php @@ -162,8 +162,8 @@ class OC_Util { $offset=$clientTimeZone-$systemTimeZone; $timestamp=$timestamp+$offset*60; } - $timeformat=$dateOnly?'F j, Y':'F j, Y, H:i'; - return date($timeformat,$timestamp); + $l=OC_L10N::get('lib'); + return $l->l($dateOnly ? 'date' : 'datetime', $timestamp); } /** |