Merge "Add PLURAL support to benefits"

diff --combined includes/templates/UsercreateVForm.php
index b8ce27e,867e067..626f880
--- 1/includes/templates/UsercreateVForm.php
--- 2/includes/templates/UsercreateVForm.php
+++ b/includes/templates/UsercreateVForm.php
@@@ -185,13 -185,9 +185,13 @@@ class UsercreateTemplateVForm extends B
                if ( $this->data['usereason'] ) { ?>
                        <div>
                                <label for='wpReason'><?php $this->msg( 'createacct-reason' ); ?></label>
 -                              <input type='text' class='mw-input loginText' name="wpReason" id="wpReason"
 -                                              tabindex="8"
 -                                              value="<?php $this->text( 'reason' ); ?>" size='20' />
 +                              <?php echo Html::input( 'wpReason', $this->data['reason'], 'text', array(
 +                                      'class' => 'mw-input loginText',
 +                                      'id' => 'wpReason',
 +                                      'tabindex' => '8',
 +                                      'size' => '20',
 +                                      'placeholder' => $this->getMsg( 'createacct-reason-ph' )->text()
 +                              ) ); ?>
                        </div>
                <?php }
                $tabIndex = 9;
@@@ -255,7 -251,7 +255,7 @@@
                <div class="mw-submit">
                        <input type='submit' class="mw-ui-button mw-ui-big mw-ui-block mw-ui-primary" name="wpCreateaccount" id="wpCreateaccount"
                                tabindex="<?php echo $tabIndex++; ?>"
 -                              value="<?php $this->msg( 'createaccount' ); ?>" />
 +                              value="<?php $this->msg( 'createacct-submit' ); ?>" />
                </div>
        <input type="hidden" id="useNew" name="useNew" value="1" />
  <?php if ( $this->haveData( 'uselang' ) ) { ?><input type="hidden" name="uselang" value="<?php $this->text( 'uselang' ); ?>" /><?php } ?>
@@@ -265,27 -261,21 +265,21 @@@
  <div class="mw-createacct-benefits-container">
        <h2><?php $this->msg( 'createacct-benefit-heading' ); ?></h2>
        <div class="mw-createacct-benefits-list">
+       <?php
+       for ( $benefitIdx = 1; $benefitIdx <= $this->data['benefitCount']; $benefitIdx++ ) {
+               // Pass each benefit's head text (by default a number) as a parameter to the body's message for PLURAL handling.
+               $headUnescaped = $this->getMsg( "createacct-benefit-head$benefitIdx" )->text();
+       ?>
                <div>
-                       <div class="mw-benefits-icon <?php $this->msg( 'createacct-benefit-icon1' ); ?>"></div>
-                       <div class="mw-number-text">
-                               <h3><?php $this->msg( 'createacct-benefit-head1' ); ?></h3>
-                               <p><?php $this->msg( 'createacct-benefit-body1' ); ?></p>
-                       </div>
-               </div>
-               <div>
-                       <div class="mw-benefits-icon <?php $this->msg( 'createacct-benefit-icon2' ); ?>"></div>
-                       <div class="mw-number-text">
-                               <h3><?php $this->msg( 'createacct-benefit-head2' ); ?></h3>
-                               <p><?php $this->msg( 'createacct-benefit-body2' ); ?></p>
-                       </div>
-               </div>
-               <div>
-                       <div class="mw-benefits-icon <?php $this->msg( 'createacct-benefit-icon3' ); ?>"></div>
+                       <div class="mw-benefits-icon <?php $this->msg( "createacct-benefit-icon$benefitIdx" ); ?>"></div>
                        <div class="mw-number-text">
-                               <h3><?php $this->msg( 'createacct-benefit-head3' ); ?></h3>
-                               <p><?php $this->msg( 'createacct-benefit-body3' ); ?></p>
+                               <h3><?php $this->msg( "createacct-benefit-head$benefitIdx" ); ?></h3>
+                               <p><?php echo $this->getMsg( "createacct-benefit-body$benefitIdx" )->params( $headUnescaped )->escaped(); ?></p>
                        </div>
                </div>
+       <?php
+       }
+       ?>
        </div>
  </div>
  </div>

diff --combined languages/messages/MessagesEn.php
index e6f7338,d9ad138..93e9746
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -378,7 -378,6 +378,7 @@@ $magicWords = array
   * hook.
   */
  $specialPageAliases = array(
 +      'Activeusers'               => array( 'ActiveUsers' ),
        'Allmessages'               => array( 'AllMessages' ),
        'Allpages'                  => array( 'AllPages' ),
        'Ancientpages'              => array( 'AncientPages' ),
@@@ -1093,7 -1092,7 +1093,7 @@@ Do not forget to change your [[Special:
  'createacct-yourpasswordagain'    => 'Confirm password',
  'createacct-yourpasswordagain-ph' => 'Enter password again',
  'remembermypassword'           => 'Remember my login on this browser (for a maximum of $1 {{PLURAL:$1|day|days}})',
 -'userlogin-remembermypassword' => 'Remember me',
 +'userlogin-remembermypassword' => 'Keep me logged in',
  'userlogin-signwithsecure'     => 'Sign in with secure server',
  'securelogin-stick-https'      => 'Stay connected to HTTPS after login',
  'yourdomainname'               => 'Your domain:',
@@@ -1126,22 -1125,20 +1126,22 @@@
  'createacct-realname'             => 'Real name (optional)',
  'createaccountreason'          => 'Reason:',
  'createacct-reason'               => 'Reason',
 +'createacct-reason-ph'            => 'Why you are creating another account',
  'createacct-captcha'              => 'Security check',
  'createacct-captcha-help-url'     => '{{ns:Project}}:Request an account',
  'createacct-imgcaptcha-help'      => 'Can\'t see the image? [[{{MediaWiki:createacct-captcha-help-url}}|Request an account]]',
  'createacct-imgcaptcha-ph'        => 'Enter the text you see above',
 +'createacct-submit'               => 'Create your account',
  'createacct-benefit-heading'      => '{{SITENAME}} is made by people like you.',
  'createacct-benefit-icon1'        => 'icon-edits',
  'createacct-benefit-head1'        => '{{NUMBEROFEDITS}}',
- 'createacct-benefit-body1'        => 'edits',
+ 'createacct-benefit-body1'        => '{{PLURAL:$1|edit|edits}}',
  'createacct-benefit-icon2'        => 'icon-pages',
  'createacct-benefit-head2'        => '{{NUMBEROFARTICLES}}',
- 'createacct-benefit-body2'        => 'pages',
+ 'createacct-benefit-body2'        => '{{PLURAL:$1|page|pages}}',
  'createacct-benefit-icon3'        => 'icon-contributors',
  'createacct-benefit-head3'        => '{{NUMBEROFACTIVEUSERS}}',
- 'createacct-benefit-body3'        => 'recent contributors',
+ 'createacct-benefit-body3'        => 'recent {{PLURAL:$1|contributor|contributors}}',
  'badretype'                    => 'The passwords you entered do not match.',
  'userexists'                   => 'Username entered already in use.
  Please choose a different name.',
@@@ -1250,7 -1247,6 +1250,7 @@@ To finish logging in, you must set a ne
  'oldpassword'               => 'Old password:',
  'newpassword'               => 'New password:',
  'retypenew'                 => 'Retype new password:',
 +'resetpass-abort-generic'   => 'Password change has been aborted by an extension.',
  'resetpass_submit'          => 'Set password and log in',
  'resetpass_success'         => 'Your password has been changed successfully!
  Now logging you in...',
@@@ -2007,7 -2003,6 +2007,7 @@@ Your email address is not revealed whe
  'userrights-changeable-col'      => 'Groups you can change',
  'userrights-unchangeable-col'    => 'Groups you cannot change',
  'userrights-irreversible-marker' => '$1*', # only translate this message to other languages if you have to change it
 +'userrights-conflict'            => 'User rights conflict! Please apply your changes again.',
  
  # Groups
  'group'               => 'Group:',
@@@ -2820,16 -2815,6 +2820,16 @@@ Supported {{PLURAL:$2|protocol|protocol
  'listusers-noresult' => 'No user found.',
  'listusers-blocked'  => '(blocked)',
  
 +# Special:ActiveUsers
 +'activeusers'            => 'Active users list',
 +'activeusers-summary'    => '', # do not translate or duplicate this message to other languages
 +'activeusers-intro'      => 'This is a list of users who had some kind of activity within the last $1 {{PLURAL:$1|day|days}}.',
 +'activeusers-count'      => '$1 {{PLURAL:$1|action|actions}} in the last {{PLURAL:$3|day|$3 days}}',
 +'activeusers-from'       => 'Display users starting at:',
 +'activeusers-hidebots'   => 'Hide bots',
 +'activeusers-hidesysops' => 'Hide administrators',
 +'activeusers-noresult'   => 'No users found.',
 +
  # Special:ListGroupRights
  'listgrouprights'                      => 'User group rights',
  'listgrouprights-summary'              => 'The following is a list of user groups defined on this wiki, with their associated access rights.