wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #16208 from owncloud/fix-language-selection-sr-latin

Browse source 
Some locales need to be converted to be compliant with CLDR
This commit is contained in:
Thomas Müller 2015-05-11 11:21:28 +02:00
commit 7db994971e
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/private/l10n.php
View file

@ -385,6 +385,7 @@ class OC_L10N implements \OCP\IL10N {
if ($locale === null) {
$locale = self::findLanguage();
}
$locale = $this->transformToCLDRLocale($locale);
$options = array_merge(array('width' => 'long'), $options);
$width = $options['width'];
@ -538,6 +539,7 @@ class OC_L10N implements \OCP\IL10N {
*/
public function getDateFormat() {
$locale = $this->getLanguageCode();
$locale = $this->transformToCLDRLocale($locale);
return Punic\Calendar::getDateFormat('short', $locale);
}
@ -546,6 +548,15 @@ class OC_L10N implements \OCP\IL10N {
*/
public function getFirstWeekDay() {
$locale = $this->getLanguageCode();
$locale = $this->transformToCLDRLocale($locale);
return Punic\Calendar::getFirstWeekday($locale);
}
private function transformToCLDRLocale($locale) {
if ($locale === 'sr@latin') {
return 'sr_latn';
}
return $locale;
}
}