From 88ce2bf36c083dbcf2984b5b565d4d9ef9360cc7 Mon Sep 17 00:00:00 2001
From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 4 Nov 2008 00:33:09 +0000
Subject: [PATCH] Fixes for r42642: * Fix excessively abbreviated variable
 names $y and $m * Don't use empty() unless you want to suppress warnings *
 More documentation for $wgFilterLogTypes * hide_patrol_log instead of
 hidepatrollog, camelCase for variable and function names, hyphens for message
 names * More spaces, break long lines

---
 includes/DefaultSettings.php             | 21 +++++++-
 includes/LogEventsList.php               | 66 +++++++++++++-----------
 languages/messages/MessagesAr.php        |  2 +-
 languages/messages/MessagesArz.php       |  2 +-
 languages/messages/MessagesAst.php       |  2 +-
 languages/messages/MessagesBcc.php       |  2 +-
 languages/messages/MessagesBe_tarask.php |  2 +-
 languages/messages/MessagesCs.php        |  2 +-
 languages/messages/MessagesDe.php        |  2 +-
 languages/messages/MessagesDsb.php       |  2 +-
 languages/messages/MessagesEn.php        |  2 +-
 languages/messages/MessagesEo.php        |  2 +-
 languages/messages/MessagesEs.php        |  2 +-
 languages/messages/MessagesFa.php        |  2 +-
 languages/messages/MessagesFi.php        |  2 +-
 languages/messages/MessagesFr.php        |  2 +-
 languages/messages/MessagesGl.php        |  2 +-
 languages/messages/MessagesHe.php        |  2 +-
 languages/messages/MessagesHr.php        |  2 +-
 languages/messages/MessagesHsb.php       |  2 +-
 languages/messages/MessagesHu.php        |  2 +-
 languages/messages/MessagesIa.php        |  2 +-
 languages/messages/MessagesId.php        |  2 +-
 languages/messages/MessagesIt.php        |  2 +-
 languages/messages/MessagesJa.php        |  2 +-
 languages/messages/MessagesKsh.php       |  2 +-
 languages/messages/MessagesMs.php        |  2 +-
 languages/messages/MessagesNl.php        |  2 +-
 languages/messages/MessagesNo.php        |  2 +-
 languages/messages/MessagesOc.php        |  2 +-
 languages/messages/MessagesPl.php        |  2 +-
 languages/messages/MessagesPt.php        |  2 +-
 languages/messages/MessagesQqq.php       |  2 +-
 languages/messages/MessagesQu.php        |  2 +-
 languages/messages/MessagesRu.php        |  2 +-
 languages/messages/MessagesSi.php        |  2 +-
 languages/messages/MessagesSk.php        |  2 +-
 languages/messages/MessagesSv.php        |  2 +-
 languages/messages/MessagesUk.php        |  2 +-
 languages/messages/MessagesVec.php       |  2 +-
 languages/messages/MessagesVi.php        |  2 +-
 41 files changed, 93 insertions(+), 72 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index e7263265cc..a86c40c680 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2755,8 +2755,25 @@ $wgLogRestrictions = array(
 );
 
 /**
- * Show/hide links on Special:Log will be shown for these log types
- * This is associative array of log => (hidden by default)
+ * Show/hide links on Special:Log will be shown for these log types. Intended 
+ * for extensions only.
+ *
+ * This is associative array of log type => boolean "hide by default"
+ *
+ * See $wgLogTypes for a list of available log types. 
+ *
+ * For example:
+ *   $wgFilterLogTypes => array(
+ *      'move' => true,
+ *      'import' => false,
+ *   );
+ *
+ * Will display show/hide links for the move and import logs. Move logs will be
+ * hidden by default unless the link is clicked. Import logs will be shown by 
+ * default, and hidden when the link is clicked.
+ *
+ * A message of the form log-show-hide-<type> should be added, and will be used
+ * for the link text.
  */
 $wgFilterLogTypes = array(
 	'patrol' => true
diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 13f80df0f7..0de92b6b98 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -39,7 +39,7 @@ class LogEventsList {
 		// Precache various messages
 		if( !isset( $this->message ) ) {
 			$messages = 'revertmerge protect_change unblocklink revertmove undeletelink revdel-restore rev-delundel hist';
-			foreach( explode(' ', $messages ) as $msg ) {
+			foreach( explode( ' ', $messages ) as $msg ) {
 				$this->message[$msg] = wfMsgExt( $msg, array( 'escape') );
 			}
 		}
@@ -62,11 +62,13 @@ class LogEventsList {
 	 * @param string $user,
 	 * @param string $page,
 	 * @param string $pattern
-	 * @param int $y year
-	 * @param int $y month
+	 * @param int $year year
+	 * @param int $month month
 	 * @param bool $filter
 	 */
-	public function showOptions( $type='', $user='', $page='', $pattern='', $y='', $m='', $filter=null ) {
+	public function showOptions( $type = '', $user = '', $page = '', $pattern = '', $year = '', 
+			$month = '', $filter = null ) 
+	{
 		global $wgScript, $wgMiserMode;
 		$action = htmlspecialchars( $wgScript );
 		$title = SpecialPage::getTitleFor( 'Log' );
@@ -79,25 +81,25 @@ class LogEventsList {
 			$this->getUserInput( $user ) . "\n" .
 			$this->getTitleInput( $page ) . "\n" .
 			( !$wgMiserMode ? ($this->getTitlePattern( $pattern )."\n") : "" ) .
-			"<p>" . $this->getDateMenu( $y, $m ) . "\n" .
-			( !empty($filter) ? "</p><p>".$this->getFilterLinks( $type, $filter )."\n" : "" ) .
+			"<p>" . $this->getDateMenu( $year, $month ) . "\n" .
+			( $filter ? "</p><p>".$this->getFilterLinks( $type, $filter )."\n" : "" ) .
 			Xml::submitButton( wfMsg( 'allpagessubmit' ) ) . "</p>\n" .
 			"</fieldset></form>"
 		);
 	}
 	
-	private function getFilterLinks( $logtype, $filter ) {
+	private function getFilterLinks( $logType, $filter ) {
 		global $wgTitle;
 		// show/hide links
-		$showhide = array( wfMsgHtml( 'show' ), wfMsgHtml( 'hide' ) );
+		$messages = array( wfMsgHtml( 'show' ), wfMsgHtml( 'hide' ) );
 		// Option value -> message mapping
 		$links = array();
 		foreach( $filter as $type => $val ) {
-			$onoff = 1 - intval($val);
-			$link = $this->skin->makeKnownLinkObj( $wgTitle, $showhide[$onoff],
-				wfArrayToCGI( array( "hide{$type}log" => $onoff ), $this->getDefaultQuery() )
+			$hideVal = 1 - intval($val);
+			$link = $this->skin->makeKnownLinkObj( $wgTitle, $messages[$hideVal],
+				wfArrayToCGI( array( "hide_{$type}_log" => $hideVal ), $this->getDefaultQuery() )
 			);
-			$links[$type] = wfMsgHtml( "logshowhide-{$type}", $link );
+			$links[$type] = wfMsgHtml( "log-show-hide-{$type}", $link );
 		}
 		// Build links
 		return implode( ' | ', $links );
@@ -127,19 +129,19 @@ class LogEventsList {
 		$html = "<select name='type'>\n";
 
 		$validTypes = LogPage::validTypes();
-		$m = array(); // Temporary array
+		$typesByName = array(); // Temporary array
 
 		// First pass to load the log names
 		foreach( $validTypes as $type ) {
 			$text = LogPage::logName( $type );
-			$m[$text] = $type;
+			$typesByName[$text] = $type;
 		}
 
 		// Second pass to sort by name
-		ksort($m);
+		ksort($typesByName);
 
 		// Third pass generates sorted XHTML content
-		foreach( $m as $text => $type ) {
+		foreach( $typesByName as $text => $type ) {
 			$selected = ($type == $queryType);
 			// Restricted types
 			if ( isset($wgLogRestrictions[$type]) ) {
@@ -247,7 +249,7 @@ class LogEventsList {
 		$revert = $del = '';
 		// Some user can hide log items and have review links
 		if( $wgUser->isAllowed( 'deleterevision' ) ) {
-			$del = $this->showhideLinks( $row ) . ' ';
+			$del = $this->getShowHideLinks( $row ) . ' ';
 		}
 		// Add review links and such...
 		if( ($this->flags & self::NO_ACTION_LINK) || ($row->log_deleted & LogPage::DELETED_ACTION) ) {
@@ -344,7 +346,7 @@ class LogEventsList {
 	 * @param Row $row
 	 * @return string
 	 */
-	private function showhideLinks( $row ) {
+	private function getShowHideLinks( $row ) {
 		$revdel = SpecialPage::getTitleFor( 'Revisiondelete' );
 		// If event was hidden from sysops
 		if( !self::userCan( $row, LogPage::DELETED_RESTRICTED ) ) {
@@ -444,15 +446,15 @@ class LogEventsList {
 		// Reset the array, clears extra "where" clauses when $par is used
 		$hiddenLogs = array();
 		// Don't show private logs to unprivileged users
-		foreach( $wgLogRestrictions as $logtype => $right ) {
+		foreach( $wgLogRestrictions as $logType => $right ) {
 			if( !$wgUser->isAllowed($right) ) {
-				$safetype = $db->strencode( $logtype );
-				$hiddenLogs[] = $safetype;
+				$safeType = $db->strencode( $logType );
+				$hiddenLogs[] = $safeType;
 			}
 		}
 		if( count($hiddenLogs) == 1 ) {
 			return 'log_type != ' . $db->addQuotes( $hiddenLogs[0] );
-		} elseif( !empty( $hiddenLogs ) ) {
+		} elseif( $hiddenLogs ) {
 			return 'log_type NOT IN (' . $db->makeList($hiddenLogs) . ')';
 		}
 		return false;
@@ -474,7 +476,9 @@ class LogPager extends ReverseChronologicalPager {
 	* @param string $pattern
 	* @param array $conds
 	*/
-	function __construct( $list, $type='', $user='', $title='', $pattern='', $conds=array(), $y=false, $m=false ) {
+	function __construct( $list, $type = '', $user = '', $title = '', $pattern = '', 
+			$conds = array(), $year = false, $month = false ) 
+	{
 		parent::__construct();
 		$this->mConds = $conds;
 
@@ -483,7 +487,7 @@ class LogPager extends ReverseChronologicalPager {
 		$this->limitType( $type );
 		$this->limitUser( $user );
 		$this->limitTitle( $title, $pattern );
-		$this->getDateCond( $y, $m );
+		$this->getDateCond( $year, $month );
 	}
 
 	public function getDefaultQuery() {
@@ -503,7 +507,7 @@ class LogPager extends ReverseChronologicalPager {
 		foreach( $wgFilterLogTypes as $type => $default ) {
 			// Avoid silly filtering
 			if( $type !== 'patrol' || $wgUser->useNPPatrol() ) {
-				$hide = $wgRequest->getInt( "hide{$type}log", $default );
+				$hide = $wgRequest->getInt( "hide_{$type}_log", $default );
 				$filters[$type] = $hide;
 				if( $hide )
 					$this->mConds[] = 'log_type != '.$this->mDb->addQuotes( $this->mDb->strencode($type) );
@@ -529,7 +533,7 @@ class LogPager extends ReverseChronologicalPager {
 		if( $hideLogs !== false ) {
 			$this->mConds[] = $hideLogs;
 		}
-		if( empty($type) ) {
+		if( !$type ) {
 			return false;
 		}
 		$this->type = $type;
@@ -684,17 +688,17 @@ class LogReader {
 		$user = $request->getText( 'user' );
 		$title = $request->getText( 'page' );
 		$pattern = $request->getBool( 'pattern' );
-		$y = $request->getIntOrNull( 'year' );
-		$m = $request->getIntOrNull( 'month' );
+		$year = $request->getIntOrNull( 'year' );
+		$month = $request->getIntOrNull( 'month' );
 		# Don't let the user get stuck with a certain date
 		$skip = $request->getText( 'offset' ) || $request->getText( 'dir' ) == 'prev';
 		if( $skip ) {
-			$y = '';
-			$m = '';
+			$year = '';
+			$month = '';
 		}
 		# Use new list class to output results
 		$loglist = new LogEventsList( $wgUser->getSkin(), $wgOut, 0 );
-		$this->pager = new LogPager( $loglist, $type, $user, $title, $pattern, $y, $m );
+		$this->pager = new LogPager( $loglist, $type, $user, $title, $pattern, $year, $month );
 	}
 
 	/**
diff --git a/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php
index 7d6bf8ddaf..4ff37b56df 100644
--- a/languages/messages/MessagesAr.php
+++ b/languages/messages/MessagesAr.php
@@ -2689,7 +2689,7 @@ $1 ممنوع بالفعل. هل تريد تغيير الإعدادات؟',
 'patrol-log-line'    => 'علم على $1 من $2 كمراجعة $3',
 'patrol-log-auto'    => '(تلقائيا)',
 'patrol-log-diff'    => 'ن$1',
-'logshowhide-patrol' => '$1 سجل المراجعة',
+'log-show-hide-patrol' => '$1 سجل المراجعة',
 
 # Image deletion
 'deletedrevision'                 => 'حذف المراجعة القديمة $1',
diff --git a/languages/messages/MessagesArz.php b/languages/messages/MessagesArz.php
index 2d172085dd..980583e48f 100644
--- a/languages/messages/MessagesArz.php
+++ b/languages/messages/MessagesArz.php
@@ -2554,7 +2554,7 @@ $1 ممنوع بالفعل. هل تريد تغيير الإعدادات؟',
 'patrol-log-line'    => 'علم على $1 من $2 كأنها متراجعة $3',
 'patrol-log-auto'    => '(اوتوماتيكي)',
 'patrol-log-diff'    => 'ن$1',
-'logshowhide-patrol' => '$1 سجل المراجعة',
+'log-show-hide-patrol' => '$1 سجل المراجعة',
 
 # Image deletion
 'deletedrevision'                 => 'مسح النسخة القديمة $1',
diff --git a/languages/messages/MessagesAst.php b/languages/messages/MessagesAst.php
index d7d60146db..6f8dba3250 100644
--- a/languages/messages/MessagesAst.php
+++ b/languages/messages/MessagesAst.php
@@ -2240,7 +2240,7 @@ Probablemente tea causao por un enllaz a un sitiu esternu de la llista prieta.',
 'patrol-log-header'  => 'Esti ye un rexistru de les revisiones supervisaes.',
 'patrol-log-line'    => 'marcó la versión $1 de $2 como supervisada $3',
 'patrol-log-auto'    => '(automática)',
-'logshowhide-patrol' => '$1 rexistru de supervisión',
+'log-show-hide-patrol' => '$1 rexistru de supervisión',
 
 # Image deletion
 'deletedrevision'                 => 'Esborrada la reversión vieya $1',
diff --git a/languages/messages/MessagesBcc.php b/languages/messages/MessagesBcc.php
index f76eef9b79..996bd70414 100644
--- a/languages/messages/MessagesBcc.php
+++ b/languages/messages/MessagesBcc.php
@@ -2362,7 +2362,7 @@ $1',
 'patrol-log-line'    => 'نشان هلگ بیتن $1 چه $2 نظارت $3',
 'patrol-log-auto'    => '(اتوماتیک)',
 'patrol-log-diff'    => 'ر$1',
-'logshowhide-patrol' => '$1  آمار گشت',
+'log-show-hide-patrol' => '$1  آمار گشت',
 
 # Image deletion
 'deletedrevision'                 => 'قدیمی بازبینی $1 حذف بوت',
diff --git a/languages/messages/MessagesBe_tarask.php b/languages/messages/MessagesBe_tarask.php
index 7a72002674..b8e7537c37 100644
--- a/languages/messages/MessagesBe_tarask.php
+++ b/languages/messages/MessagesBe_tarask.php
@@ -2458,7 +2458,7 @@ $1 ужо заблякаваны. Вы жадаеце зьмяніць пара
 'patrol-log-header'  => 'Гэта журнал патруляваных вэрсіяў.',
 'patrol-log-line'    => 'пазначана $1 з $2 патруляваных $3',
 'patrol-log-auto'    => '(аўтаматычна)',
-'logshowhide-patrol' => '$1 журнал патруляваньняў',
+'log-show-hide-patrol' => '$1 журнал патруляваньняў',
 
 # Image deletion
 'deletedrevision'                 => 'Выдаленая старая вэрсія $1',
diff --git a/languages/messages/MessagesCs.php b/languages/messages/MessagesCs.php
index 2f94e08fcb..584e3add0d 100644
--- a/languages/messages/MessagesCs.php
+++ b/languages/messages/MessagesCs.php
@@ -2479,7 +2479,7 @@ V druhém případě můžete také používat přímý odkaz, např. pomocí [[
 'patrol-log-header'  => 'Toto je kniha prověřených verzí.',
 'patrol-log-line'    => 'označuje revizi $1 stránky $2 za prověřenou $3',
 'patrol-log-auto'    => '(automaticky)',
-'logshowhide-patrol' => '$1 knihu záznamů patroly',
+'log-show-hide-patrol' => '$1 knihu záznamů patroly',
 
 # Image deletion
 'deletedrevision'                 => 'Smazána stará revize $1',
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 0f679cd5c3..9cfccf3580 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -2416,7 +2416,7 @@ Alle Transwiki-Import-Aktionen werden im [[Special:Log/import|Import-Logbuch]] p
 'patrol-log-line'    => 'hat $1 von „$2“ als kontrolliert markiert $3',
 'patrol-log-auto'    => '(automatisch)',
 'patrol-log-diff'    => 'Version $1',
-'logshowhide-patrol' => 'Kontroll-Logbuch $1',
+'log-show-hide-patrol' => 'Kontroll-Logbuch $1',
 
 # Image deletion
 'deletedrevision'                 => 'alte Version: $1',
diff --git a/languages/messages/MessagesDsb.php b/languages/messages/MessagesDsb.php
index aaeeeb2ae5..ce00419f68 100644
--- a/languages/messages/MessagesDsb.php
+++ b/languages/messages/MessagesDsb.php
@@ -2294,7 +2294,7 @@ W zespominanju dajo se pśicyna pódaś.',
 'patrol-log-header'  => 'To jo protokol pśekontrolowanych wersijow.',
 'patrol-log-line'    => 'markěrował $1 wót $2 ako kontrolěrowane $3.',
 'patrol-log-auto'    => '(awtomatiski)',
-'logshowhide-patrol' => 'Protokol doglědowanja $1',
+'log-show-hide-patrol' => 'Protokol doglědowanja $1',
 
 # Image deletion
 'deletedrevision'                 => 'wulašowana stara wersija: $1',
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index b1c6c2f137..62a6a99f6a 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2998,7 +2998,7 @@ This is probably caused by a link to a blacklisted external site.',
 'patrol-log-line'    => 'marked $1 of $2 patrolled $3',
 'patrol-log-auto'    => '(automatic)',
 'patrol-log-diff'    => 'r$1', # only translate this message to other languages if you have to change it
-'logshowhide-patrol' => '$1 patrol log',
+'log-show-hide-patrol' => '$1 patrol log',
 
 # Image deletion
 'deletedrevision'                 => 'Deleted old revision $1',
diff --git a/languages/messages/MessagesEo.php b/languages/messages/MessagesEo.php
index 4bd1bb66d5..cbc2156cc9 100644
--- a/languages/messages/MessagesEo.php
+++ b/languages/messages/MessagesEo.php
@@ -2373,7 +2373,7 @@ Datoj de revizioj kaj nomoj de redaktantoj estos preservitaj.
 'patrol-log-header'  => 'Jen protokolo de patrolitaj revizioj.',
 'patrol-log-line'    => 'markis $1 el $2 patrolitajn $3',
 'patrol-log-auto'    => '(aÅ­tomata)',
-'logshowhide-patrol' => '$1 protokolo pri patrolado',
+'log-show-hide-patrol' => '$1 protokolo pri patrolado',
 
 # Image deletion
 'deletedrevision'                 => 'Forigita malnova versio $1',
diff --git a/languages/messages/MessagesEs.php b/languages/messages/MessagesEs.php
index 8ebe14542b..a6406a9054 100644
--- a/languages/messages/MessagesEs.php
+++ b/languages/messages/MessagesEs.php
@@ -2361,7 +2361,7 @@ Esto podría estar causado por un enlace a un sitio externo incluido en la lista
 'patrol-log-header'  => 'Este es un registro de revisiones patrulladas.',
 'patrol-log-line'    => 'revisado $1 de $2 $3',
 'patrol-log-auto'    => '(automático)',
-'logshowhide-patrol' => '$1 registro de patrullaje',
+'log-show-hide-patrol' => '$1 registro de patrullaje',
 
 # Image deletion
 'deletedrevision'                 => 'Borrada revisión antigua $1',
diff --git a/languages/messages/MessagesFa.php b/languages/messages/MessagesFa.php
index 954e50c2ba..f66adb5e95 100644
--- a/languages/messages/MessagesFa.php
+++ b/languages/messages/MessagesFa.php
@@ -2570,7 +2570,7 @@ $1',
 'patrol-log-line'    => 'به $1 از $2 برچسب گشت زد $3',
 'patrol-log-auto'    => '(خودکار)',
 'patrol-log-diff'    => 'نسخه $1',
-'logshowhide-patrol' => 'سیاههٔ گشت $1',
+'log-show-hide-patrol' => 'سیاههٔ گشت $1',
 
 # Image deletion
 'deletedrevision'                 => '$1 نسخهٔ حذف شدهٔ قدیمی',
diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index ff18bf98c0..e7faed7d1f 100644
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -2247,7 +2247,7 @@ Sivujen koko historian vienti on estetty suorituskykysyistä.',
 'patrol-log-header'  => 'Tämä on loki tarkistetuista muutoksista.',
 'patrol-log-line'    => 'merkitsi sivun $2 muutoksen $1 tarkastetuksi $3',
 'patrol-log-auto'    => '(automaattinen)',
-'logshowhide-patrol' => '$1 muutostentarkastusloki',
+'log-show-hide-patrol' => '$1 muutostentarkastusloki',
 
 # Image deletion
 'deletedrevision'                 => 'Poistettiin vanha versio $1',
diff --git a/languages/messages/MessagesFr.php b/languages/messages/MessagesFr.php
index f1d34bb15b..a14c118e3e 100644
--- a/languages/messages/MessagesFr.php
+++ b/languages/messages/MessagesFr.php
@@ -2427,7 +2427,7 @@ Ceci est probablement causé par un lien sur liste noire pointant vers un site e
 'patrol-log-line'    => 'a marqué la version $1 de $2 comme vérifiée $3',
 'patrol-log-auto'    => '(automatique)',
 'patrol-log-diff'    => 'v$1',
-'logshowhide-patrol' => "$1 l'historique des versions patrouillées",
+'log-show-hide-patrol' => "$1 l'historique des versions patrouillées",
 
 # Image deletion
 'deletedrevision'                 => 'L’ancienne version $1 a été supprimée',
diff --git a/languages/messages/MessagesGl.php b/languages/messages/MessagesGl.php
index 6285d639cb..100eb3f05e 100644
--- a/languages/messages/MessagesGl.php
+++ b/languages/messages/MessagesGl.php
@@ -2354,7 +2354,7 @@ Isto, probabelmente, se debe a unha ligazón cara a un sitio externo que está n
 'patrol-log-header'  => 'Este é un rexistro das revisións patrulladas.',
 'patrol-log-line'    => 'marcou a $1 de "$2" como revisada $3',
 'patrol-log-auto'    => '(automático)',
-'logshowhide-patrol' => '$1 o rexistro de patrullas',
+'log-show-hide-patrol' => '$1 o rexistro de patrullas',
 
 # Image deletion
 'deletedrevision'                 => 'A revisión vella $1 foi borrada.',
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index f7eca50863..0cb9606cb9 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -2545,7 +2545,7 @@ $1 כבר נחסם. האם ברצונכם לשנות את הגדרות החסי
 'patrol-log-line'    => 'סימן את  $1 בדף $2 כבדוקה $3',
 'patrol-log-auto'    => '(אוטומטית)',
 'patrol-log-diff'    => 'גרסה $1',
-'logshowhide-patrol' => '$1 יומן שינויים בדוקים',
+'log-show-hide-patrol' => '$1 יומן שינויים בדוקים',
 
 # Image deletion
 'deletedrevision'                 => 'מחק גרסה ישנה $1',
diff --git a/languages/messages/MessagesHr.php b/languages/messages/MessagesHr.php
index ba92dc9730..f5135e23f5 100644
--- a/languages/messages/MessagesHr.php
+++ b/languages/messages/MessagesHr.php
@@ -2480,7 +2480,7 @@ Razlog je vjerojatno vanjska poveznica koja se nalazi na crnom popisu.',
 'patrol-log-header'  => 'Ovo su evidencije patroliranih izmjena.',
 'patrol-log-line'    => 'promjena broj $1 stranice $2 pregledana $3',
 'patrol-log-auto'    => '(automatski pregledano)',
-'logshowhide-patrol' => '$1 evidenciju patroliranja',
+'log-show-hide-patrol' => '$1 evidenciju patroliranja',
 
 # Image deletion
 'deletedrevision'                 => 'Izbrisana stara inačica $1',
diff --git a/languages/messages/MessagesHsb.php b/languages/messages/MessagesHsb.php
index 8ded80cd79..34c9e709fc 100644
--- a/languages/messages/MessagesHsb.php
+++ b/languages/messages/MessagesHsb.php
@@ -2257,7 +2257,7 @@ W poslednim padźe móžeš tež wotkaz wužiwać, na př. „[[{{ns:special}}:E
 'patrol-log-line'    => 'je $1 strony $2 jako přepruwowanu markěrował $3.',
 'patrol-log-auto'    => '(awtomatisce)',
 'patrol-log-diff'    => 'wersiju $1',
-'logshowhide-patrol' => 'Protokol dohladowanja $1',
+'log-show-hide-patrol' => 'Protokol dohladowanja $1',
 
 # Image deletion
 'deletedrevision'                 => 'Stara wersija $1 wušmórnjena',
diff --git a/languages/messages/MessagesHu.php b/languages/messages/MessagesHu.php
index e6d8f79991..26ed556d8c 100644
--- a/languages/messages/MessagesHu.php
+++ b/languages/messages/MessagesHu.php
@@ -2501,7 +2501,7 @@ Ez valószínűleg egy olyan link miatt van, ami egy feketelistán lévő oldalr
 'patrol-log-header'  => 'Ez az ellenőrzött változatok naplója.',
 'patrol-log-line'    => 'megjelölve $1 / $2 ellenőrizve $3',
 'patrol-log-auto'    => '(automatikus)',
-'logshowhide-patrol' => 'járőrnapló $1',
+'log-show-hide-patrol' => 'járőrnapló $1',
 
 # Image deletion
 'deletedrevision'                 => 'Régebbi változat törölve: $1',
diff --git a/languages/messages/MessagesIa.php b/languages/messages/MessagesIa.php
index 946b49941d..54f2ff84e9 100644
--- a/languages/messages/MessagesIa.php
+++ b/languages/messages/MessagesIa.php
@@ -2446,7 +2446,7 @@ Le causa es probabilemente un ligamine verso un sito externe que es presente in
 'patrol-log-header'  => 'Isto es un registro de revisiones patruliate.',
 'patrol-log-line'    => 'marcava $1 de $2 como patruliate $3',
 'patrol-log-auto'    => '(automaticamente)',
-'logshowhide-patrol' => '$1 le registro de versiones patruliate',
+'log-show-hide-patrol' => '$1 le registro de versiones patruliate',
 
 # Image deletion
 'deletedrevision'                 => 'Deleva le ancian revision $1',
diff --git a/languages/messages/MessagesId.php b/languages/messages/MessagesId.php
index 681fd4cafd..be43ed485a 100644
--- a/languages/messages/MessagesId.php
+++ b/languages/messages/MessagesId.php
@@ -2425,7 +2425,7 @@ Ini mungkin disebabkan oleh pranala ke situs luar yang termasuk dalam daftar hit
 'patrol-log-header'  => 'Ini adalah log revisi terpatroli.',
 'patrol-log-line'    => 'menandai $1 dari $2 terpatroli $3',
 'patrol-log-auto'    => '(otomatis)',
-'logshowhide-patrol' => '$1 log patroli',
+'log-show-hide-patrol' => '$1 log patroli',
 
 # Image deletion
 'deletedrevision'                 => 'Revisi lama yang dihapus $1',
diff --git a/languages/messages/MessagesIt.php b/languages/messages/MessagesIt.php
index 70849b8b80..2ecfe65e58 100644
--- a/languages/messages/MessagesIt.php
+++ b/languages/messages/MessagesIt.php
@@ -2328,7 +2328,7 @@ Tutte le operazioni di importazione trans-wiki sono registrate nel [[Special:Log
 'patrol-log-line'    => 'ha segnato la $1 alla pagina $2 come verificata $3',
 'patrol-log-auto'    => '(verifica automatica)',
 'patrol-log-diff'    => 'modifica $1',
-'logshowhide-patrol' => '$1 log delle modifiche verificate',
+'log-show-hide-patrol' => '$1 log delle modifiche verificate',
 
 # Image deletion
 'deletedrevision'                 => 'Cancellata la vecchia revisione di $1.',
diff --git a/languages/messages/MessagesJa.php b/languages/messages/MessagesJa.php
index 1f6c3d007e..e8a3a74331 100644
--- a/languages/messages/MessagesJa.php
+++ b/languages/messages/MessagesJa.php
@@ -2286,7 +2286,7 @@ $1 は、すでにブロックされています。あなたは設定を変え
 'patrol-log-line'    => '$2 の $1 をパトロール済みにマーク$3',
 'patrol-log-auto'    => '（自動）',
 'patrol-log-diff'    => '第$1版',
-'logshowhide-patrol' => 'パトロール・ログを$1',
+'log-show-hide-patrol' => 'パトロール・ログを$1',
 
 # Image deletion
 'deletedrevision'                 => '古い版 $1 を削除しました',
diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php
index dac2333225..6c241f01e3 100644
--- a/languages/messages/MessagesKsh.php
+++ b/languages/messages/MessagesKsh.php
@@ -2597,7 +2597,7 @@ Esu kam_mer noch en Aanmerkung en „{{int:summary}}“ maache.',
 'patrol-log-line'    => 'hät $1 von „$2“ $3 nohjeloort.',
 'patrol-log-auto'    => '(automatisch)',
 'patrol-log-diff'    => 'de Version $1',
-'logshowhide-patrol' => '$1 et Logbuch vum Sigge nohlooere',
+'log-show-hide-patrol' => '$1 et Logbuch vum Sigge nohlooere',
 
 # Image deletion
 'deletedrevision'                 => 'De ahl Version „$1“ es fottjeschmesse',
diff --git a/languages/messages/MessagesMs.php b/languages/messages/MessagesMs.php
index 5869bc04e3..495715a10a 100644
--- a/languages/messages/MessagesMs.php
+++ b/languages/messages/MessagesMs.php
@@ -2343,7 +2343,7 @@ Semua tindakan import transwiki dicatatkan dalam [[Special:Log/import|log import
 'patrol-log-line'    => 'menandakan $1 bagi $2 sebagai telah diperiksa $3',
 'patrol-log-auto'    => '(automatik)',
 'patrol-log-diff'    => 's$1',
-'logshowhide-patrol' => '$1 log rondaan',
+'log-show-hide-patrol' => '$1 log rondaan',
 
 # Image deletion
 'deletedrevision'                 => 'Menghapuskan semakan lama $1.',
diff --git a/languages/messages/MessagesNl.php b/languages/messages/MessagesNl.php
index 3bb9856346..d053797ad2 100644
--- a/languages/messages/MessagesNl.php
+++ b/languages/messages/MessagesNl.php
@@ -2616,7 +2616,7 @@ Meestal wordt dit door een externe verwijzing op een zwarte lijst veroorzaakt.',
 'patrol-log-line'    => 'markeerde versie $1 van $2 als gecontroleerd $3',
 'patrol-log-auto'    => '(automatisch)',
 'patrol-log-diff'    => '$1',
-'logshowhide-patrol' => 'Markeerlogboek $1',
+'log-show-hide-patrol' => 'Markeerlogboek $1',
 
 # Image deletion
 'deletedrevision'                 => 'Oude versie $1 verwijderd.',
diff --git a/languages/messages/MessagesNo.php b/languages/messages/MessagesNo.php
index 973fa4df45..0e2f602d7d 100644
--- a/languages/messages/MessagesNo.php
+++ b/languages/messages/MessagesNo.php
@@ -2328,7 +2328,7 @@ Dette er sannsynligvis forårsaket av en lenke til et svartelistet eksternt nett
 'patrol-log-header'  => 'Dette er en logg over patruljerte sideversjoner.',
 'patrol-log-line'    => 'merket $1 av $2 godkjent $3',
 'patrol-log-auto'    => '(automatisk)',
-'logshowhide-patrol' => '$1 patruljeringslogg',
+'log-show-hide-patrol' => '$1 patruljeringslogg',
 
 # Image deletion
 'deletedrevision'                 => 'Slettet gammel revisjon $1.',
diff --git a/languages/messages/MessagesOc.php b/languages/messages/MessagesOc.php
index bd81afc013..26402095e9 100644
--- a/languages/messages/MessagesOc.php
+++ b/languages/messages/MessagesOc.php
@@ -2428,7 +2428,7 @@ Aquò es probablament causat per un ligam sus lista negra que punta cap a un sit
 'patrol-log-line'    => 'a marcat la version $1 de $2 coma verificada $3',
 'patrol-log-auto'    => '(automatic)',
 'patrol-log-diff'    => 'v$1',
-'logshowhide-patrol' => "$1 l'istoric de las versions patrolhadas",
+'log-show-hide-patrol' => "$1 l'istoric de las versions patrolhadas",
 
 # Image deletion
 'deletedrevision'                 => 'La version anciana $1 es estada suprimida.',
diff --git a/languages/messages/MessagesPl.php b/languages/messages/MessagesPl.php
index 7b871c5556..147dbf3d15 100644
--- a/languages/messages/MessagesPl.php
+++ b/languages/messages/MessagesPl.php
@@ -2483,7 +2483,7 @@ Najprawdopodobniej zostało to spowodowane przez link do zewnętrznej strony int
 'patrol-log-header'  => 'Poniżej znajduje się dziennik patrolowania stron.',
 'patrol-log-line'    => 'oznaczył wersję $1 hasła $2 jako sprawdzoną $3',
 'patrol-log-auto'    => '(automatycznie)',
-'logshowhide-patrol' => '$1 rejestr sprawdzania',
+'log-show-hide-patrol' => '$1 rejestr sprawdzania',
 
 # Image deletion
 'deletedrevision'                 => 'Usunięto poprzednie wersje $1',
diff --git a/languages/messages/MessagesPt.php b/languages/messages/MessagesPt.php
index fef5e800b8..95b36b59b3 100644
--- a/languages/messages/MessagesPt.php
+++ b/languages/messages/MessagesPt.php
@@ -2364,7 +2364,7 @@ Tal bloqueio foi provavelmente causado por uma ligação para um website externo
 'patrol-log-header'  => 'Este é um registo de edições patrulhadas.',
 'patrol-log-line'    => 'marcou a edição $1 de $2 como uma edição patrulhada $3',
 'patrol-log-auto'    => 'automaticamente',
-'logshowhide-patrol' => '$1 registo de edições patrulhadas',
+'log-show-hide-patrol' => '$1 registo de edições patrulhadas',
 
 # Image deletion
 'deletedrevision'                 => 'Apagada a versão antiga $1',
diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php
index b6bf5f53b1..b52279d9a7 100644
--- a/languages/messages/MessagesQqq.php
+++ b/languages/messages/MessagesQqq.php
@@ -1930,7 +1930,7 @@ See also [[MediaWiki:Lastmodifiedat/{{SUBPAGENAME}}]].', # $1 date, $2 time, $3
 'patrol-log-auto'    => 'Automated edit summary when patrolling.
 
 {{Identical|Automatic}}',
-'logshowhide-patrol' => '* $1 is one of {{msg|show}} or {{msg|hide}}',
+'log-show-hide-patrol' => '* $1 is one of {{msg|show}} or {{msg|hide}}',
 
 # Browsing diffs
 'previousdiff' => 'Used when viewing the difference between edits. See also {{msg|nextdiff}}.',
diff --git a/languages/messages/MessagesQu.php b/languages/messages/MessagesQu.php
index 4cc98bd92b..2248ea7fec 100644
--- a/languages/messages/MessagesQu.php
+++ b/languages/messages/MessagesQu.php
@@ -2227,7 +2227,7 @@ Tukuy hawa wikimanta chaskisqakunaqa [[Special:Log/import|hawamanta chaskiy hall
 'patrol-log-header'  => "Kayqa patrullasqa musuqchasqakunamanta hallch'asqam.",
 'patrol-log-line'    => '$1 sananchasqa $2-manta qhawakipasqa $3',
 'patrol-log-auto'    => '(kikinmanta)',
-'logshowhide-patrol' => "$1 patrullay hallch'a",
+'log-show-hide-patrol' => "$1 patrullay hallch'a",
 
 # Image deletion
 'deletedrevision'                 => "Qullusqam mawk'a qhawakipasqa $1",
diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php
index 0e20ecc4a9..aa7299257b 100644
--- a/languages/messages/MessagesRu.php
+++ b/languages/messages/MessagesRu.php
@@ -2460,7 +2460,7 @@ The wiki server can't provide data in a format your client can read.",
 'patrol-log-header'  => 'Это журнал патрулированных версий.',
 'patrol-log-line'    => 'проверена $1 из $2 $3',
 'patrol-log-auto'    => '(автоматически)',
-'logshowhide-patrol' => '$1 журнал патрулирования',
+'log-show-hide-patrol' => '$1 журнал патрулирования',
 
 # Image deletion
 'deletedrevision'                 => 'Удалена старая версия $1',
diff --git a/languages/messages/MessagesSi.php b/languages/messages/MessagesSi.php
index 190c8008bf..45d1d7eec7 100644
--- a/languages/messages/MessagesSi.php
+++ b/languages/messages/MessagesSi.php
@@ -2460,7 +2460,7 @@ $1 දැනටමත් වාරණය කොට ඇත. පරිස්ථි
 'patrol-log-line'    => '$2 හි $1 පරික්ෂා කර බැලූ බව $3 හි ලකුණු කෙරිණි',
 'patrol-log-auto'    => '(ස්වයංක්‍රීය)',
 'patrol-log-diff'    => 'r$1',
-'logshowhide-patrol' => 'පරික්‍ෂාකිරීම් ලඝු-සටහන් $1',
+'log-show-hide-patrol' => 'පරික්‍ෂාකිරීම් ලඝු-සටහන් $1',
 
 # Image deletion
 'deletedrevision'                 => 'පැරැණි සංශෝධනය $1 මකාදමන ලදි',
diff --git a/languages/messages/MessagesSk.php b/languages/messages/MessagesSk.php
index 9d4fa1fa80..df95e8da3c 100644
--- a/languages/messages/MessagesSk.php
+++ b/languages/messages/MessagesSk.php
@@ -2382,7 +2382,7 @@ Pravdepodobne to spôsobil odkaz na externú internetovú lokalitu, ktorá sa na
 'patrol-log-header'  => 'Toto je záznam strážených revízií.',
 'patrol-log-line'    => '$1 z $2 označených ako sledované $3',
 'patrol-log-auto'    => '(automaticky)',
-'logshowhide-patrol' => 'záznam stráženia $1',
+'log-show-hide-patrol' => 'záznam stráženia $1',
 
 # Image deletion
 'deletedrevision'                 => 'Zmazať staré verzie $1',
diff --git a/languages/messages/MessagesSv.php b/languages/messages/MessagesSv.php
index 7e11e188d4..c3ceb4edf0 100644
--- a/languages/messages/MessagesSv.php
+++ b/languages/messages/MessagesSv.php
@@ -2480,7 +2480,7 @@ Detta orsakades troligen av en länk till en svartlistad webbplats.',
 'patrol-log-line'    => 'markerade $1 av $2 som patrullerad $3',
 'patrol-log-auto'    => '(automatiskt)',
 'patrol-log-diff'    => 'version $1',
-'logshowhide-patrol' => '$1 patrulleringslogg',
+'log-show-hide-patrol' => '$1 patrulleringslogg',
 
 # Image deletion
 'deletedrevision'                 => 'Raderade gammal sidversion $1',
diff --git a/languages/messages/MessagesUk.php b/languages/messages/MessagesUk.php
index c0b00b9cb9..c55cbfc43b 100644
--- a/languages/messages/MessagesUk.php
+++ b/languages/messages/MessagesUk.php
@@ -2448,7 +2448,7 @@ The wiki server can't provide data in a format your client can read.",
 'patrol-log-header'  => 'Це журнал перевірених змін.',
 'patrol-log-line'    => 'перевірена $1 з $2 $3',
 'patrol-log-auto'    => '(автоматично)',
-'logshowhide-patrol' => '$1 журнал патрулювання',
+'log-show-hide-patrol' => '$1 журнал патрулювання',
 
 # Image deletion
 'deletedrevision'                 => 'Вилучена стара версія $1',
diff --git a/languages/messages/MessagesVec.php b/languages/messages/MessagesVec.php
index 139ed1f637..62bd195554 100644
--- a/languages/messages/MessagesVec.php
+++ b/languages/messages/MessagesVec.php
@@ -2272,7 +2272,7 @@ Questo xe probabilmente dovùo a la presenza de un colegamento a un sito foresto
 'patrol-log-header'  => 'Qua de sèvito xe elencàe le verifiche de le modifiche.',
 'patrol-log-line'    => 'gà segnà la $1 a la pagina $2 come verificà $3',
 'patrol-log-auto'    => '(verifica automatica)',
-'logshowhide-patrol' => '$1 el registro dei canbiamenti verificài',
+'log-show-hide-patrol' => '$1 el registro dei canbiamenti verificài',
 
 # Image deletion
 'deletedrevision'                 => 'Vecia version scancełà $1',
diff --git a/languages/messages/MessagesVi.php b/languages/messages/MessagesVi.php
index d0669dfb0a..dd37155abb 100644
--- a/languages/messages/MessagesVi.php
+++ b/languages/messages/MessagesVi.php
@@ -2386,7 +2386,7 @@ Lưu nó vào máy tính của bạn rồi tải nó lên đây.',
 'patrol-log-line'    => 'đánh dấu tuần tra vào phiên bản $1 của $2 $3',
 'patrol-log-auto'    => '(tự động)',
 'patrol-log-diff'    => 'bản $1',
-'logshowhide-patrol' => '$1 nhật trình tuần tra',
+'log-show-hide-patrol' => '$1 nhật trình tuần tra',
 
 # Image deletion
 'deletedrevision'                 => 'Đã xóa phiên bản cũ $1',
-- 
2.20.1