From 4ac9fa081a7c045f6a9f1cfc529d82423f485b2e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Dec 2013 09:55:49 +0100
Subject: Update to MediaWiki 1.22.0

---
 .../LocalisationUpdate/LocalisationUpdate.class.php      | 16 ++++++++++++----
 .../LocalisationUpdate/LocalisationUpdate.i18n.php       | 13 ++++++++-----
 extensions/LocalisationUpdate/LocalisationUpdate.php     |  6 ++++--
 3 files changed, 24 insertions(+), 11 deletions(-)

(limited to 'extensions/LocalisationUpdate')

diff --git a/extensions/LocalisationUpdate/LocalisationUpdate.class.php b/extensions/LocalisationUpdate/LocalisationUpdate.class.php
index 39368b7c..66b63232 100644
--- a/extensions/LocalisationUpdate/LocalisationUpdate.class.php
+++ b/extensions/LocalisationUpdate/LocalisationUpdate.class.php
@@ -144,8 +144,8 @@ class LocalisationUpdate {
 
 		// Create a full path.
 		$svnfile = str_replace(
-			array( '$1', '$2' ),
-			array( $ext, $extFile ),
+			array( '$1', '$2', '$3', '$4' ),
+			array( $ext, $extFile, urlencode( $ext ), urlencode( $extFile ) ),
 			$extUrl
 		);
 
@@ -165,7 +165,11 @@ class LocalisationUpdate {
 	public static function updateMediawikiMessages( $verbose, $coreUrl ) {
 		// Find the changed English strings (as these messages won't be updated in ANY language).
 		$localUrl = Language::getMessagesFileName( 'en' );
-		$repoUrl = str_replace( '$2', 'languages/messages/MessagesEn.php', $coreUrl );
+		$repoUrl = str_replace(
+			array( '$2', '$4' ),
+			array( 'languages/messages/MessagesEn.php', 'languages%2Fmessages%2FMessagesEn.php' ),
+			$coreUrl
+		);
 		$changedEnglishStrings = self::compareFiles( $repoUrl, $localUrl, $verbose );
 
 		// Count the changes.
@@ -176,7 +180,11 @@ class LocalisationUpdate {
 			$localUrl = Language::getMessagesFileName( $code );
 			// Not prefixed with $IP
 			$filename = Language::getFilename( 'languages/messages/Messages', $code );
-			$repoUrl = str_replace( '$2', $filename, $coreUrl );
+			$repoUrl = str_replace(
+				array( '$2', '$4' ),
+				array( $filename, urlencode( $filename ) ),
+				$coreUrl
+			);
 
 			// Compare the files.
 			$changedCount += self::compareFiles( $repoUrl, $localUrl, $verbose, $changedEnglishStrings, false, true );
diff --git a/extensions/LocalisationUpdate/LocalisationUpdate.i18n.php b/extensions/LocalisationUpdate/LocalisationUpdate.i18n.php
index 5d52609f..194bb1e3 100644
--- a/extensions/LocalisationUpdate/LocalisationUpdate.i18n.php
+++ b/extensions/LocalisationUpdate/LocalisationUpdate.i18n.php
@@ -289,9 +289,10 @@ $messages['km'] = array(
 
 /** Korean (한국어)
  * @author Kwj2772
+ * @author 아라
  */
 $messages['ko'] = array(
-	'localisationupdate-desc' => '번역된 시스템 메시지를 가능한 한 최신으로 유지',
+	'localisationupdate-desc' => '번역된 메시지를 가능한 한 최신으로 유지합니다',
 );
 
 /** Colognian (Ripoarisch)
@@ -303,9 +304,10 @@ $messages['ksh'] = array(
 
 /** Luxembourgish (Lëtzebuergesch)
  * @author Robby
+ * @author Soued031
  */
 $messages['lb'] = array(
-	'localisationupdate-desc' => 'hält déi lokaliséiert Messagen esou aktuell wéi méiglech.',
+	'localisationupdate-desc' => 'hält déi lokaliséiert Messagen sou aktuell wéi méiglech.',
 );
 
 /** Macedonian (македонски)
@@ -329,7 +331,7 @@ $messages['ms'] = array(
 	'localisationupdate-desc' => 'Memastikan kekemaskinian mesej-mesej yang disetempatkan',
 );
 
-/** Norwegian Bokmål (norsk (bokmål)‎)
+/** Norwegian Bokmål (norsk bokmål)
  * @author Nghtwlkr
  */
 $messages['nb'] = array(
@@ -343,7 +345,7 @@ $messages['nl'] = array(
 	'localisationupdate-desc' => 'Houdt de gelokaliseerde berichten zo actueel mogelijk',
 );
 
-/** Norwegian Nynorsk (norsk (nynorsk)‎)
+/** Norwegian Nynorsk (norsk nynorsk)
  * @author Gunnernett
  */
 $messages['nn'] = array(
@@ -373,10 +375,11 @@ $messages['pms'] = array(
 
 /** Portuguese (português)
  * @author Hamilton Abreu
+ * @author Luckas
  * @author Malafaya
  */
 $messages['pt'] = array(
-	'localisationupdate-desc' => 'Mantém as mensagens localizadas tão actualizadas quanto possível',
+	'localisationupdate-desc' => 'Mantém as mensagens localizadas tão atualizadas quanto possível',
 );
 
 /** Brazilian Portuguese (português do Brasil)
diff --git a/extensions/LocalisationUpdate/LocalisationUpdate.php b/extensions/LocalisationUpdate/LocalisationUpdate.php
index 89f0659d..abec5406 100644
--- a/extensions/LocalisationUpdate/LocalisationUpdate.php
+++ b/extensions/LocalisationUpdate/LocalisationUpdate.php
@@ -15,9 +15,11 @@ $wgLocalisationUpdateDirectory = false;
 /**
  * These should point to either an HTTP-accessible file or local file system.
  * $1 is the name of the repo (for extensions) and $2 is the name of file in the repo.
+ * $3 and $4 are the same, respectively, but urlencoded for e.g. gitblit.
  */
-$wgLocalisationUpdateCoreURL = "https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/core.git;a=blob_plain;f=$2;hb=HEAD";
-$wgLocalisationUpdateExtensionURL = "https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/extensions/$1.git;a=blob_plain;f=$2;hb=HEAD";
+
+$wgLocalisationUpdateCoreURL = "https://git.wikimedia.org/raw/mediawiki%2Fcore.git/HEAD/$4";
+$wgLocalisationUpdateExtensionURL = "https://git.wikimedia.org/raw/mediawiki%2Fextensions%2F$3.git/HEAD/$4";
 
 /// Deprecated
 $wgLocalisationUpdateSVNURL = false;
-- 
cgit v1.2.3-54-g00ecf