upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

don't duplicate locales with country code

Browse source
This commit is contained in:
scambra 2012-09-26 07:10:54 +02:00
parent 5ecce8bfb7
commit d8eb62232e
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/l10n.php
View file

@ -216,8 +216,9 @@ class OC_L10N{
case 'time':
if($data instanceof DateTime) return $data->format($this->localizations[$type]);
elseif(is_string($data)) $data = strtotime($data);
$language = self::findLanguage();
setlocale(LC_TIME, array($language, $language.'_'.strtoupper($language)));
$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: