Partial revert. No need for prefixes

lokal-profil · lokal-profil · commit dfb8a8c31f12 · 2015-07-17T16:31:33.000-05:00
diff --git a/DCAT.php b/DCAT.php
@@ -71,18 +71,9 @@ function validateConfig( array $config ) {
  */
 function makeI18nBlob( array $langs, array $config ) {
 	// load i18n files into i18n array
-	$prefix = "dcatap-";
 	$i18n = array();
 	foreach ( $langs as $langCode => $filename ) {
-		$json = json_decode( file_get_contents( $filename ), true );
-		$i18n[$langCode] = array();
-		// strip prefix
-		foreach ( $json as $key => $value ) {
-			if ( is_string( $value ) ) {
-				$key = substr( $key, strlen( $prefix ) );
-				$i18n[$langCode][$key] = $value;
-			}
-		}
+		$i18n[$langCode] = json_decode( file_get_contents( $filename ), true );
 	}
 
 	// load catalog i18n info from URL and add to i18n object
diff --git a/i18n/en.json b/i18n/en.json
@@ -2,11 +2,11 @@
 	"@metadata": {
 		"authors": ["Lokal_Profil"]
 	},
-	"dcatap-dataset-live-title": "Live access",
-	"dcatap-dataset-live-description": "The live version of the data, includes entities and properties. Only non-deprecated formats are listed as distributions.",
-	"dcatap-dataset-dump-title": "Entity dump of $1",
-	"dcatap-dataset-dump-description": "A static dump of all entites for the given date.",
-	"dcatap-distribution-ld-description": "The Linked Data endpoint. Format is resolved through content negotiation.",
-	"dcatap-distribution-api-description": "The MediaWiki API endpoint. Format is given through the \"format\" parameter.",
-	"dcatap-distribution-dump-description": "A gziped $1 file."
+	"dataset-live-title": "Live access",
+	"dataset-live-description": "The live version of the data, includes entities and properties. Only non-deprecated formats are listed as distributions.",
+	"dataset-dump-title": "Entity dump of $1",
+	"dataset-dump-description": "A static dump of all entites for the given date.",
+	"distribution-ld-description": "The Linked Data endpoint. Format is resolved through content negotiation.",
+	"distribution-api-description": "The MediaWiki API endpoint. Format is given through the \"format\" parameter.",
+	"distribution-dump-description": "A gziped $1 file."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
@@ -2,11 +2,11 @@
 	"@metadata": {
 		"authors": ["Lokal_Profil"]
 	},
-	"dcatap-dataset-live-title": "The title for the live access dataset",
-	"dcatap-dataset-live-description": "The description of the live access dataset. For terminology see https://www.wikidata.org/wiki/Wikidata:Glossary. For deprecation see https://en.wikipedia.org/wiki/Deprecation.",
-	"dcatap-dataset-dump-title": "The title for the entity dump where $1 is the date of the dump in the format YYYYMMDD",
-	"dcatap-dataset-dump-description": "The description of the entity dump for the given date.",
-	"dcatap-distribution-ld-description": "The description of the Linked Data endpoint. For content negotiation see https://en.wikipedia.org/wiki/Content_negotiation",
-	"dcatap-distribution-api-description": "The description of the MediaWiki API endpoint. Leave \"format\" untranslated.",
-	"dcatap-distribution-dump-description": "The description of a dump file where $1 is the file format."
+	"dataset-live-title": "The title for the live access dataset",
+	"dataset-live-description": "The description of the live access dataset. For terminology see https://www.wikidata.org/wiki/Wikidata:Glossary. For deprecation see https://en.wikipedia.org/wiki/Deprecation.",
+	"dataset-dump-title": "The title for the entity dump where $1 is the date of the dump in the format YYYYMMDD",
+	"dataset-dump-description": "The description of the entity dump for the given date.",
+	"distribution-ld-description": "The description of the Linked Data endpoint. For content negotiation see https://en.wikipedia.org/wiki/Content_negotiation",
+	"distribution-api-description": "The description of the MediaWiki API endpoint. Leave \"format\" untranslated.",
+	"distribution-dump-description": "The description of a dump file where $1 is the file format."
 }
