jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404799 )
Change subject: Add aliases for Georgian, Armenian, Spanish, and Japanese
......................................................................
Add aliases for Georgian, Armenian, Spanish, and Japanese
Also make it possible to add multiple aliases for a language.
Bug: T178996
Change-Id: I00bb4a158caed0c1ba15d41e294281a001c917b1
---
M data/LanguageNameIndexer.php
M data/LanguageNameSearchData.php
M tests/phpunit/LanguageSearchTest.php
3 files changed, 41 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Nikerabbit: Looks good to me, approved
diff --git a/data/LanguageNameIndexer.php b/data/LanguageNameIndexer.php
index 30f4ca9..113c2a1 100644
--- a/data/LanguageNameIndexer.php
+++ b/data/LanguageNameIndexer.php
@@ -76,20 +76,28 @@
// To resolve this, some languages are added here locally.
$specialLanguages = [
// Catalan, sometimes searched as "Valencià"
- 'ca' => 'valencia',
+ 'ca' => [ 'valencia' ],
+ // Spanish, the transliteration of the autonym is often
used for searching
+ 'es' => [ 'castellano' ],
+ // Armenian, the transliteration of the autonym is
often used for searching
+ 'hy' => [ 'hayeren' ],
// Georgian, the transliteration of the autonym is
often used for searching
- 'ka' => 'kartuli',
+ 'ka' => [ 'kartuli', 'qartuli' ],
+ // Japanese, the transliteration of the autonym is
often used for searching
+ 'ja' => [ 'nihongo', 'にほんご' ],
// Western Punjabi, doesn't start with the word
"Punjabi" in any language
- 'pnb' => 'punjabi western',
+ 'pnb' => [ 'punjabi western' ],
// Simplified and Traditional Chinese, because zh-hans
and zh-hant
// are not mapped to any English name
- 'zh-hans' => 'chinese simplified',
- 'zh-hant' => 'chinese traditional',
+ 'zh-hans' => [ 'chinese simplified' ],
+ 'zh-hant' => [ 'chinese traditional' ],
];
- foreach ( $specialLanguages as $targetLanguage => $translation
) {
- $bucket = LanguageNameSearch::getIndex( $translation );
- $buckets[$bucket]['prefix'][$translation] =
$targetLanguage;
+ foreach ( $specialLanguages as $targetLanguage => $translations
) {
+ foreach ( $translations as $translation ) {
+ $bucket = LanguageNameSearch::getIndex(
$translation );
+ $buckets[$bucket]['prefix'][$translation] =
$targetLanguage;
+ }
}
$lengths = [];
diff --git a/data/LanguageNameSearchData.php b/data/LanguageNameSearchData.php
index 91543cb..9ce61ae 100644
--- a/data/LanguageNameSearchData.php
+++ b/data/LanguageNameSearchData.php
@@ -3174,6 +3174,7 @@
'casaco' => 'kk',
'casaicis' => 'kk',
'cashmireg' => 'ks',
+ 'castellano' => 'es',
'casubio' => 'csb',
'catalaans' => 'ca',
'catalan' => 'ca',
@@ -7881,6 +7882,7 @@
'hawäieg' => 'haw',
'hayda' => 'hai',
'haydaca' => 'hai',
+ 'hayeren' => 'hy',
'haída' => 'hai',
'haítíska' => 'ht',
'haïtiaans' => 'ht',
@@ -15675,6 +15677,7 @@
'nigeriý-pijin dili' => 'pcm',
'nigerkordofaansche spraken' => 'nic',
'nigériai pidgin' => 'pcm',
+ 'nihongo' => 'ja',
'niidumari' => 'mhr',
'nijas' => 'nia',
'nijerya pidgin dili' => 'pcm',
@@ -17652,6 +17655,7 @@
'qaraqalpaq' => 'kaa',
'qaraqalpaqsha' => 'kaa',
'qaraçay-balkar' => 'krc',
+ 'qartuli' => 'ka',
'qayo' => 'gay',
'qazaqşa (latın)' => 'kk-latn',
'qazaqşa (türkïya)' => 'kk-tr',
@@ -50303,6 +50307,7 @@
],
12000 => [
'prefix' => [
+ 'にほんご' => 'ja',
'アイスランド語' => 'is',
'アイヌ語' => 'ain',
'アイマラ語' => 'ay',
diff --git a/tests/phpunit/LanguageSearchTest.php
b/tests/phpunit/LanguageSearchTest.php
index 1d86d5c..4c8b10e 100644
--- a/tests/phpunit/LanguageSearchTest.php
+++ b/tests/phpunit/LanguageSearchTest.php
@@ -67,10 +67,30 @@
'pnb' => 'punjabi western',
]
],
+ [ 'castellano', [
+ 'es' => 'castellano',
+ ]
+ ],
+ [ 'hayeren', [
+ 'hy' => 'hayeren',
+ ]
+ ],
[ 'kartuli', [
'ka' => 'kartuli',
]
],
+ [ 'qartuli', [
+ 'ka' => 'qartuli',
+ ]
+ ],
+ [ 'nihongo', [
+ 'ja' => 'nihongo',
+ ]
+ ],
+ [ 'にほんご', [
+ 'ja' => 'にほんご',
+ ]
+ ],
[ 'valencia', [
'ca' => 'valencia',
]
--
To view, visit https://gerrit.wikimedia.org/r/404799
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I00bb4a158caed0c1ba15d41e294281a001c917b1
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Amire80 <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
