Revert to arbitrarily old point before initial remote branch creation to help clean up

Change-Id: I41a3d1e55d3ea9dffa42451237fe065f9334361d

2 files changed, 50 insertions, 60 deletions

diff --git a/resources/mediawiki.language/mediawiki.language.init.js b/resources/mediawiki.language/mediawiki.language.init.js
deleted file mode 100644
index 20ed711b3424..000000000000
--- a/resources/mediawiki.language/mediawiki.language.init.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Base language object with methods for storing and getting
- * language data.
- */
-( function( $, mw ) {
-
-var language = {
-	/**
-	 * @var data {Object} Language related data (keyed by language,
-	 * contains instances of mw.Map).
-	 * @example Set data
-	 * <code>
-	 *     // Override, extend or create the language data object of 'nl'
-	 *     mw.language.setData( 'nl', 'myKey', 'My value' );
-	 * </code>
-	 * @example Get GrammarForms data for language 'nl':
-	 * <code>
-	 *     var grammarForms = mw.language.getData( 'nl', 'grammarForms' );
-	 * </code>
-	 */
-	data: {},
-
-	/**
-	 * Convenience method for retreiving language data by language code and data key,
-	 * covering for the potential inexistance of a data object for this langiage.
-	 * @param langCode {String}
-	 * @param dataKey {String}
-	 * @return {mixed} Value stored in the mw.Map (or undefined if there is no map for
-	   the specified langCode).
-	 */
-	getData: function ( langCode, dataKey ) {
-		var langData = language.data;
-		if ( langData[langCode] instanceof mw.Map ) {
-			return langData[langCode].get( dataKey );
-		}
-		return undefined;
-	},
-
-	/**
-	 * Convenience method for setting language data by language code and data key.
-	 * Creates a data object if there isn't one for the specified language already.
-	 * @param langCode {String}
-	 * @param dataKey {String}
-	 * @param value {mixed}
-	 */
-	setData: function ( langCode, dataKey, value ) {
-		var langData = language.data;
-		if ( !( langData[langCode] instanceof mw.Map ) ) {
-			langData[langCode] = new mw.Map();
-		}
-		langData[langCode].set( dataKey, value );
-	}
-}
-mw.language = language;
-
-} )( jQuery, mediaWiki );
diff --git a/resources/mediawiki.language/mediawiki.language.js b/resources/mediawiki.language/mediawiki.language.js
index 87a6a8f3d2d1..67b605cc8a5e 100644
--- a/resources/mediawiki.language/mediawiki.language.js
+++ b/resources/mediawiki.language/mediawiki.language.js
@@ -1,13 +1,59 @@
 /**
+ * Base language object
+ *
  * Localized Language support attempts to mirror some of the functionality of
- * Language.php in MediaWiki.
- * This adds methods for transforming message text.
+ * Language.php in MediaWiki. This object contains methods for loading and
+ * transforming message text.
  */
 ( function( $, mw ) {
 
 var language = {
+	/**
+	 * @var data {Object} Language related data (keyed by language,
+	 * contains instances of mw.Map).
+	 * @example Set data
+	 * <code>
+	 *     // Override, extend or create the language data object of 'nl'
+	 *     mw.language.setData( 'nl', 'myKey', 'My value' );
+	 * </code>
+	 * @example Get GrammarForms data for language 'nl':
+	 * <code>
+	 *     var grammarForms = mw.language.getData( 'nl', 'grammarForms' );
+	 * </code>
+	 */
+	data: {},
 
 	/**
+	 * Convenience method for retreiving language data by language code and data key,
+	 * covering for the potential inexistance of a data object for this langiage.
+	 * @param langCode {String}
+	 * @param dataKey {String}
+	 * @return {mixed} Value stored in the mw.Map (or undefined if there is no map for
+	   the specified langCode).
+	 */
+	getData: function ( langCode, dataKey ) {
+		var langData = language.data;
+		if ( langData[langCode] instanceof mw.Map ) {
+			return langData[langCode].get( dataKey );
+		}
+		return undefined;
+	},
+
+	/**
+	 * Convenience method for setting language data by language code and data key.
+	 * Creates a data object if there isn't one for the specified language already.
+	 * @param langCode {String}
+	 * @param dataKey {String}
+	 * @param value {mixed}
+	 */
+	setData: function ( langCode, dataKey, value ) {
+		var langData = language.data;
+		if ( !( langData[langCode] instanceof mw.Map ) ) {
+			langData[langCode] = new mw.Map();
+		}
+		langData[langCode].set( dataKey, value );
+	},
+	/**
 	 * Process the PLURAL template substitution
 	 *
 	 * @param {object} template Template object
@@ -132,7 +178,7 @@ var language = {
 	 * @return {String}
 	 */
 	convertGrammar: function ( word, form ) {
-		var grammarForms = mw.language.getData( mw.config.get( 'wgContentLanguage' ), 'grammarForms' );
+		var grammarForms = language.getData( mw.config.get( 'wgContentLanguage' ), 'grammarForms' );
 		if ( grammarForms && grammarForms[form] ) {
 			return grammarForms[form][word] || word;
 		}
@@ -143,6 +189,6 @@ var language = {
 	'digitTransformTable': null
 };
 
-$.extend( mw.language, language );
+mw.language = language;
 
 } )( jQuery, mediaWiki );