r77157 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r77156‎ | r77157 | r77158 >
Date:14:19, 23 November 2010
Author:raymond
Status:ok
Tags:
Comment:
Round 2 of i18n/i10n cleanup: Move colons from code to messages
Tweak some messages for consisteny
Add extension to Translatewiki
Modified paths:
  • /trunk/extensions/EmailPage/EmailPage.i18n.php (modified) (history)
  • /trunk/extensions/EmailPage/EmailPage_body.php (modified) (history)
  • /trunk/extensions/Translate/groups/mediawiki-defines.txt (modified) (history)

Diff [purge]

Index: trunk/extensions/EmailPage/EmailPage_body.php
@@ -66,11 +66,11 @@
6767 $from = "<option>$wgEmergencyContact</option>";
6868 $ue = $wgUser->getEmail();
6969 if( $wgUser->isValidEmailAddr( $ue ) ) $from = "<option>$ue</option>$from"; else $ue = "";
70 - $wgOut->addHTML( "<tr id=\"ea-from\"><th align=\"right\">" . wfMsg( 'ea-from' ) . ":</th>" );
 70+ $wgOut->addHTML( "<tr id=\"ea-from\"><th align=\"right\">" . wfMsg( 'ea-from' ) . "</th>" );
7171 $wgOut->addHTML( "<td><select name=\"ea-from\">$from</select></td></tr>\n" );
7272
7373 # To
74 - $wgOut->addHTML( "<tr id=\"ea-to\"><th align=\"right\" valign=\"top\">" . wfMsg( 'ea-to' ) . ":</th>" );
 74+ $wgOut->addHTML( "<tr id=\"ea-to\"><th align=\"right\" valign=\"top\">" . wfMsg( 'ea-to' ) . "</th>" );
7575 $wgOut->addHTML( "<td><textarea name=\"ea-to\" rows=\"2\" style=\"width:100%\">{$this->to}</textarea>" );
7676 $wgOut->addHTML( "<br /><small><i>(" . wfMsg( 'ea-to-info' ) . ")</i></small>" );
7777
@@ -90,7 +90,7 @@
9191 $wgOut->addHTML( "</td></tr>" );
9292
9393 # Cc
94 - $wgOut->addHTML( "<tr id=\"ea-cc\"><th align=\"right\">" . wfMsg( 'ea-cc' ) . ":</th>" );
 94+ $wgOut->addHTML( "<tr id=\"ea-cc\"><th align=\"right\">" . wfMsg( 'ea-cc' ) . "</th>" );
9595 $wgOut->addHTML( "<td>" .
9696 Xml::element( 'input', array(
9797 'type' => 'text',
@@ -101,7 +101,7 @@
102102 . "</td></tr>" );
103103
104104 # Subject
105 - $wgOut->addHTML( "<tr id=\"ea-subject\"><th align=\"right\">" . wfMsg( 'ea-subject' ) . ":</th>" );
 105+ $wgOut->addHTML( "<tr id=\"ea-subject\"><th align=\"right\">" . wfMsg( 'ea-subject' ) . "</th>" );
106106 $wgOut->addHTML( "<td>" .
107107 Xml::element( 'input', array(
108108 'type' => 'text',
@@ -112,7 +112,7 @@
113113 . "</td></tr>" );
114114
115115 # Message
116 - $wgOut->addHTML( "<tr id=\"ea-message\"><th align=\"right\" valign=\"top\">" . wfMsg( 'ea-message' ) . ":</th>" );
 116+ $wgOut->addHTML( "<tr id=\"ea-message\"><th align=\"right\" valign=\"top\">" . wfMsg( 'ea-message' ) . "</th>" );
117117 $wgOut->addHTML( "<td><textarea name=\"ea-message\" rows=\"3\" style=\"width:100%\">{$this->message}</textarea>" );
118118 $wgOut->addHTML( "<br /><i><small>(" . wfMsg( 'ea-message-info' ) . ")</small></i></td></tr>" );
119119
@@ -133,7 +133,7 @@
134134 }
135135 $db->freeResult( $res );
136136 if( $options ) {
137 - $wgOut->addHTML( "<tr id=\"ea-css\"><th align=\"right\">" . wfMsg( 'ea-style' ) . ":</th><td>" );
 137+ $wgOut->addHTML( "<tr id=\"ea-css\"><th align=\"right\">" . wfMsg( 'ea-style' ) . "</th><td>" );
138138 $wgOut->addHTML( "<select name=\"ea-css\"><option />$options</select>" );
139139 $wgOut->addHTML( " <small><i>(" . wfMsg( 'ea-selectcss' ) . ")</i></small></td></tr>" );
140140 }
@@ -150,7 +150,7 @@
151151 }
152152 $db->freeResult( $res );
153153 if( $options ) {
154 - $wgOut->addHTML( "<tr id=\"ea-data\"><th align=\"right\">" . wfMsg( 'ea-data' ) . ":</th><td>" );
 154+ $wgOut->addHTML( "<tr id=\"ea-data\"><th align=\"right\">" . wfMsg( 'ea-data' ) . "</th><td>" );
155155 $wgOut->addHTML( "<select name=\"ea-record\"><option />$options</select>" );
156156 $wgOut->addHTML( " <small><i>(" . wfMsg( 'ea-selectrecord' ) . ")</i></small></td></tr>" );
157157 }
Index: trunk/extensions/EmailPage/EmailPage.i18n.php
@@ -14,30 +14,30 @@
1515 $messages['en'] = array(
1616 'e-mailpage' => "E-mail page",
1717 'ea-desc' => "Send rendered HTML page to an e-mail address or list of addresses using [http://phpmailer.sourceforge.net phpmailer]",
18 - 'ea-heading' => "E-mailing the page [[$1]]",
 18+ 'ea-heading' => 'E-mailing the page "[[$1]]"',
1919 'ea-group-info' => "Additionally you can send the page to the members of a group",
20 - 'ea-pagesend' => "Page \"$1\" sent from $2",
21 - 'ea-nopage' => "No page was specified for sending, please use the E-mail links from the sidebar or page actions.",
 20+ 'ea-pagesend' => 'Page "$1" sent from $2',
 21+ 'ea-nopage' => "No page was specified for sending, please use the e-mail link from the sidebar or page actions.",
2222 'ea-norecipients' => "No valid e-mail addresses found!",
23 - 'ea-listrecipients' => "Listing {{PLURAL:$1|Recipient|$1 recipients}}",
 23+ 'ea-listrecipients' => 'Listing {{PLURAL:$1|recipient|$1 recipients}}',
2424 'ea-error' => "'''Error sending [[$1]]:''' ''$2''",
2525 'ea-denied' => "Permission denied",
2626 'ea-sent' => "Page [[$1]] sent successfully to '''$2''' {{PLURAL:$2|recipient|recipients}} by [[User:$3|$3]].",
2727 'ea-compose' => "Compose content",
2828 'ea-show' => "View recipient list",
29 - 'ea-from' => "From",
30 - 'ea-to' => "To",
31 - 'ea-to-info' => "Email addresses can be separated with one or more semicolon, comma, asterisk or newline characters",
32 - 'ea-cc' => "Cc",
 29+ 'ea-from' => 'From:',
 30+ 'ea-to' => 'To:',
 31+ 'ea-to-info' => "E-mail addresses can be separated with one or more semicolon, comma, asterisk or newline characters",
 32+ 'ea-cc' => 'CC:',
3333 'ea-send' => "Send",
34 - 'ea-subject' => "Subject",
35 - 'ea-message' => "Message",
 34+ 'ea-subject' => 'Subject:',
 35+ 'ea-message' => 'Message:',
3636 'ea-message-info' => "Prepend content with optional wikitext message",
37 - 'ea-style' => "Style",
38 - 'ea-selectcss' => "You can select a CSS stylesheet",
 37+ 'ea-style' => 'Style:',
 38+ 'ea-selectcss' => "You can select a stylesheet",
3939 'ea-data' => "Data",
4040 'ea-selectrecord' => "These templates can be used to fill in fields in the message content",
41 - 'ea-allusers' => "ALL USERS"
 41+ 'ea-allusers' => "All users"
4242 );
4343
4444 /** Message documentation (Message documentation)
Index: trunk/extensions/Translate/groups/mediawiki-defines.txt
@@ -385,6 +385,10 @@
386386
387387 Email Address Image
388388
 389+Email Page
 390+aliasfile = EmailPage/EmailPage.alias.php
 391+descmsg = ea-desc
 392+
389393 Embed Video
390394
391395 Emergency DeSysop

Status & tagging log