harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update function doc, return language code if language is not recognized

Browse Source
This commit is contained in:
Stefan Parviainen 2014-12-30 20:34:26 +01:00
parent 9cab8ae58a
commit b54bbf0fb8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/language.php
View File

@ -250,8 +250,7 @@ function detect_language($s) {
* By default we use the localized language name. You can switch the result * By default we use the localized language name. You can switch the result
* to any language with the optional 2nd parameter $l. * to any language with the optional 2nd parameter $l.
* *
* $s and $l can be in any format that PHP's Locale understands. We will mostly * $s and $l should be in 2-letter ISO 639-1 format
* use the 2-letter ISO 639-1 (en, de, fr) format.
* *
* If nothing could be looked up it returns $s. * If nothing could be looked up it returns $s.
* *
@ -275,7 +274,12 @@ function get_language_name($s, $l = null) {
catch(CommerceGuys\Intl\Exception\UnknownLanguageException $e) { catch(CommerceGuys\Intl\Exception\UnknownLanguageException $e) {
$s = substr($s,0,2); $s = substr($s,0,2);
if($l !== null) $l = substr($s,0,2); if($l !== null) $l = substr($s,0,2);
$language = $languageRepository->get($s, $l); try {
$language = $languageRepository->get($s, $l);
}
catch(CommerceGuys\Intl\Exception\UnknownLanguageException $e) {
return $s; // Give up
}
} }
return $language->getName(); return $language->getName();