Changeset 32414 for main/trunk

Timestamp:

2018-09-03T12:36:04+12:00 (6 years ago)

Author:

kjdon

Message:

some changes to authentication strings

File:

• main/trunk/greenstone3/web/WEB-INF/classes/ServiceRack.properties (modified) (2 diffs)

main/trunk/greenstone3/web/WEB-INF/classes/ServiceRack.properties

@@ -111 +111 @@
 auth.error.user_not_found=The requested user was not found in the database.
 auth.error.sql_exception=There was an SQL exception while accessing the database.
-auth.error.invalid_username=The username specified was invalid.
+auth.error.invalid_username=The username specified was invalid (must be between 2 and 30 characters long, and contain only a-z, A-Z, 0-9 and _ or . characters)
 auth.error.no_password=No password was entered.
 auth.error.password_too_short=The password you entered was too short (minimum of 3 characters).
 auth.error.password_too_long=The password you entered was too long (maximum of 64 characters).
-auth.error.password_illegal_chars=The password you entered contains illegal characters.
+auth.error.password_illegal_chars=The password you entered contains illegal characters (only ascii characters are valid).
 auth.error.incorrect_password=The password specified was incorrect.
-auth.error.user_already_exists=This user already exists and therefore cannot be added.
+auth.error.user_already_exists=This username already exists; please choose a different one.
 auth.error.add_user_error=There was an error adding this user to the database.
 auth.error.remove_user_error=There was an error removing this user from the database.
@@ -123 +123 @@
 auth.error.captcha_missing=The information from the captcha is missing.
 auth.error.not_authorised=You are not authorised to access this page.
-auth_error.missing_params=Missing compulsory parameters: username, oldPassword, or newPassword
+auth.error.missing_params=Missing compulsory parameters: username, oldPassword, or newPassword
+auth.error.something_wrong=Sorry. Something has gone wrong and I am not sure which page you want.
 auth.success.account_settings=You have successfully changed your details.
+auth.success.edit_user=Details for user {0} successfully updated.
+auth.success.delete_user=User {0} successfully deleted.
 
 ## CrossCollectionSearch specific strings