language module dependency fix

diff --git a/includes/resourceloader/ResourceLoaderLanguageDataModule.php b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
index e1d6fb4..e07a999 100644
--- a/includes/resourceloader/ResourceLoaderLanguageDataModule.php
+++ b/includes/resourceloader/ResourceLoaderLanguageDataModule.php
@@ -35,16 +35,26 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
        return $wgContLang->getGrammarForms();
    }

+   protected function getSiteDigitTransformTable(){
+       global $wgContLang;
+       return array_merge( $wgContLang->separatorTransformTable(),
+           $wgContLang->digitTransformTable() );
+   }
+
    /**
     * @param $context ResourceLoaderContext
     * @return string Javascript code
     */
    public function getScript( ResourceLoaderContext $context ) {
        global $wgContLang;
-
-       return Xml::encodeJsCall( 'mw.language.setData', array(
-           $wgContLang->getCode(),
-           array( 'grammarForms' => $this->getSiteLangGrammarForms() )
+       return Xml::encodeJsCall( 'mw.config.set', array(
+           'languagedata',
+            array(
+               $wgContLang->getCode() =>
+               array(
+                   'grammarForms' => $this->getSiteLangGrammarForms(),
+               )
+           )
        ) );
    }

@@ -70,10 +80,4 @@ class ResourceLoaderLanguageDataModule extends ResourceLoaderModule {
        return $timestamp;
    }

-   /**
-    * @return array
-    */
-   public function getDependencies() {
-       return array( 'mediawiki.language' );
-   }
 }
diff --git a/resources/Resources.php b/resources/Resources.php
index 2855f9a..cbec3f3 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -723,6 +723,7 @@ return array(
            'uk' => 'resources/mediawiki.language/languages/uk.js',
            'wa' => 'resources/mediawiki.language/languages/wa.js',
        ),
+       'dependencies' => array( 'mediawiki.language.data' ),
    ),

    'mediawiki.jqueryMsg' => array(
diff --git a/resources/mediawiki.language/languages/nl.js b/resources/mediawiki.language/languages/nl.js
index a2b22f4..9ae1cdc 100644
--- a/resources/mediawiki.language/languages/nl.js
+++ b/resources/mediawiki.language/languages/nl.js
@@ -1,8 +1,9 @@
 /**
  * Dutch (Nederlands) language functions
  */
-
+/*
 mediaWiki.language.digitTransformTable = {
     '.' : ',',
     ',' : '.'
 };
+*/
diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js
index 67b605c..76ac355 100644
--- a/resources/mediawiki.language/mediawiki.language.js
+++ b/resources/mediawiki.language/mediawiki.language.js
@@ -21,7 +21,7 @@ var language = {
     *     var grammarForms = mw.language.getData( 'nl', 'grammarForms' );
     * </code>
     */
-   data: {},
+   data: mw.config.get( 'languagedata' ),

    /**
     * Convenience method for retreiving language data by language code and data key,
@@ -33,8 +33,8 @@ var language = {
     */
    getData: function ( langCode, dataKey ) {
        var langData = language.data;
-       if ( langData[langCode] instanceof mw.Map ) {
-           return langData[langCode].get( dataKey );
+       if ( langData[langCode] ) {
+           return langData[langCode][dataKey];
        }
        return undefined;
    },
@@ -185,8 +185,8 @@ var language = {
        return word;
    },

-   // Digit Transform Table, populated by language classes where applicable
-   'digitTransformTable': null
+   // Digit Transform Table.
+   digitTransformTable: null
 };

 mw.language = language;