Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Ensure LanguageCode::bcp47() returns a valid BCP 47 language code"

Browse source 
This reverts commit 8380f0173e.

Reason for revert: Caused T199941

Bug: T199941
Change-Id: I93af756a2d70d6bc91f828fe6ac19bf10ca8788f
This commit is contained in:
Greg Grossmeier 2018-07-23 16:45:31 +00:00 committed by Krinkle
parent 401e9b849a
commit b302b0cd1c
10 changed files with 27 additions and 212 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
RELEASE-NOTES-1.32
View file

@ -192,9 +192,6 @@ because of Phabricator reports.
CapsuleMultiselectWidget. The following methods may no longer be used:
* setItemsFromData: Use setValue instead
* getItemsData: Use getItems instead and get the data property
* LanguageCode::bcp47() now always returns a valid BCP 47 code. This means
that some MediaWiki-specific language codes, such as `simple`, are mapped
into valid BCP 47 codes (eg `en-simple`).
=== Deprecations in 1.32 ===
* Use of a StartProfiler.php file is deprecated in favour of placing

5
includes/api/ApiQuerySiteinfo.php
View file

@ -705,10 +705,7 @@ class ApiQuerySiteinfo extends ApiQueryBase {
$data = [];
foreach ( $langNames as $code => $name ) {
$lang = [
'code' => $code,
'bcp47' => LanguageCode::bcp47( $code ),
];
$lang = [ 'code' => $code ];
ApiResult::setContentValue( $lang, 'name', $name );
$data[] = $lang;
}

1
includes/resourceloader/ResourceLoaderLanguageDataModule.php
View file

@ -46,7 +46,6 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderFileModule {
'pluralRules' => $language->getPluralRules(),
'digitGroupingPattern' => $language->digitGroupingPattern(),
'fallbackLanguages' => $language->getFallbackLanguages(),
'bcp47Map' => LanguageCode::getNonstandardLanguageCodeMapping(),
];
}

108
languages/LanguageCode.php
View file

@ -30,85 +30,22 @@ class LanguageCode {
/**
* Mapping of deprecated language codes that were used in previous
* versions of MediaWiki to up-to-date, current language codes.
* These may or may not be valid BCP 47 codes; they are included here
* because MediaWiki remapped these particular codes at some point.
*
* @var array Mapping from language code to language code
*
* @since 1.30
* @see https://meta.wikimedia.org/wiki/Special_language_codes
*/
private static $deprecatedLanguageCodeMapping = [
// Note that als is actually a valid ISO 639 code (Tosk Albanian), but it
// was previously used in MediaWiki for Alsatian, which comes under gsw
'als' => 'gsw', // T25215
'bat-smg' => 'sgs', // T27522
'be-x-old' => 'be-tarask', // T11823
'fiu-vro' => 'vro', // T31186
'roa-rup' => 'rup', // T17988
'zh-classical' => 'lzh', // T30443
'zh-min-nan' => 'nan', // T30442
'zh-yue' => 'yue', // T30441
];
/**
* Mapping of non-standard language codes used in MediaWiki to
* standardized BCP 47 codes. These are not deprecated (yet?):
* IANA may eventually recognize the subtag, in which case the `-x-`
* infix could be removed, or else we could rename the code in
* MediaWiki, in which case they'd move up to the above mapping
* of deprecated codes.
*
* As a rule, we preserve all distinctions made by MediaWiki
* internally. For example, `de-formal` becomes `de-x-formal`
* instead of just `de` because MediaWiki distinguishes `de-formal`
* from `de` (for example, for interface translations). Similarly,
* BCP 47 indicates that `kk-Cyrl` SHOULD not be used because it
* "typically does not add information", but in our case MediaWiki
* LanguageConverter distinguishes `kk` (render content in a mix of
* Kurdish variants) from `kk-Cyrl` (convert content to be uniformly
* Cyrillic). As the BCP 47 requirement is a SHOULD not a MUST,
* `kk-Cyrl` is a valid code, although some validators may emit
* a warning note.
*
* @var array Mapping from nonstandard codes to BCP 47 codes
*
* @since 1.32
* @see https://meta.wikimedia.org/wiki/Special_language_codes
* @see https://phabricator.wikimedia.org/T125073
*/
private static $nonstandardLanguageCodeMapping = [
// All codes returned by Language::fetchLanguageNames() validated
// against IANA registry at
// https://www.iana.org/assignments/language-subtag-registry/language-subtag-registry
// with help of validator at
// http://schneegans.de/lv/
'cbk-zam' => 'cbk', // T124657
'de-formal' => 'de-x-formal',
'eml' => 'egl', // T36217
'en-rtl' => 'en-x-rtl',
'es-formal' => 'es-x-formal',
'hu-formal' => 'hu-x-formal',
'map-bms' => 'jv-x-bms', // [[en:Banyumasan_dialect]] T125073
'mo' => 'ro-MD', // T125073
'nrm' => 'nrf', // [[en:Norman_language]] T25216
'nl-informal' => 'nl-x-informal',
'roa-tara' => 'nap-x-tara', // [[en:Tarantino_dialect]]
'simple' => 'en-simple',
'sr-ec' => 'sr-Cyrl', // T117845
'sr-el' => 'sr-Latn', // T117845
// Although these next codes aren't *wrong* per se, including
// both the script and the country code helps compatibility with
// other BCP 47 users. Note that MW also uses `zh-Hans`/`zh-Hant`,
// without a country code, and those should be left alone.
// (See $variantfallbacks in LanguageZh.php for Hans/Hant id.)
'zh-cn' => 'zh-Hans-CN',
'zh-sg' => 'zh-Hans-SG',
'zh-my' => 'zh-Hans-MY',
'zh-tw' => 'zh-Hant-TW',
'zh-hk' => 'zh-Hant-HK',
'zh-mo' => 'zh-Hant-MO',
'als' => 'gsw',
'bat-smg' => 'sgs',
'be-x-old' => 'be-tarask',
'fiu-vro' => 'vro',
'roa-rup' => 'rup',
'zh-classical' => 'lzh',
'zh-min-nan' => 'nan',
'zh-yue' => 'yue',
];
/**
@ -127,29 +64,6 @@ class LanguageCode {
return self::$deprecatedLanguageCodeMapping;
}
/**
* Returns a mapping of non-standard language codes used by
* (current and previous version of) MediaWiki, mapped to standard
* BCP 47 names.
*
* This array is exported to JavaScript to ensure
* mediawiki.language.bcp47 stays in sync with LanguageCode::bcp47().
*
* @return string[]
*
* @since 1.32
*/
public static function getNonstandardLanguageCodeMapping() {
$result = [];
foreach ( self::$deprecatedLanguageCodeMapping as $code => $ignore ) {
$result[$code] = self::bcp47( $code );
}
foreach ( self::$nonstandardLanguageCodeMapping as $code => $ignore ) {
$result[$code] = self::bcp47( $code );
}
return $result;
}
/**
* Replace deprecated language codes that were used in previous
* versions of MediaWiki to up-to-date, current language codes.
@ -173,15 +87,11 @@ class LanguageCode {
* See mediawiki.language.bcp47 for the JavaScript implementation.
*
* @param string $code The language code.
* @return string A language code complying with BCP 47 standards.
* @return string The language code which complying with BCP 47 standards.
*
* @since 1.31
*/
public static function bcp47( $code ) {
$code = self::replaceDeprecatedCodes( strtolower( $code ) );
if ( isset( self::$nonstandardLanguageCodeMapping[$code] ) ) {
$code = self::$nonstandardLanguageCodeMapping[$code];
}
$codeSegment = explode( '-', $code );
$codeBCP = [];
foreach ( $codeSegment as $segNo => $seg ) {

16
languages/data/Names.php
View file

@ -82,7 +82,7 @@ class Names {
'ba' => 'башҡортса', # Bashkir
'ban' => 'Basa Bali', # Balinese
'bar' => 'Boarisch', # Bavarian (Austro-Bavarian and South Tyrolean)
'bat-smg' => 'žemaitėška', # Samogitian (deprecated code, 'sgs' in ISO 639-3 since 2010-06-30 )
'bat-smg' => 'žemaitėška', # Samogitian (deprecated code, 'sgs' in ISO 693-3 since 2010-06-30 )
'bbc' => 'Batak Toba', # Batak Toba (falls back to bbc-latn)
'bbc-latn' => 'Batak Toba', # Batak Toba
'bcc' => 'جهلسری بلوچی', # Southern Balochi
@ -287,7 +287,7 @@ class Names {
'lzh' => '文言', # Literary Chinese, T10217
'lzz' => 'Lazuri', # Laz
'mai' => 'मैथिली', # Maithili
'map-bms' => 'Basa Banyumasan', # Banyumasan ('jv-x-bms')
'map-bms' => 'Basa Banyumasan', # Banyumasan
'mdf' => 'мокшень', # Moksha
'mg' => 'Malagasy', # Malagasy
'mh' => 'Ebon', # Marshallese
@ -298,7 +298,7 @@ class Names {
'ml' => 'മലയാളം', # Malayalam
'mn' => 'монгол', # Halh Mongolian (Cyrillic) (ISO 639-3: khk)
'mni' => 'মেইতেই লোন্', # Manipuri/Meitei
'mo' => 'молдовеняскэ', # Moldovan, deprecated (ISO 639-2: ro-MD)
'mo' => 'молдовеняскэ', # Moldovan, deprecated
'mr' => 'मराठी', # Marathi
'mrj' => 'кырык мары', # Hill Mari
'ms' => 'Bahasa Melayu', # Malay
@ -309,7 +309,7 @@ class Names {
'myv' => 'эрзянь', # Erzya
'mzn' => 'مازِرونی', # Mazanderani
'na' => 'Dorerin Naoero', # Nauruan
'nah' => 'Nāhuatl', # Nahuatl (added to ISO 639-3 on 2006-10-31)
'nah' => 'Nāhuatl', # Nahuatl (not in ISO 639-3)
'nan' => 'Bân-lâm-gú', # Min-nan, T10217
'nap' => 'Napulitano', # Neapolitan, T45793
'nb' => 'norsk bokmål', # Norwegian (Bokmal)
@ -324,7 +324,7 @@ class Names {
'nn' => 'norsk nynorsk', # Norwegian (Nynorsk)
'no' => 'norsk', # Norwegian macro language (falls back to nb).
'nov' => 'Novial', # Novial
'nrm' => 'Nouormand', # Norman (invalid code; 'nrf' in ISO 639 since 2014)
'nrm' => 'Nouormand', # Norman
'nso' => 'Sesotho sa Leboa', # Northern Sotho
'nv' => 'Diné bizaad', # Navajo
'ny' => 'Chi-Chewa', # Chichewa
@ -360,8 +360,8 @@ class Names {
'rmy' => 'Romani', # Vlax Romany
'rn' => 'Kirundi', # Rundi/Kirundi/Urundi
'ro' => 'română', # Romanian
'roa-rup' => 'armãneashti', # Aromanian (deprecated code, 'rup' exists in ISO 639-3)
'roa-tara' => 'tarandíne', # Tarantino ('nap-x-tara')
'roa-rup' => 'armãneashti', # Aromanian (deprecated code, 'rup' exists in ISO 693-3)
'roa-tara' => 'tarandíne', # Tarantino
'ru' => 'русский', # Russian
'rue' => 'русиньскый', # Rusyn
'rup' => 'armãneashti', # Aromanian
@ -437,7 +437,7 @@ class Names {
'tt-cyrl' => 'татарча', # Tatar (Cyrillic script) (default)
'tt-latn' => 'tatarça', # Tatar (Latin script)
'tum' => 'chiTumbuka', # Tumbuka
'tw' => 'Twi', # Twi
'tw' => 'Twi', # Twi, (FIXME!)
'ty' => 'reo tahiti', # Tahitian
'tyv' => 'тыва дыл', # Tyvan
'tzm' => 'ⵜⴰⵎⴰⵣⵉⵖⵜ', # Tamazight

4
languages/i18n/qqq.json
View file

@ -3400,8 +3400,8 @@
"variantname-gan-hans": "{{Optional}}\n\nVariant option for wikis with variants conversion enabled.",
"variantname-gan-hant": "{{Optional}}\n\nVariant option for wikis with variants conversion enabled.",
"variantname-gan": "{{Optional}}\n\nVariant option for wikis with variants conversion enabled.",
"variantname-sr-ec": "{{optional}}\nVariant Option for wikis with variants conversion enabled.\n\nNote that <code>sr-ec</code> is not a conforming BCP 47 language tag. Wikis should be migrated by:\n* allowing it only as a legacy alias of the preferred tag <code>sr-cyrl</code> (possibly insert a tracking category in templates as long as they must support the legacy tag),\n* making the new tag the default to look first, before looking for the old tag,\n* moving the translations to the new code by renaming them,\n* checking links in source pages still using the legacy tag to change it to the new tag,\n* possibly cleanup the redirect pages.",
"variantname-sr-el": "{{optional}}\nVariant Option for wikis with variants conversion enabled.\n\nNote that <code>sr-el</code> is not a conforming BCP 47 language tag. Wikis should be migrated by:\n* allowing it only as a legacy alias of the preferred tag <code>sr-latn</code> (possibly insert a tracking category in templates as long as they must support the legacy tag),\n* making the new tag the default to look first, before looking for the old tag,\n* moving the translations to the new code by renaming them,\n* checking links in source pages still using the legacy tag to change it to the new tag,\n* possibly cleanup the redirect pages.",
"variantname-sr-ec": "{{optional}}\nVariant Option for wikis with variants conversion enabled.\n\nNote that <code>sr-ec</code> is not a conforming BCP47 language tag. Wikis should be migrated by:\n* allowing it only as a legacy alias of the preferred tag <code>sr-cyrl</code> (possibly insert a tracking category in templates as long as they must support the legacy tag),\n* making the new tag the default to look first, before looking for the old tag,\n* moving the translations to the new code by renaming them,\n* checking links in source pages still using the legacy tag to change it to the new tag,\n* possibly cleanup the redirect pages.",
"variantname-sr-el": "{{optional}}\nVariant Option for wikis with variants conversion enabled.\n\nNote that <code>sr-el</code> is not a conforming BCP47 language tag. Wikis should be migrated by:\n* allowing it only as a legacy alias of the preferred tag <code>sr-latn</code> (possibly insert a tracking category in templates as long as they must support the legacy tag),\n* making the new tag the default to look first, before looking for the old tag,\n* moving the translations to the new code by renaming them,\n* checking links in source pages still using the legacy tag to change it to the new tag,\n* possibly cleanup the redirect pages.",
"variantname-sr": "{{optional}}\nVariant Option for wikis with variants conversion enabled.",
"variantname-kk-kz": "{{optional}}\nVariant Option for wikis with variants conversion enabled.",
"variantname-kk-tr": "{{optional}}\nVariant Option for wikis with variants conversion enabled.",

2
resources/src/mediawiki.language/mediawiki.language.init.js
View file

@ -37,8 +37,6 @@
* - `pluralRules`
* - `digitGroupingPattern`
* - `fallbackLanguages`
* - `bcp47Map`
* - `languageNames`
*
* @property
*/

17
resources/src/mediawiki.language/mediawiki.language.js
View file

@ -191,27 +191,18 @@
},
/**
* Formats language tags according the BCP 47 standard.
* Formats language tags according the BCP47 standard.
* See LanguageCode::bcp47 for the PHP implementation.
*
* @param {string} languageTag Well-formed language tag
* @return {string}
*/
bcp47: function ( languageTag ) {
var bcp47Map,
formatted,
segments,
var formatted,
isFirstSegment = true,
isPrivate = false;
isPrivate = false,
segments = languageTag.split( '-' );
languageTag = languageTag.toLowerCase();
bcp47Map = mw.language.getData( mw.config.get( 'wgUserLanguage' ), 'bcp47Map' );
if ( bcp47Map && Object.prototype.hasOwnProperty.call( bcp47Map, languageTag ) ) {
languageTag = bcp47Map[ languageTag ];
}
segments = languageTag.split( '-' );
formatted = segments.map( function ( segment ) {
var newSegment;

43
tests/phpunit/languages/LanguageCodeTest.php
View file

@ -54,18 +54,14 @@ class LanguageCodeTest extends PHPUnit\Framework\TestCase {
* @dataProvider provideLanguageCodes()
*/
public function testBcp47( $code, $expected ) {
$this->assertEquals( $expected, LanguageCode::bcp47( $code ),
"Applying BCP 47 standard to '$code'"
);
$code = strtolower( $code );
$this->assertEquals( $expected, LanguageCode::bcp47( $code ),
"Applying BCP 47 standard to lower case '$code'"
"Applying BCP47 standard to lower case '$code'"
);
$code = strtoupper( $code );
$this->assertEquals( $expected, LanguageCode::bcp47( $code ),
"Applying BCP 47 standard to upper case '$code'"
"Applying BCP47 standard to upper case '$code'"
);
}
@ -159,41 +155,6 @@ class LanguageCodeTest extends PHPUnit\Framework\TestCase {
// de-419-DE
// a-DE
// ar-a-aaa-b-bbb-a-ccc
# Non-standard and deprecated language codes used by MediaWiki
[ 'als', 'gsw' ],
[ 'bat-smg', 'sgs' ],
[ 'be-x-old', 'be-tarask' ],
[ 'fiu-vro', 'vro' ],
[ 'roa-rup', 'rup' ],
[ 'zh-classical', 'lzh' ],
[ 'zh-min-nan', 'nan' ],
[ 'zh-yue', 'yue' ],
[ 'cbk-zam', 'cbk' ],
[ 'de-formal', 'de-x-formal' ],
[ 'eml', 'egl' ],
[ 'en-rtl', 'en-x-rtl' ],
[ 'es-formal', 'es-x-formal' ],
[ 'hu-formal', 'hu-x-formal' ],
[ 'kk-Arab', 'kk-Arab' ],
[ 'kk-Cyrl', 'kk-Cyrl' ],
[ 'kk-Latn', 'kk-Latn' ],
[ 'map-bms', 'jv-x-bms' ],
[ 'mo', 'ro-MD' ],
[ 'nrm', 'nrf' ],
[ 'nl-informal', 'nl-x-informal' ],
[ 'roa-tara', 'nap-x-tara' ],
[ 'simple', 'en-simple' ],
[ 'sr-ec', 'sr-Cyrl' ],
[ 'sr-el', 'sr-Latn' ],
[ 'zh-cn', 'zh-Hans-CN' ],
[ 'zh-sg', 'zh-Hans-SG' ],
[ 'zh-my', 'zh-Hans-MY' ],
[ 'zh-tw', 'zh-Hant-TW' ],
[ 'zh-hk', 'zh-Hant-HK' ],
[ 'zh-mo', 'zh-Hant-MO' ],
[ 'zh-hans', 'zh-Hans' ],
[ 'zh-hant', 'zh-Hant' ],
];
}

40
tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
View file

@ -691,57 +691,19 @@
// # Tags that use extensions
[ 'en-us-u-islamcal', 'en-US-u-islamcal' ],
[ 'zh-cn-a-myext-x-private', 'zh-CN-a-myext-x-private' ],
[ 'en-a-myext-b-another', 'en-a-myext-b-another' ],
[ 'en-a-myext-b-another', 'en-a-myext-b-another' ]
// # Invalid:
// de-419-DE
// a-DE
// ar-a-aaa-b-bbb-a-ccc
// Non-standard and deprecated language codes used by MediaWiki
[ 'als', 'gsw' ],
[ 'bat-smg', 'sgs' ],
[ 'be-x-old', 'be-tarask' ],
[ 'fiu-vro', 'vro' ],
[ 'roa-rup', 'rup' ],
[ 'zh-classical', 'lzh' ],
[ 'zh-min-nan', 'nan' ],
[ 'zh-yue', 'yue' ],
[ 'cbk-zam', 'cbk' ],
[ 'de-formal', 'de-x-formal' ],
[ 'eml', 'egl' ],
[ 'en-rtl', 'en-x-rtl' ],
[ 'es-formal', 'es-x-formal' ],
[ 'hu-formal', 'hu-x-formal' ],
[ 'kk-Arab', 'kk-Arab' ],
[ 'kk-Cyrl', 'kk-Cyrl' ],
[ 'kk-Latn', 'kk-Latn' ],
[ 'map-bms', 'jv-x-bms' ],
[ 'mo', 'ro-MD' ],
[ 'nrm', 'nrf' ],
[ 'nl-informal', 'nl-x-informal' ],
[ 'roa-tara', 'nap-x-tara' ],
[ 'simple', 'en-simple' ],
[ 'sr-ec', 'sr-Cyrl' ],
[ 'sr-el', 'sr-Latn' ],
[ 'zh-cn', 'zh-Hans-CN' ],
[ 'zh-sg', 'zh-Hans-SG' ],
[ 'zh-my', 'zh-Hans-MY' ],
[ 'zh-tw', 'zh-Hant-TW' ],
[ 'zh-hk', 'zh-Hant-HK' ],
[ 'zh-mo', 'zh-Hant-MO' ],
[ 'zh-hans', 'zh-Hans' ],
[ 'zh-hant', 'zh-Hant' ]
];
QUnit.test( 'mw.language.bcp47', function ( assert ) {
mw.language.data = this.liveLangData;
bcp47Tests.forEach( function ( data ) {
var input = data[ 0 ],
expected = data[ 1 ];
assert.strictEqual( mw.language.bcp47( input ), expected );
assert.strictEqual( mw.language.bcp47( input.toLowerCase() ), expected );
assert.strictEqual( mw.language.bcp47( input.toUpperCase() ), expected );
} );
} );
}( mediaWiki, jQuery ) );