Item13294: Noticed a few more 'user name' instances.

foswiki · Mar 13, 2015 · 2ea2a9f · 2ea2a9f
1 parent 8722a8e
commit 2ea2a9f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/core/templates/messages.tmpl b/core/templates/messages.tmpl
@@ -363,7 +363,7 @@ registermessages.tmpl
 %{==============================================================================}%
 %TMPL:DEF{"no_email_for"}%       %MAKETEXT{"Can't get an e-mail address for [_1] (required for password reset)" args="%PARAM1%"}% %TMPL:END%
 %{==============================================================================}%
-%TMPL:DEF{"new_sys_pass"}%       %MAKETEXT{"A new system-generated password for your login name '[_1]' (!WikiName [_2]) has been sent to your registered e-mail address. If your e-mail address is no longer valid, please contact [_3]." args="%PARAM1%, %USERSWEB%.%PARAM2%, %WIKIWEBMASTER%"}% %TMPL:END%
+%TMPL:DEF{"new_sys_pass"}%       %MAKETEXT{"A new system-generated password for your username '[_1]' (!WikiName [_2]) has been sent to your registered e-mail address. If your e-mail address is no longer valid, please contact [_3]." args="%PARAM1%, %USERSWEB%.%PARAM2%, %WIKIWEBMASTER%"}% %TMPL:END%
 %{==============================================================================}%
 %TMPL:DEF{"geturl_failed"}%      %MAKETEXT{"Failed to include URL [_1]" args="%PARAM1%"}%%TMPL:END%
 %{==============================================================================}%

diff --git a/core/templates/registermessages.tmpl b/core/templates/registermessages.tmpl
@@ -201,23 +201,23 @@
 %TMPL:END%
 %{==============================================================================}%
 %TMPL:DEF{"unsupport_loginname"}%
----+++ %MAKETEXT{"Unsupported [[[_1]][login user name]]" args="%SYSTEMWEB%.UserName"}%
-%MAKETEXT{"The [[[_1]][login user name]] ([_2]) is not allowed for this installation. Registration rejected." args="%SYSTEMWEB%.UserName,%PARAM1%"}%
+---+++ %MAKETEXT{"Unsupported [[[_1]][username]]" args="%SYSTEMWEB%.UserName"}%
+%MAKETEXT{"The [[[_1]][login username]] ([_2]) is not allowed for this installation. Registration rejected." args="%SYSTEMWEB%.UserName,%PARAM1%"}%
 
 %MAKETEXT{"Please go back in your browser and try again."}%
 %TMPL:END%
 %{==============================================================================}%
 %TMPL:DEF{"miss_loginname"}%
----+++ %MAKETEXT{"Incorrect [[[_1]][login user name]]" args="%SYSTEMWEB%.UserName"}%
-%MAKETEXT{"The [[[_1]][login user name]] is a required parameter. Registration rejected." args="%SYSTEMWEB%.UserName"}%
+---+++ %MAKETEXT{"Incorrect [[[_1]][username]]" args="%SYSTEMWEB%.UserName"}%
+%MAKETEXT{"The [[[_1]][login username]] is a required parameter. Registration rejected." args="%SYSTEMWEB%.UserName"}%
 
 %MAKETEXT{"Please go back in your browser and try again."}%
 %TMPL:END%
 %{==============================================================================}%
 %TMPL:DEF{"bad_loginname"}%
----+++ %MAKETEXT{"Incorrect [[[_1]][login user name]]" args="%SYSTEMWEB%.UserName"}%
-%MAKETEXT{"'[_1]' is not a valid [[[_2]][login user name]]." args="%PARAM1%,%SYSTEMWEB%.UserName"}%
-%MAKETEXT{"[[[_1]][Click here]] for guidance on creating a valid login user name for this site" args="%SYSTEMWEB%.UserName"}%
+---+++ %MAKETEXT{"Incorrect [[[_1]][username]]" args="%SYSTEMWEB%.UserName"}%
+%MAKETEXT{"'[_1]' is not a valid [[[_2]][login username]]." args="%PARAM1%,%SYSTEMWEB%.UserName"}%
+%MAKETEXT{"[[[_1]][Click here]] for guidance on creating a valid username for this site" args="%SYSTEMWEB%.UserName"}%
 
 %MAKETEXT{"Please go back in your browser and try again."}%
 %TMPL:END%
@@ -276,7 +276,7 @@
 %{==============================================================================}%
 %TMPL:DEF{"not_a_user"}%
 ---+++ %MAKETEXT{"Can't find user [_1]" args="%PARAM1%"}%
-%MAKETEXT{"Please make sure you spelled the [[[_1]][login user name]] correctly and try again. If you get stuck, please contact [_2]." args="%SYSTEMWEB%.UserName, %WIKIWEBMASTER%"}%
+%MAKETEXT{"Please make sure you spelled the [[[_1]][username]] correctly and try again. If you get stuck, please contact [_2]." args="%SYSTEMWEB%.UserName, %WIKIWEBMASTER%"}%
 
 %MAKETEXT{"See [_1] for a list of existing users or register as new user in [_2]." args="%USERSWEB%.%WIKIUSERSTOPIC%, %SYSTEMWEB%.UserRegistration"}% %TMPL:END%
 %{==============================================================================}%
@@ -339,7 +339,7 @@
 %{==============================================================================}%
 %TMPL:DEF{"user_param_required"}%
 ---+++ %MAKETEXT{"User Account was not supplied"}%
-%MAKETEXT{"Return to [_1] and supply a [[[_2]][WikiName or [[[_3]][login user name]]." args="[[%WEB%.%TOPIC%]], %SYSTEMWEB%.WikiName, %SYSTEMWEB%.UserName"}%
+%MAKETEXT{"Return to [_1] and supply a [[[_2]][WikiName or [[[_3]][username]]." args="[[%WEB%.%TOPIC%]], %SYSTEMWEB%.WikiName, %SYSTEMWEB%.UserName"}%
 %TMPL:END%
 %{==============================================================================}%
 %TMPL:DEF{"not_self"}%