Merge pull request #17 from wmde/renameTextTypes

Daniel Kinzler · Daniel Kinzler · commit 040ed6d4b9f6 · 2014-05-21T11:39:21.000+02:00
Make DataType consistent with DataValue's type for texts
diff --git a/DataTypes.php b/DataTypes.php
@@ -31,10 +31,10 @@
 	'quantity' => array(
 		'datavalue' => 'quantity',
 	),
-	'monolingual-text' => array(
+	'monolingualtext' => array(
 		'datavalue' => 'monolingualtext',
 	),
-	'multilingual-text' => array(
+	'multilingualtext' => array(
 		'datavalue' => 'multilingualtext',
 	),
 	'time' => array(
diff --git a/README.md b/README.md
@@ -51,6 +51,11 @@ for the [Wikidata project](https://wikidata.org/).
 
 ## Release notes
 
+### 0.3 (2014-05-21)
+
+* Rename `monolingual-text` to `monolingualtext`
+* Rename `multilingual-text` to `multilingualtext`
+
 ### 0.2.1 (2014-05-06)
 
 * migrate i18n to JSON
diff --git a/i18n/en.json b/i18n/en.json
@@ -7,8 +7,8 @@
     "datatypes-desc": "Collection of data type definitions",
     "datatypes-type-string": "String",
     "datatypes-type-quantity": "Quantity",
-    "datatypes-type-monolingual-text": "Monolingual text",
-    "datatypes-type-multilingual-text": "Multilingual text",
+    "datatypes-type-monolingualtext": "Monolingual text",
+    "datatypes-type-multilingualtext": "Multilingual text",
     "datatypes-type-number": "Number",
     "datatypes-type-mediawiki-title": "MediaWiki title",
     "datatypes-type-unknown": "Unspecified",
diff --git a/i18n/qqq.json b/i18n/qqq.json
@@ -7,8 +7,8 @@
     "datatypes-desc": "{{desc|name=Data Types|url=http://www.mediawiki.org/wiki/Extension:DataTypes}}",
     "datatypes-type-string": "The name of a data type.\n{{Identical|String}}",
     "datatypes-type-quantity": "The name of a data type for quantities (proper name, capitalised in English; first letter capitalised anyway in this message and relatives).",
-    "datatypes-type-monolingual-text": "The name of a data type.\n{{Identical|Monolingual text}}",
-    "datatypes-type-multilingual-text": "The name of a data type.\n{{Identical|Multilingual text}}",
+    "datatypes-type-monolingualtext": "The name of a data type.\n{{Identical|Monolingual text}}",
+    "datatypes-type-multilingualtext": "The name of a data type.\n{{Identical|Multilingual text}}",
     "datatypes-type-number": "The name of a data type.\n{{Identical|Number}}",
     "datatypes-type-mediawiki-title": "The name of a data type",
     "datatypes-type-unknown": "The name of a data type",
diff --git a/tests/Phpunit/DataTypeFactoryTest.php b/tests/Phpunit/DataTypeFactoryTest.php
@@ -36,10 +36,10 @@ protected function getInstance() {
 			'quantity' => array(
 				'datavalue' => 'quantity',
 			),
-			'monolingual-text' => array(
+			'monolingualtext' => array(
 				'datavalue' => 'monolingualtext',
 			),
-			'multilingual-text' => array(
+			'multilingualtext' => array(
 				'datavalue' => 'multilingualtext',
 			),
 			'time' => array(
