Merge branch 'archwiki'

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

1 files changed, 61 insertions, 0 deletions

diff --git a/includes/logging/PageLangLogFormatter.php b/includes/logging/PageLangLogFormatter.php
new file mode 100644
index 00000000..694fa7f3
--- /dev/null
+++ b/includes/logging/PageLangLogFormatter.php
@@ -0,0 +1,61 @@
+<?php
+/**
+ * Formatter for changelang log entries.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @author Kunal Grover
+ * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
+ * @since 1.24
+ */
+
+/**
+ * This class formats language change log entries.
+ *
+ * @since 1.24
+ */
+class PageLangLogFormatter extends LogFormatter {
+	protected function getMessageParameters() {
+		// Get the user language for displaying language names
+		$userLang = $this->context->getLanguage()->getCode();
+		$params = parent::getMessageParameters();
+
+		// Get the language codes from log
+		$oldLang = $params[3];
+		$kOld = strrpos( $oldLang, '[' );
+		if ( $kOld ) {
+			$oldLang = substr( $oldLang, 0, $kOld );
+		}
+
+		$newLang = $params[4];
+		$kNew = strrpos( $newLang, '[' );
+		if ( $kNew ) {
+			$newLang = substr( $newLang, 0, $kNew );
+		}
+
+		// Convert language codes to names in user language
+		$logOld = Language::fetchLanguageName( $oldLang, $userLang )
+			. ' (' . $oldLang . ')';
+		$logNew = Language::fetchLanguageName( $newLang, $userLang )
+			. ' (' . $newLang . ')';
+
+		// Add the default message to languages if required
+		$params[3] = !$kOld ? $logOld : $logOld . ' [' . $this->msg( 'default' ) . ']';
+		$params[4] = !$kNew ? $logNew : $logNew . ' [' . $this->msg( 'default' ) . ']';
+		return $params;
+	}
+}