Merge pull request #9603 from ashleighpearson/9372

Use username consistently instead of login #9372

plugins/UsersManager/javascripts/usersManager.js

@@ -272,7 +272,7 @@ $(document).ready(function () {
         newRowId = 'row' + newRowId;
 
         $($.parseHTML(' <tr id="' + newRowId + '">\
-				<td><input id="useradd_login" placeholder="login" size="10" /></td>\
+				<td><input id="useradd_login" placeholder="username" size="10" /></td>\
 				<td><input id="useradd_password" placeholder="password" size="10" /></td>\
 				<td><input id="useradd_email" placeholder="email@domain.com" size="15" /></td>\
 				<td><input id="useradd_alias" placeholder="alias" size="15" /></td>\

plugins/UsersManager/lang/en.json

@@ -25,9 +25,9 @@
         "ExceptionEditAnonymous": "The anonymous user cannot be edited or deleted. It is used by Piwik to define a user that has not logged in yet. For example, you can make your statistics public by granting the 'view' access to the 'anonymous' user.",
         "ExceptionEmailExists": "User with email '%s' already exists.",
         "ExceptionInvalidEmail": "The email doesn't have a valid format.",
-        "ExceptionInvalidLoginFormat": "The login must be between %1$s and %2$s characters long and contain only letters, numbers, or the characters '_' or '-' or '.' or '@' or '+'",
+        "ExceptionInvalidLoginFormat": "The username must be between %1$s and %2$s characters long and contain only letters, numbers, or the characters '_' or '-' or '.' or '@' or '+'",
         "ExceptionInvalidPassword": "The password length must be between %1$s and %2$s characters.",
-        "ExceptionLoginExists": "Login '%s' already exists.",
+        "ExceptionLoginExists": "Username '%s' already exists.",
         "ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth is expecting a MD5-hashed password (32 chars long string). Please call the md5() function on the password before calling this method.",
         "ExceptionRemoveSuperUserAccessOnlySuperUser": "Removing the Super User access from user '%s' is not possible.",
         "ExceptionSuperUserAccess": "This user has Super User access and has already permission to access and modify all websites in Piwik. You may remove the Super User access from this user and try again.",