Merge branch 'archwiki'

# Conflicts:
#	skins/ArchLinux.php
#	skins/ArchLinux/archlogo.gif

1 files changed, 30 insertions, 0 deletions

diff --git a/extensions/LocalisationUpdate/reader/JSONReader.php b/extensions/LocalisationUpdate/reader/JSONReader.php
new file mode 100644
index 00000000..636168c8
--- /dev/null
+++ b/extensions/LocalisationUpdate/reader/JSONReader.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * @file
+ * @author Niklas Laxström
+ * @license GPL-2.0+
+ */
+
+/**
+ * Reads MediaWiki JSON i18n files.
+ */
+class LU_JSONReader implements LU_Reader {
+	/// @var string Language tag
+	protected $code;
+
+	public function __construct( $code = null ) {
+		$this->code = $code;
+	}
+
+	public function parse( $contents ) {
+		$messages = FormatJson::decode( $contents, true );
+		unset( $messages['@metadata'] );
+
+		if ( $this->code ) {
+			return array( $this->code => $messages );
+		}
+
+		// Assuming that the array is keyed by language codes
+		return $messages;
+	}
+}