hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1237 from ckquentvp/fix-accept-language-underscore-parsing

Browse Source 
match languages such as ja_rm (or any other with underscore) properly
This commit is contained in:
Sarah Hoffmann
2018-11-24 16:20:00 +01:00
committed by GitHub
parent 14cef94e61 3cd3d1f5ae
commit f0088ca2be
2 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ParameterParser.php
View File

@@ -91,7 +91,7 @@ class ParameterParser
$sLangString = $this->getString('accept-language', $sFallback); $sLangString = $this->getString('accept-language', $sFallback);
if ($sLangString) { if ($sLangString) {
if (preg_match_all('/(([a-z]{1,8})(-[a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)) { if (preg_match_all('/(([a-z]{1,8})([-_][a-z]{1,8})?)\s*(;\s*q\s*=\s*(1|0\.[0-9]+))?/i', $sLangString, $aLanguagesParse, PREG_SET_ORDER)) {
foreach ($aLanguagesParse as $iLang => $aLanguage) { foreach ($aLanguagesParse as $iLang => $aLanguage) {
$aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100); $aLanguages[$aLanguage[1]] = isset($aLanguage[5])?(float)$aLanguage[5]:1 - ($iLang/100);
if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10; if (!isset($aLanguages[$aLanguage[2]])) $aLanguages[$aLanguage[2]] = $aLanguages[$aLanguage[1]]/10;

22
test/php/Nominatim/ParameterParserTest.php
View File

@@ -223,5 +223,27 @@ class ParameterParserTest extends \PHPUnit\Framework\TestCase
'ref' => 'ref', 'ref' => 'ref',
'type' => 'type', 'type' => 'type',
), $oParams->getPreferredLanguages('default')); ), $oParams->getPreferredLanguages('default'));
$oParams = new ParameterParser(array('accept-language' => 'ja_rm,zh_pinyin'));
$this->assertSame(array(
'short_name:ja_rm' => 'short_name:ja_rm',
'name:ja_rm' => 'name:ja_rm',
'short_name:zh_pinyin' => 'short_name:zh_pinyin',
'name:zh_pinyin' => 'name:zh_pinyin',
'short_name:ja' => 'short_name:ja',
'name:ja' => 'name:ja',
'short_name:zh' => 'short_name:zh',
'name:zh' => 'name:zh',
'short_name' => 'short_name',
'name' => 'name',
'brand' => 'brand',
'official_name:ja_rm' => 'official_name:ja_rm',
'official_name:zh_pinyin' => 'official_name:zh_pinyin',
'official_name:ja' => 'official_name:ja',
'official_name:zh' => 'official_name:zh',
'official_name' => 'official_name',
'ref' => 'ref',
'type' => 'type',
), $oParams->getPreferredLanguages('default'));
} }
} }