From 04f93370bb22a6d5678a6146c4574fb5c6919c07 Mon Sep 17 00:00:00 2001 From: mjbmr Date: Thu, 20 Aug 2015 10:41:09 +0000 Subject: [PATCH] Replace 'emailpage' with 'emailuser' Bug: T109614 Change-Id: I345d0091b17ef61499dc7d8c170308fd8194dc00 --- languages/i18n/en.json | 3 +-- languages/i18n/qqq.json | 1 - tests/parser/preprocess/All_system_messages.expected | 6 +++--- tests/parser/preprocess/All_system_messages.txt | 6 +++--- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/languages/i18n/en.json b/languages/i18n/en.json index d50190677a..681d63e33d 100644 --- a/languages/i18n/en.json +++ b/languages/i18n/en.json @@ -1857,7 +1857,6 @@ "emailuser-title-target": "Email this {{GENDER:$1|user}}", "emailuser-title-notarget": "Email user", "emailuser-summary": "", - "emailpage": "Email user", "emailpagetext": "You can use the form below to send an email message to this {{GENDER:$1|user}}.\nThe email address you entered in [[Special:Preferences|your user preferences]] will appear as the \"From\" address of the email, so the recipient will be able to reply directly to you.", "defemailsubject": "{{SITENAME}} email from user \"$1\"", "usermaildisabled": "User email disabled", @@ -1879,7 +1878,7 @@ "emailccsubject": "Copy of your message to $1: $2", "emailsent": "Email sent", "emailsenttext": "Your email message has been sent.", - "emailuserfooter": "This email was sent by $1 to $2 by the \"{{int:emailpage}}\" function at {{SITENAME}}.", + "emailuserfooter": "This email was sent by $1 to $2 by the \"{{int:emailuser}}\" function at {{SITENAME}}.", "usermessage-summary": "Leaving system message.", "usermessage-editor": "System messenger", "usermessage-template": "MediaWiki:UserMessage", diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json index b704a2b318..e011dd7bd8 100644 --- a/languages/i18n/qqq.json +++ b/languages/i18n/qqq.json @@ -2028,7 +2028,6 @@ "emailuser-title-target": "{{doc-special|EmailUser|unlisted=1}}\nUsed when a user was given to e-mail. Parameters:\n* $1 - a plain text username, used for GENDER.", "emailuser-title-notarget": "{{doc-special|EmailUser|unlisted=1}}\nUsed when no user given to e-mail yet.", "emailuser-summary": "{{doc-specialpagesummary|emailuser}}", - "emailpage": "Title of special page [[Special:EmailUser]], when it is the destination of the sidebar link {{msg-mw|Emailuser}} on a user's page.", "emailpagetext": "This is the text that is displayed above the email form on [[Special:EmailUser]].\n\nSpecial:EmailUser appears when you click on the link \"Email this user\" in the sidebar, but only if there is an email address in the recipient's user preferences. If there isn't then the message {{msg-mw|Noemailtext}} will appear instead of Special:EmailUser.\n\nParameters:\n* $1 - username", "defemailsubject": "The default subject of EmailUser emails. Parameters:\n* $1 - the username of the user sending the email and can be used for GENDER", "usermaildisabled": "Caption for an error message ({{msg-mw|Usermaildisabledtext}}) shown when the user-to-user e-mail feature is disabled on the wiki (see [[mw:Manual:$wgEnableEmail]], [[mw:Manual:$wgEnableUserEmail]]).", diff --git a/tests/parser/preprocess/All_system_messages.expected b/tests/parser/preprocess/All_system_messages.expected index 3665e3c1e1..57223da6b0 100644 --- a/tests/parser/preprocess/All_system_messages.expected +++ b/tests/parser/preprocess/All_system_messages.expected @@ -1370,12 +1370,12 @@ Message </td><td> </td></tr><tr><td> -[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailpage&action=edit emailpage]<br> -[[MediaWiki_talk:Emailpage|Talk]] +[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailuser&action=edit emailuser]<br> +[[MediaWiki_talk:Emailuser|Talk]] </td><td> E-mail user </td><td> - + </td></tr><tr><td> [http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailpagetext&action=edit emailpagetext]<br> [[MediaWiki_talk:Emailpagetext|Talk]] diff --git a/tests/parser/preprocess/All_system_messages.txt b/tests/parser/preprocess/All_system_messages.txt index c619df7bc4..cdc223a9c7 100644 --- a/tests/parser/preprocess/All_system_messages.txt +++ b/tests/parser/preprocess/All_system_messages.txt @@ -1370,12 +1370,12 @@ Message {{int:Emailmessage}} -[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailpage&action=edit emailpage]
-[[MediaWiki_talk:Emailpage|Talk]] +[http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailuser&action=edit emailuser]
+[[MediaWiki_talk:Emailuser|Talk]] E-mail user -{{int:Emailpage}} +{{int:Emailuser}} [http://tl.wiktionary.org/w/wiki.phtml?title=MediaWiki:Emailpagetext&action=edit emailpagetext]
[[MediaWiki_talk:Emailpagetext|Talk]] -- 2.20.1