SHOW:
|
|
- or go back to the newest paste.
| 1 | diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php b/includes/resourceloader/ResourceLoaderLanguageDataModule.php | |
| 2 | index e1d6fb4..e07a999 100644 | |
| 3 | --- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php | |
| 4 | +++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php | |
| 5 | @@ -35,16 +35,26 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
| |
| 6 | return $wgContLang->getGrammarForms(); | |
| 7 | } | |
| 8 | ||
| 9 | + protected function getSiteDigitTransformTable(){
| |
| 10 | + global $wgContLang; | |
| 11 | + return array_merge( $wgContLang->separatorTransformTable(), | |
| 12 | + $wgContLang->digitTransformTable() ); | |
| 13 | + } | |
| 14 | + | |
| 15 | /** | |
| 16 | * @param $context ResourceLoaderContext | |
| 17 | * @return string Javascript code | |
| 18 | */ | |
| 19 | public function getScript( ResourceLoaderContext $context ) {
| |
| 20 | global $wgContLang; | |
| 21 | - | |
| 22 | - return Xml::encodeJsCall( 'mw.language.setData', array( | |
| 23 | - $wgContLang->getCode(), | |
| 24 | - array( 'grammarForms' => $this->getSiteLangGrammarForms() ) | |
| 25 | + return Xml::encodeJsCall( 'mw.config.set', array( | |
| 26 | + 'languagedata', | |
| 27 | + array( | |
| 28 | + $wgContLang->getCode() => | |
| 29 | + array( | |
| 30 | + 'grammarForms' => $this->getSiteLangGrammarForms(), | |
| 31 | + ) | |
| 32 | + ) | |
| 33 | ) ); | |
| 34 | } | |
| 35 | ||
| 36 | @@ -70,10 +80,4 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
| |
| 37 | return $timestamp; | |
| 38 | } | |
| 39 | ||
| 40 | - /** | |
| 41 | - * @return array | |
| 42 | - */ | |
| 43 | - public function getDependencies() {
| |
| 44 | - return array( 'mediawiki.language' ); | |
| 45 | - } | |
| 46 | } | |
| 47 | diff --git a/resources/Resources.php b/resources/Resources.php | |
| 48 | index 2855f9a..cbec3f3 100644 | |
| 49 | --- a/resources/Resources.php | |
| 50 | +++ b/resources/Resources.php | |
| 51 | @@ -723,6 +723,7 @@ return array( | |
| 52 | 'uk' => 'resources/mediawiki.language/languages/uk.js', | |
| 53 | 'wa' => 'resources/mediawiki.language/languages/wa.js', | |
| 54 | ), | |
| 55 | + 'dependencies' => array( 'mediawiki.language.data' ), | |
| 56 | ), | |
| 57 | ||
| 58 | 'mediawiki.jqueryMsg' => array( | |
| 59 | diff --git a/resources/mediawiki.language/languages/nl.js b/resources/mediawiki.language/languages/nl.js | |
| 60 | index a2b22f4..9ae1cdc 100644 | |
| 61 | --- a/resources/mediawiki.language/languages/nl.js | |
| 62 | +++ b/resources/mediawiki.language/languages/nl.js | |
| 63 | @@ -1,8 +1,9 @@ | |
| 64 | /** | |
| 65 | * Dutch (Nederlands) language functions | |
| 66 | */ | |
| 67 | - | |
| 68 | +/* | |
| 69 | mediaWiki.language.digitTransformTable = {
| |
| 70 | '.' : ',', | |
| 71 | ',' : '.' | |
| 72 | }; | |
| 73 | +*/ | |
| 74 | diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js | |
| 75 | index 67b605c..76ac355 100644 | |
| 76 | --- a/resources/mediawiki.language/mediawiki.language.js | |
| 77 | +++ b/resources/mediawiki.language/mediawiki.language.js | |
| 78 | @@ -21,7 +21,7 @@ var language = {
| |
| 79 | * var grammarForms = mw.language.getData( 'nl', 'grammarForms' ); | |
| 80 | * </code> | |
| 81 | */ | |
| 82 | - data: {},
| |
| 83 | - | |
| 83 | + | |
| 84 | ||
| 85 | /** | |
| 86 | * Convenience method for retreiving language data by language code and data key, | |
| 87 | @@ -33,8 +33,8 @@ var language = {
| |
| 88 | */ | |
| 89 | getData: function ( langCode, dataKey ) {
| |
| 90 | var langData = language.data; | |
| 91 | - if ( langData[langCode] instanceof mw.Map ) {
| |
| 92 | - return langData[langCode].get( dataKey ); | |
| 93 | + if ( langData[langCode] ) {
| |
| 94 | + return langData[langCode][dataKey]; | |
| 95 | } | |
| 96 | return undefined; | |
| 97 | }, | |
| 98 | @@ -185,8 +185,8 @@ var language = {
| |
| 99 | return word; | |
| 100 | }, | |
| 101 | ||
| 102 | - // Digit Transform Table, populated by language classes where applicable | |
| 103 | - 'digitTransformTable': null | |
| 104 | + // Digit Transform Table. | |
| 105 | + digitTransformTable: null | |
| 106 | }; | |
| 107 | ||
| 108 | mw.language = language; |
