Merge pull request #3519 from jsoref/legacy-api-token-ux

Legacy api token ux

core/src/main/java/jenkins/security/apitoken/ApiTokenPropertyConfiguration.java

@@ -37,19 +37,19 @@ import org.jenkinsci.Symbol;
 @Symbol("apiToken")
 public class ApiTokenPropertyConfiguration extends GlobalConfiguration {
     /**
-     * When a user is created, this property determine if we create a legacy token for the user or not
-     * For security reason, we do not recommend to enable this but we let that open to ease upgrade.
+     * When a user is created, this property determines whether or not we create a legacy token for the user.
+     * For security reasons, we do not recommend you enable this but we left that open to ease upgrades.
      */
     private boolean tokenGenerationOnCreationEnabled = false;
 
     /**
-     * When a user has a legacy token, this property determine if the user can request a new legacy token or not
-     * For security reason, we do not recommend to enable this but we let that open to ease upgrade.
+     * When a user has a legacy token, this property determines whether or not the user can request a new legacy token.
+     * For security reasons, we do not recommend you enable this but we left that open to ease upgrades.
      */
     private boolean creationOfLegacyTokenEnabled = false;
     
     /**
-     * Each time an API Token is used, its usage counter is incremented and the last usage date is updated. 
+     * Each time an API Token is used, its usage counter is incremented and the last used date is updated.
      * You can disable this feature using this property.
      */
     private boolean usageStatisticsEnabled = true;

core/src/main/resources/hudson/model/User/index.jelly

@@ -32,7 +32,7 @@ THE SOFTWARE.
       </h1>
       <t:editableDescription permission="${app.ADMINISTER}" />
       <div>
-        ${%Jenkins User Id}: ${it.id}
+        ${%Jenkins User ID}: ${it.id}
       </div>
       <!-- give properties a chance to contribute summary item -->
       <j:forEach var="p" items="${it.allProperties}">

core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly

@@ -101,7 +101,7 @@ THE SOFTWARE.
       <table class="sortable pane bigtable" id="people">
         <tr>
           <th />
-          <th>${%User Id}</th>
+          <th>${%User ID}</th>
           <th>${%Name}</th>
           <th initialSortDir="up">${%Last Commit Activity}</th>
           <th>${%On}</th>

core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly

@@ -33,7 +33,7 @@ THE SOFTWARE.
       <table class="sortable pane bigtable" id="people">
         <tr>
           <th style="width:32px"/>
-          <th>${%User Id}</th>
+          <th>${%User ID}</th>
           <th>${%Name}</th>
           <th style="width:32px"/>
         </tr>

core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties

@@ -4,24 +4,24 @@ contextMessage=The following users have a legacy API token. \
   Additionally, in previous versions of Jenkins, API tokens were automatically created for every new user. \
   Often, users did not use the token, resulting in a larger attack surface than necessary. \
   Automatic token generation must now be enabled explicitly.
-recommendationMessage=For such reasons, we recommend to: \
+recommendationMessage=For such reasons, we recommend you: \
 <ul>\
   <li>revoke the tokens that were never used and</li>\
   <li>ask users that are currently using their legacy token to generate a token using the new system and revoke their legacy token</li>\
 </ul>
-UserId=User Id
+UserId=User ID
 UserFullName=User full name
 TokenName=Token name
 NumDaysSinceCreation=Days since creation
-NumOfUse=# of use
+NumOfUse=# of uses
 NumDaysSinceLastUse=Days since last use
 HasFreshToken=Fresh token?
 HasFreshToken_tooltip=A fresh token is one that was created using the new system \
   after the most recent use of the user''s legacy token. \n\
   Note: the creation date of legacy tokens which have never been used are reset every time Jenkins is restarted, \
-  which means that the date may be inaccurate.
-HasFreshToken_ok_tooltip=A fresh token exist for that user
-HasFreshToken_warning_tooltip=No fresh token exist for that user
+  which means that the date for those tokens will be inaccurate.
+HasFreshToken_ok_tooltip=A fresh token exists for this user
+HasFreshToken_warning_tooltip=No fresh token exists for this user
 HasMoreRecentlyUsedToken=Recent token?
 HasMoreRecentlyUsedToken_tooltip=A recently used token is one that was created using the new system \
   and used more recently than the user''s legacy token. \n\