Item13294: Fix reported string issues

Also addresed nearby strings with similar issues. Removed the cryptic {LoginNameFilterIn} from the message and expanded the LoginName topic with further help.
foswiki · Mar 13, 2015 · f8b92d9 · f8b92d9
1 parent b8706c9
commit f8b92d9
Show file tree

Hide file tree

Showing 25 changed files with 1,679 additions and 926 deletions.
diff --git a/TopicUserMappingContrib/data/System/LoginName.txt b/TopicUserMappingContrib/data/System/LoginName.txt
@@ -1,4 +1,4 @@
-%META:TOPICINFO{author="ProjectContributor" date="1426205003" format="1.1" version="1"}%
+%META:TOPICINFO{author="ProjectContributor" date="1426259497" format="1.1" version="1"}%
 %META:TOPICPARENT{name="GlossaryOfTerms"}%
 ---+ %MAKETEXT{"The name you log in with"}%
 
@@ -9,6 +9,12 @@ to use login names, then you will log in using your [[[_1].WikiName][WikiName]].
 
 %MAKETEXT{"You cannot alter your login name: you have to get the administrator to do this for you."}%
 
+%MAKETEXT{"The login name is checked for invalid characters using the below filter. Any characters matching this filter will invalidate the login name."}%
+
+<pre>%QUERY{"{LoginNameFilterIn}"}%</pre>
+
+%MAKETEXT{"Contact <a href='mailto:[_1]'>your site administrator</a> for further assistance." args="%WIKIWEBMASTER%"}%
+
 ---++ How to Find Yours
 
 %T% %MAKETEXT{"These steps may not be applicable to your system."}%

diff --git a/core/locale/Foswiki.pot b/core/locale/Foswiki.pot
@@ -64,7 +64,7 @@ msgid "%1 Web"
 msgstr ""
 
 #: core/templates/registermessages.tmpl:387
-msgid "%1 added to the %2 group. "
+msgid "%1 added to the %2 group."
 msgstr ""
 
 #. ((                $Foswiki::cfg{AdminUserWikiName}, $Foswiki::cfg{SuperAdminGroup})
@@ -77,7 +77,7 @@ msgid "%1 denied the registration."
 msgstr ""
 
 #: core/templates/registermessages.tmpl:394
-msgid "%1 group topic upgraded. "
+msgid "%1 group topic upgraded."
 msgstr ""
 
 #: TopicUserMappingContrib/data/System/ChangeEmailAddress.txt:67
@@ -163,7 +163,7 @@ msgid "%1 registration denied"
 msgstr ""
 
 #: core/templates/registermessages.tmpl:436
-msgid "%1 removed from the %2 group. "
+msgid "%1 removed from the %2 group."
 msgstr ""
 
 #: core/templates/messages.tmpl:21
@@ -208,7 +208,7 @@ msgid "&Sequential"
 msgstr ""
 
 #: core/templates/registermessages.tmpl:219
-msgid "'%1' is not a valid %2 "
+msgid "'%1' is not a valid [[%2][Login name]]."
 msgstr ""
 
 #: core/data/System/WebTopicCreator.txt:3
@@ -1123,6 +1123,12 @@ msgstr ""
 msgid "Contact %1 if you have any questions."
 msgstr ""
 
+#: TopicUserMappingContrib/data/System/LoginName.txt:16
+msgid ""
+"Contact <a href='mailto:%1'>your site administrator</a> for further "
+"assistance."
+msgstr ""
+
 #: HistoryPlugin/templates/oopshistory.tmpl:100
 msgid "Context"
 msgstr ""
@@ -2071,16 +2077,6 @@ msgstr ""
 msgid "Including"
 msgstr ""
 
-#: core/templates/registermessages.tmpl:114
-#: core/templates/registermessages.tmpl:211
-#: core/templates/registermessages.tmpl:218
-msgid "Incorrect %1"
-msgstr ""
-
-#: core/templates/registermessages.tmpl:117
-msgid "Incorrect %1.WikiNames:"
-msgstr ""
-
 #: core/templates/registermessages.tmpl:300
 msgid "Incorrect Password"
 msgstr ""
@@ -2089,6 +2085,19 @@ msgstr ""
 msgid "Incorrect Prefix"
 msgstr ""
 
+#: core/templates/registermessages.tmpl:211
+#: core/templates/registermessages.tmpl:218
+msgid "Incorrect [[%1][Login name]]"
+msgstr ""
+
+#: core/templates/registermessages.tmpl:114
+msgid "Incorrect [[%1][WikiName]]"
+msgstr ""
+
+#: core/templates/registermessages.tmpl:117
+msgid "Incorrect [[%1][WikiNames:]]"
+msgstr ""
+
 #: core/templates/messages.tmpl:300
 msgid "Incorrect parameters to the =%1= script"
 msgstr ""
@@ -2923,8 +2932,8 @@ msgstr ""
 
 #: core/templates/registermessages.tmpl:279
 msgid ""
-"Please make sure you spelled the %1 correctly and try again. If you get "
-"stuck, please mail %2."
+"Please make sure you spelled the [[%1][Login name]] correctly and try again. "
+"If you get stuck, please contact %2."
 msgstr ""
 
 #: core/templates/messages.tmpl:475
@@ -3282,7 +3291,7 @@ msgid "Return to [_0]"
 msgstr ""
 
 #: core/templates/registermessages.tmpl:342
-msgid "Return to [_0] and supply a WikiName or Login Name"
+msgid "Return to [_0] and supply a WikiName or Login name"
 msgstr ""
 
 #: TopicUserMappingContrib/data/System/ChangePassword.txt:27
@@ -3790,21 +3799,7 @@ msgid ""
 msgstr ""
 
 #: core/templates/registermessages.tmpl:103
-msgid "That user has already been activated "
-msgstr ""
-
-#: core/templates/registermessages.tmpl:115
-msgid ""
-"The %1 field must be your first and last name in %2, e.g. your capitalized "
-"first and last name with spaces removed."
-msgstr ""
-
-#: core/templates/registermessages.tmpl:220
-msgid "The %1 field must match the {LoginNameFilterIn} filter for this site"
-msgstr ""
-
-#: core/templates/registermessages.tmpl:212
-msgid "The %1 is a required parameter. Registration rejected."
+msgid "That user has already been activated"
 msgstr ""
 
 #: core/templates/messages.tmpl:63
@@ -3855,10 +3850,21 @@ msgstr ""
 
 #: core/templates/registermessages.tmpl:205
 msgid ""
-"The [[%1][Login Name]] (%2) is not allowed for this installation. "
+"The [[%1][Login name]] (%2) is not allowed for this installation. "
 "Registration rejected."
 msgstr ""
 
+#: core/templates/registermessages.tmpl:212
+msgid "The [[%1][Login name]] is a required parameter. Registration rejected."
+msgstr ""
+
+#: core/templates/registermessages.tmpl:115
+msgid ""
+"The [[%1][WikiName]] field must be your first and last name written as a "
+"[[%2][WikiWord]], e.g. your capitalized first and last name with spaces "
+"removed."
+msgstr ""
+
 #: core/templates/registermessages.tmpl:80
 msgid "The activation code %1 is invalid."
 msgstr ""
@@ -3964,6 +3970,12 @@ msgstr ""
 msgid "The lease on this topic expired %1 ago."
 msgstr ""
 
+#: TopicUserMappingContrib/data/System/LoginName.txt:12
+msgid ""
+"The login name is checked for invalid characters using the below filter. Any "
+"characters matching this filter will invalidate the login name."
+msgstr ""
+
 #: core/templates/messages.tmpl:90
 msgid "The name of the topic must not be empty."
 msgstr ""
@@ -4054,10 +4066,10 @@ msgid "There were errors adding to the %2 group. %1 "
 msgstr ""
 
 #: core/templates/registermessages.tmpl:425
-msgid "There were errors removing %1 from the %2 group. "
+msgid "There were errors removing %1 from the %2 group."
 msgstr ""
 
-#: TopicUserMappingContrib/data/System/LoginName.txt:14
+#: TopicUserMappingContrib/data/System/LoginName.txt:20
 msgid "These steps may not be applicable to your system."
 msgstr ""
 
@@ -4414,7 +4426,7 @@ msgid "Unsubscribe from this topic (s)"
 msgstr ""
 
 #: core/templates/registermessages.tmpl:204
-msgid "Unsupported [[%1][Login Name]]"
+msgid "Unsupported [[%1][Login name]]"
 msgstr ""
 
 #: core/data/System/SiteChanges.txt:43 core/data/System/SiteChanges.txt:96
@@ -5049,6 +5061,11 @@ msgid ""
 "Your user registration failed because it did not pass the validation tests."
 msgstr ""
 
+#: core/templates/registermessages.tmpl:220
+msgid ""
+"[[%1][Click here]] for guidance on creating a valid login name for this site"
+msgstr ""
+
 #: core/templates/messages.tmpl:209
 msgid "[[%1][Debug topic text]]."
 msgstr ""