From 8c85bb762b470e5b5908c4a9daf28c1b4af4f929 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Fri, 22 Nov 2013 16:28:18 +0100 Subject: [PATCH] Kill 'newmessageslink' and 'newmessagesdifflink' messages Superseded ages ago by 'newmessageslinkplural' and 'newmessagesdifflinkplural'. Also updated any docs that still referred to them. Change-Id: Id4d99270acabbd7d72b877a091a6e3015d616826 --- languages/messages/MessagesEn.php | 2 -- languages/messages/MessagesQqq.php | 29 +++++++++------------------- maintenance/dictionary/mediawiki.dic | 2 -- maintenance/language/messages.inc | 2 -- 4 files changed, 9 insertions(+), 26 deletions(-) diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index d7dadc8c31..6164bfc25b 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -939,8 +939,6 @@ See [[Special:Version|version page]].', 'backlinksubtitle' => '← $1', # only translate this message to other languages if you have to change it 'retrievedfrom' => 'Retrieved from "$1"', 'youhavenewmessages' => 'You have $1 ($2).', -'newmessageslink' => 'new messages', -'newmessagesdifflink' => 'last change', 'youhavenewmessagesfromusers' => 'You have $1 from {{PLURAL:$3|another user|$3 users}} ($2).', 'youhavenewmessagesmanyusers' => 'You have $1 from many users ($2).', 'newmessageslinkplural' => '{{PLURAL:$1|a new message|999=new messages}}', diff --git a/languages/messages/MessagesQqq.php b/languages/messages/MessagesQqq.php index aa849ebd52..d229725426 100644 --- a/languages/messages/MessagesQqq.php +++ b/languages/messages/MessagesQqq.php @@ -821,24 +821,13 @@ Parameters: * $1 - a link back to the current page: {{FULLURL:{{FULLPAGENAME}}}}', 'youhavenewmessages' => 'The yellow message appearing when someone edited your user talk page. -The format is: "{{int:youhavenewmessages| [[MediaWiki:Newmessageslink/{{SUBPAGENAME}}|{{int:newmessageslink}}]] |[[MediaWiki:Newmessagesdifflink/{{SUBPAGENAME}}|{{int:newmessagesdifflink}}]]}}" +The format is: "{{int:youhavenewmessages| [[MediaWiki:Newmessageslinkplural/{{SUBPAGENAME}}|{{int:newmessageslinkplural}}]] |[[MediaWiki:Newmessagesdifflinkplural/{{SUBPAGENAME}}|{{int:newmessagesdifflinkplural}}]]}}" Parameters: -* $1 - a link points to new messages. Its text is {{msg-mw|Newmessageslink}} -* $2 - a link points to new messages diff. Its text is {{msg-mw|Newmessagesdifflink}} +* $1 - a link points to new messages. Its text is {{msg-mw|Newmessageslinkplural}} +* $2 - a link points to new messages diff. Its text is {{msg-mw|Newmessagesdifflinkplural}} See also: * {{msg-mw|Youhavenewmessagesmanyusers}}', -'newmessageslink' => 'This is the first link displayed in an orange rectangle when a user gets a message on their talk page. - -Used as $1 in message {{msg-mw|Youhavenewmessages}}. -{{Identical|New messages}}', -'newmessagesdifflink' => 'This is the second link displayed in an orange rectangle when a user gets a message on his talk page. - -Used as $2 in message {{msg-mw|Youhavenewmessages}}. - -See also: -* {{msg-mw|Newmessagesdifflinkplural}} -{{Identical|Last change}}', 'youhavenewmessagesfromusers' => 'New talk indicator message: the message appearing when someone edited your user talk page. Parameters: * $1 - defined as {{msg-mw|newmessageslinkplural}} * $2 - defined as {{msg-mw|newmessagesdifflinkplural}} @@ -852,18 +841,18 @@ Parameters: * $2 - {{msg-mw|newmessagesdifflinkplural}} See also: * {{msg-mw|Youhavenewmessages}}', -'newmessageslinkplural' => "Like {{msg-mw|Newmessageslink}} but supporting pluralization. +'newmessageslinkplural' => "This is the first link displayed in an orange rectangle when a user gets a message on their talk page. -Used as $1 in {{msg-mw|Youhavenewmessagesfromusers}}. +Used as $1 in messages {{msg-mw|youhavenewmessagesfromusers}}, {{msg-mw|youhavenewmessagesmanyusers}}, {{msg-mw|youhavenewmessages}}. Parameters: * $1 - 1 or 999: ** 1 - if there was '''one''' new edit since the last time the user has seen their talk page ** 999 - if there was '''more than one''' new edit since the last time the user has seen their talk page {{Identical|New messages}}", -'newmessagesdifflinkplural' => "Like {{msg-mw|Newmessagesdifflink}} but supporting pluralization. +'newmessagesdifflinkplural' => "This is the second link displayed in an orange rectangle when a user gets a message on his talk page. -Used as $2 in message {{msg-mw|Youhavenewmessagesfromusers}}. +Used as $2 in messages {{msg-mw|youhavenewmessagesfromusers}}, {{msg-mw|youhavenewmessagesmanyusers}}, {{msg-mw|youhavenewmessages}}. Parameters: * $1 - 1 or 999: @@ -872,10 +861,10 @@ Parameters: {{Identical|Last change}}", 'youhavenewmessagesmulti' => 'The alternative of {{msg-mw|youhavenewmessages}} as used on wikis with a special setup so they can receive the "new message" notice on other wikis as well. Used on [http://www.wikia.com/ Wikia]. -The format is: "{{int:youhavenewmessagesmulti| [[MediaWiki:Newmessageslink/{{SUBPAGENAME}}|{{int:newmessageslink}}]]}}" +The format is: "{{int:youhavenewmessagesmulti| [[MediaWiki:Newmessageslinkplural/{{SUBPAGENAME}}|{{int:newmessageslinkplural}}]]}}" Parameters: -* $1 - a link points to new messages. Its text is {{msg-mw|Newmessageslink}}', +* $1 - a link points to new messages. Its text is {{msg-mw|Newmessageslinkplural}}', 'editsection' => 'Display name of link to edit a section on a content page. Example: [{{MediaWiki:Editsection}}]. {{Identical|Edit}}', diff --git a/maintenance/dictionary/mediawiki.dic b/maintenance/dictionary/mediawiki.dic index 164b5b05ec..8a00bed58a 100644 --- a/maintenance/dictionary/mediawiki.dic +++ b/maintenance/dictionary/mediawiki.dic @@ -2530,9 +2530,7 @@ newheader newid newimages newlen -newmessagesdifflink newmessagesdifflinkplural -newmessageslink newmessageslinkplural newname newnames diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc index 09bd302577..f7319b50bd 100644 --- a/maintenance/language/messages.inc +++ b/maintenance/language/messages.inc @@ -312,8 +312,6 @@ $wgMessageStructure = array( 'backlinksubtitle', 'retrievedfrom', 'youhavenewmessages', - 'newmessageslink', - 'newmessagesdifflink', 'youhavenewmessagesfromusers', 'youhavenewmessagesmanyusers', 'newmessageslinkplural', -- 2.20.1