Merge branch 'mw-1.26'

14 files changed, 84 insertions, 18 deletions

diff --git a/skins/CologneBlue/Gruntfile.js b/skins/CologneBlue/Gruntfile.js
new file mode 100644
index 00000000..9c56558a
--- /dev/null
+++ b/skins/CologneBlue/Gruntfile.js
@@ -0,0 +1,20 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+	grunt.loadNpmTasks( 'grunt-banana-checker' );
+	grunt.loadNpmTasks( 'grunt-jsonlint' );
+
+	grunt.initConfig( {
+		banana: {
+			all: 'i18n/'
+		},
+		jsonlint: {
+			all: [
+				'**/*.json',
+				'!node_modules/**'
+			]
+		}
+	} );
+
+	grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+	grunt.registerTask( 'default', 'test' );
+};
diff --git a/skins/CologneBlue/SkinCologneBlue.php b/skins/CologneBlue/SkinCologneBlue.php
index 7b7aabd5..7a07c21f 100644
--- a/skins/CologneBlue/SkinCologneBlue.php
+++ b/skins/CologneBlue/SkinCologneBlue.php
@@ -116,7 +116,7 @@ class CologneBlueTemplate extends BaseTemplate {
 	 */
 	protected function renderAfterPortlet( $name ) {
 		$content = '';
-		wfRunHooks( 'BaseTemplateAfterPortlet', array( $this, $name, &$content ) );
+		Hooks::run( 'BaseTemplateAfterPortlet', array( $this, $name, &$content ) );
 
 		$html = $content !== '' ? "<div class='after-portlet after-portlet-$name'>$content</div>" : '';
 
diff --git a/skins/CologneBlue/composer.json b/skins/CologneBlue/composer.json
new file mode 100644
index 00000000..fd380fb7
--- /dev/null
+++ b/skins/CologneBlue/composer.json
@@ -0,0 +1,10 @@
+{
+    "require-dev": {
+        "jakub-onderka/php-parallel-lint": "0.9"
+    },
+    "scripts": {
+        "test": [
+            "parallel-lint . --exclude node_modules --exclude vendor"
+        ]
+    }
+}
diff --git a/skins/CologneBlue/i18n/arq.json b/skins/CologneBlue/i18n/arq.json
new file mode 100644
index 00000000..65d2cde0
--- /dev/null
+++ b/skins/CologneBlue/i18n/arq.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Bachounda"
+		]
+	},
+	"cologneblue-desc": "A lightweight skin with minimal formatting"
+}
diff --git a/skins/CologneBlue/i18n/en.json b/skins/CologneBlue/i18n/en.json
index 2f19694a..cb55ee94 100644
--- a/skins/CologneBlue/i18n/en.json
+++ b/skins/CologneBlue/i18n/en.json
@@ -1,4 +1,7 @@
 {
+	"@metadata": {
+		"authors": []
+	},
 	"cologneblue.css": "/* CSS placed here will affect users of the Cologne Blue skin */",
 	"cologneblue.js": "/* Any JavaScript here will be loaded for users using the Cologne Blue skin */",
 	"skinname-cologneblue": "Cologne Blue",
diff --git a/skins/CologneBlue/i18n/es.json b/skins/CologneBlue/i18n/es.json
index 5cbe6f1b..2c45cba1 100644
--- a/skins/CologneBlue/i18n/es.json
+++ b/skins/CologneBlue/i18n/es.json
@@ -4,11 +4,12 @@
 			"Fitoschido",
 			"Locos epraix",
 			"Sanbec",
-			"Vivaelcelta"
+			"Vivaelcelta",
+			"Macofe"
 		]
 	},
 	"cologneblue.css": "/* El CSS colocado en esta página afectará a los usuarios que usen la apariencia Cologne Blue */",
-	"cologneblue.js": "/* Cualquier código JavaScript escrito aquí se cargará para todos los usuarios que usen la piel Colonia azul */",
+	"cologneblue.js": "/* Cualquier código JavaScript escrito aquí se cargará para todos los usuarios que usen la apariencia Cologne Blue */",
 	"skinname-cologneblue": "Colonia azul",
-	"cologneblue-desc": "Un tema ligero con formato minimalista"
+	"cologneblue-desc": "Una apariencia ligera con formato minimalista"
 }
diff --git a/skins/CologneBlue/i18n/fo.json b/skins/CologneBlue/i18n/fo.json
index e927df18..32b358c7 100644
--- a/skins/CologneBlue/i18n/fo.json
+++ b/skins/CologneBlue/i18n/fo.json
@@ -1,4 +1,9 @@
 {
-	"@metadata": [],
-	"skinname-cologneblue": "Cologne-bláur"
+	"@metadata": {
+		"authors": [
+			"EileenSanda"
+		]
+	},
+	"skinname-cologneblue": "Cologne-bláur",
+	"cologneblue-desc": "Ein lættvekts útsjónd við minimalari formatering"
 }
diff --git a/skins/CologneBlue/i18n/hu.json b/skins/CologneBlue/i18n/hu.json
index 91e33f20..14a6e53b 100644
--- a/skins/CologneBlue/i18n/hu.json
+++ b/skins/CologneBlue/i18n/hu.json
@@ -1,10 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Dj"
+			"Dj",
+			"ViDam"
 		]
 	},
 	"cologneblue.css": "/* Az ide elhelyezett CSS hatással lesz a Kölni kék felület használóira */",
 	"cologneblue.js": "/* A Kölni kék felületet használó szerkesztők számára betöltendő JavaScriptek */",
-	"skinname-cologneblue": "Kölni kék"
+	"skinname-cologneblue": "Kölni kék",
+	"cologneblue-desc": "Egy pehelykönnyű felület minimális formázással"
 }
diff --git a/skins/CologneBlue/i18n/ilo.json b/skins/CologneBlue/i18n/ilo.json
new file mode 100644
index 00000000..61c5ace4
--- /dev/null
+++ b/skins/CologneBlue/i18n/ilo.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Lam-ang"
+		]
+	},
+	"cologneblue-desc": "Ti nalag-an a kudil nga addaan iti bassit a pannakapormat"
+}
diff --git a/skins/CologneBlue/i18n/ne.json b/skins/CologneBlue/i18n/ne.json
index 5201e772..75a52f16 100644
--- a/skins/CologneBlue/i18n/ne.json
+++ b/skins/CologneBlue/i18n/ne.json
@@ -1,9 +1,10 @@
 {
 	"@metadata": {
 		"authors": [
-			"सरोज कुमार ढकाल"
+			"सरोज कुमार ढकाल",
+			"राम प्रसाद जोशी"
 		]
 	},
-	"cologneblue.css": "/* यहाँ राखिएको CSS ले कोलोग्ने ब्लु स्किनको प्रयोगकर्ताहरुलाई प्रभावित गर्ने छ  */",
+	"cologneblue.css": "/* यहाँ राखिएको CSS ले कोलोग्ने ब्लु स्किनको प्रयोगकर्ताहरूलाई प्रभावित गर्ने छ  */",
 	"skinname-cologneblue": "कोलोग्ने निलो"
 }
diff --git a/skins/CologneBlue/i18n/nl.json b/skins/CologneBlue/i18n/nl.json
index 26d7a693..ec81b6af 100644
--- a/skins/CologneBlue/i18n/nl.json
+++ b/skins/CologneBlue/i18n/nl.json
@@ -4,8 +4,8 @@
 			"Siebrand"
 		]
 	},
-	"cologneblue.css": "/* CSS die hier wordt geplaatst heeft alleen invloed op de skin Keuls blauw */",
-	"cologneblue.js": "/* JavaScript die hier wordt geplaatst heeft alleen invloed op gebruikers die de skin Keuls blauw gebruiken */",
+	"cologneblue.css": "/* CSS die hier wordt geplaatst heeft alleen invloed op het uiterlijk Keuls blauw */",
+	"cologneblue.js": "/* JavaScript die hier wordt geplaatst heeft alleen invloed op gebruikers die het uiterlijk Keuls blauw gebruiken */",
 	"skinname-cologneblue": "Keuls blauw",
 	"cologneblue-desc": "Een lichtgewicht uiterlijk met minimale opmaak"
 }
diff --git a/skins/CologneBlue/i18n/pt-br.json b/skins/CologneBlue/i18n/pt-br.json
index b970763b..72ddd5b1 100644
--- a/skins/CologneBlue/i18n/pt-br.json
+++ b/skins/CologneBlue/i18n/pt-br.json
@@ -1,9 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
-			"Diego Queiroz"
+			"Diego Queiroz",
+			"Cainamarques"
 		]
 	},
-	"cologneblue.js": "/* Qualquer JavaScript aqui colocado afetará os usuários do skin Azul colonial */",
-	"skinname-cologneblue": "Azul colonial"
+	"cologneblue.css": "/* o código CSS colocado aqui terá efeito nos usuários do tema Cologne Blue */",
+	"cologneblue.js": "/* Qualquer JavaScript aqui colocado afetará os usuários do tema Cologne Blue */",
+	"skinname-cologneblue": "Azul Colonial",
+	"cologneblue-desc": "Um tema leve com formatação mínima"
 }
diff --git a/skins/CologneBlue/i18n/scn.json b/skins/CologneBlue/i18n/scn.json
index 093f1d55..8d0ea11e 100644
--- a/skins/CologneBlue/i18n/scn.json
+++ b/skins/CologneBlue/i18n/scn.json
@@ -1,8 +1,11 @@
 {
 	"@metadata": {
 		"authors": [
-			"Santu"
+			"Santu",
+			"Pippinu",
+			"Sarvaturi"
 		]
 	},
-	"skinname-cologneblue": "Cologne Blu"
+	"skinname-cologneblue": "Cologne Blu",
+	"cologneblue-desc": "Na peddi leggia cu picca furmattazzioni"
 }
diff --git a/skins/CologneBlue/skin.json b/skins/CologneBlue/skin.json
index 1aa03902..806de595 100644
--- a/skins/CologneBlue/skin.json
+++ b/skins/CologneBlue/skin.json
@@ -19,6 +19,7 @@
 	},
 	"ResourceModules": {
 		"skins.cologneblue": {
+			"position": "top",
 			"styles": {
 				"resources/screen.css": {
 					"media": "screen"
@@ -41,5 +42,6 @@
 	"AutoloadClasses": {
 		"SkinCologneBlue": "SkinCologneBlue.php",
 		"CologneBlueTemplate": "SkinCologneBlue.php"
-	}
+	},
+	"manifest_version": 1
 }