Skip to content

Commit

Permalink
Item13294: Fix quality issues in source strings:
Browse files Browse the repository at this point in the history 
 - Javascript should be escaped and spelled !JavaScript
 - proportioal misspelled
 - Add link to user's home topic in email change message.
  • Loading branch information
@gac410
gac410 committed Apr 11, 2015
1 parent 2130a71 commit 1c91485
Show file tree
Hide file tree
Showing 28 changed files with 1,163 additions and 1,085 deletions.
2 changes: 1 addition & 1 deletion PatternSkin/templates/foswiki.pattern.tmpl
View file
Expand Up @@ -81,4 +81,4 @@

%TMPL:DEF{"bodyend"}%</body></html>%TMPL:END%

%TMPL:DEF{"textareabuttons"}%<span class="foswikiRight foswikiMakeVisible" style="text-align:left; margin:0 0 0 1em;"><span class="foswikiLeft patternTextareaButton patternButtonFontSelector" title="%MAKETEXT{"Switch to monotype or propotional font"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonEnlarge" title="%MAKETEXT{"Enlarge edit box"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonShrink" title="%MAKETEXT{"Shrink edit box"}%">&nbsp;</span></span>%TMPL:END%
%TMPL:DEF{"textareabuttons"}%<span class="foswikiRight foswikiMakeVisible" style="text-align:left; margin:0 0 0 1em;"><span class="foswikiLeft patternTextareaButton patternButtonFontSelector" title="%MAKETEXT{"Switch to monotype or proportional font"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonEnlarge" title="%MAKETEXT{"Enlarge edit box"}%">&nbsp;</span><span class="foswikiLeft patternTextareaButton patternButtonShrink" title="%MAKETEXT{"Shrink edit box"}%">&nbsp;</span></span>%TMPL:END%
6 changes: 3 additions & 3 deletions TopicUserMappingContrib/data/System/DefaultUserRegistration.txt
View file
@@ -1,4 +1,4 @@
%META:TOPICINFO{author="ProjectContributor" date="1427072400" format="1.1" version="1"}%
%META:TOPICINFO{author="ProjectContributor" date="1428712476" format="1.1" version="1"}%
<noautolink>
<!--
Read general customisation instructions in %SYSTEMWEB%.UserAuthentication
Expand Down Expand Up @@ -106,7 +106,7 @@

%STARTSECTION{"note:registrationOk"}%<strong>%MAKETEXT{"Create your account to edit pages on this site."}%</strong>%ENDSECTION{"note:registrationOk"}%

%STARTSECTION{"note:requiredBrowserSettings"}%<div class='registerMakeHidden foswikiNotification foswikiAlert'>%MAKETEXT{"We noticed you have disabled Javascript. Please switch on Javascript if you wish to register."}%</div><div class='foswikiNotification foswikiAlert registerMakeVisible showIfNoCookies'>%MAKETEXT{"We noticed you have disabled cookies. Please enable cookies if you wish to register."}%</div>%ENDSECTION{"note:requiredBrowserSettings"}%
%STARTSECTION{"note:requiredBrowserSettings"}%<div class='registerMakeHidden foswikiNotification foswikiAlert'>%MAKETEXT{"We noticed you have disabled !JavaScript. Please switch on !JavaScript if you wish to register."}%</div><div class='foswikiNotification foswikiAlert registerMakeVisible showIfNoCookies'>%MAKETEXT{"We noticed you have disabled cookies. Please enable cookies if you wish to register."}%</div>%ENDSECTION{"note:requiredBrowserSettings"}%


<!--
Expand Down Expand Up @@ -470,4 +470,4 @@ format="<option>$pattern(^\| *(.*?) *\|.*)</option>"
-->
</noautolink>

%META:FILEATTACHMENT{name="validate.js" attr="h" comment="" user="ProjectContributor" date="1427072400" size="2027" version="1"}%
%META:FILEATTACHMENT{name="validate.js" attr="h" comment="" user="ProjectContributor" date="1428712476" size="2027" version="1"}%
2 changes: 1 addition & 1 deletion core/lib/Foswiki/UI/Passwords.pm
View file
Expand Up @@ -415,7 +415,7 @@ sub changePasswordAndOrEmail {
web => $webName,
topic => $topic,
def => 'email_changed',
params => [$email]
params => [ $email, Foswiki::Func::getWikiUserName($login) ]
);
}

Expand Down
93 changes: 47 additions & 46 deletions core/locale/Foswiki.pot
View file
Expand Up @@ -908,7 +908,7 @@ msgstr ""
#: JQueryPlugin/data/System/JQueryUIDialog.txt:51
#: JQueryPlugin/data/System/VarBUTTON.txt:34
#: JQueryPlugin/data/System/VarBUTTON.txt:43
#: NatEditPlugin/templates/edit.natedit.tmpl:59
#: NatEditPlugin/templates/edit.natedit.tmpl:58
#: NatEditPlugin/templates/edittoolbar.natedit.tmpl:189
#: PatternSkin/data/System/PatternSkinElements.txt:419
#: PatternSkin/data/System/PatternSkinElements.txt:428
Expand All @@ -917,12 +917,12 @@ msgstr ""
#: core/data/Main/GroupViewTemplate.txt:213
#: core/data/Main/GroupViewTemplate.txt:240
#: core/data/System/FAQWhyYouAreAskedToConfirm.txt:38
#: core/templates/edit.tmpl:47 core/templates/foswiki.tmpl:130
#: core/templates/edit.tmpl:46 core/templates/foswiki.tmpl:130
#: core/templates/settings.tmpl:12 core/templates/validate.tmpl:52
msgid "Cancel"
msgstr ""

#: PatternSkin/templates/edit.pattern.tmpl:37 core/templates/edit.tmpl:47
#: PatternSkin/templates/edit.pattern.tmpl:37 core/templates/edit.tmpl:46
#: core/templates/settings.tmpl:12
msgid "Cancel editing and discard changes"
msgstr ""
Expand Down Expand Up @@ -1330,8 +1330,8 @@ msgstr ""
msgid "Debug"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:120
#: NatEditPlugin/templates/edit.natedit.tmpl:156
#: NatEditPlugin/templates/edit.natedit.tmpl:119
#: NatEditPlugin/templates/edit.natedit.tmpl:155
msgid "Default"
msgstr ""

Expand Down Expand Up @@ -1371,7 +1371,7 @@ msgstr ""
msgid "Detailed topic list for %1 Web"
msgstr ""

#: core/lib/Foswiki/Form.pm:422
#: core/lib/Foswiki/Form.pm:425
msgid "Details in separate window"
msgstr ""

Expand Down Expand Up @@ -1631,7 +1631,7 @@ msgstr ""
msgid "Escape markup"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:125
#: NatEditPlugin/templates/edit.natedit.tmpl:124
msgid "Everybody"
msgstr ""

Expand Down Expand Up @@ -1806,7 +1806,7 @@ msgstr ""

#: core/templates/messages.tmpl:488
msgid ""
"Go back to the previous page, and enable Cookies and Javascript before "
"Go back to the previous page, and enable Cookies and !JavaScript before "
"trying again"
msgstr ""

Expand Down Expand Up @@ -1876,7 +1876,7 @@ msgstr ""
msgid "Hello %1!"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:86
#: NatEditPlugin/templates/edit.natedit.tmpl:85
#: NatEditPlugin/templates/edithelp.natedit.tmpl:2
#: NatEditPlugin/templates/settings.natedit.tmpl:21
#: NatEditPlugin/templates/settings.natedit.tmpl:24
Expand Down Expand Up @@ -2290,8 +2290,8 @@ msgstr ""
msgid "Jump to latest revision (%1)"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:135
#: NatEditPlugin/templates/edit.natedit.tmpl:166
#: NatEditPlugin/templates/edit.natedit.tmpl:134
#: NatEditPlugin/templates/edit.natedit.tmpl:165
msgid "Just me"
msgstr ""

Expand Down Expand Up @@ -2657,8 +2657,8 @@ msgstr ""
msgid "No users to reset passwords for."
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:140
#: NatEditPlugin/templates/edit.natedit.tmpl:171
#: NatEditPlugin/templates/edit.natedit.tmpl:139
#: NatEditPlugin/templates/edit.natedit.tmpl:170
msgid "Nobody"
msgstr ""

Expand Down Expand Up @@ -2859,8 +2859,8 @@ msgstr ""
msgid "Pending registration not found"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:100
#: NatEditPlugin/templates/edit.natedit.tmpl:102
#: NatEditPlugin/templates/edit.natedit.tmpl:101
#: NatEditPlugin/templates/edit.natedit.tmpl:99
msgid "Permissions"
msgstr ""

Expand Down Expand Up @@ -2982,7 +2982,7 @@ msgstr ""
msgid "Please notify your %1 administrator."
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:56
#: NatEditPlugin/templates/edit.natedit.tmpl:55
msgid "Please validate"
msgstr ""

Expand Down Expand Up @@ -3118,8 +3118,8 @@ msgstr ""
msgid "Registered e-mail addresses for currently logged in user"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:130
#: NatEditPlugin/templates/edit.natedit.tmpl:161
#: NatEditPlugin/templates/edit.natedit.tmpl:129
#: NatEditPlugin/templates/edit.natedit.tmpl:160
msgid "Registered users"
msgstr ""

Expand Down Expand Up @@ -3173,7 +3173,7 @@ msgstr ""
#: TopicUserMappingContrib/lib/Foswiki/Users/TopicUserMapping.pm:1003
#: TopicUserMappingContrib/lib/Foswiki/Users/TopicUserMapping.pm:1016
#: core/data/Main/GroupViewTemplate.txt:34
#: core/data/System/CommandAndCGIScripts.txt:669
#: core/data/System/CommandAndCGIScripts.txt:688
#: core/data/System/FormattedSearch.txt:400
#: core/data/System/GlossaryOfTerms.txt:25
#: core/data/System/SkinTemplateViewTemplate.txt:9
Expand All @@ -3191,8 +3191,8 @@ msgstr ""

#: core/templates/registermessages.tmpl:292
msgid ""
"Remember to update your user topic if you want your e-mail change to be "
"reflected there as well."
"Remember to update your user topic [[%1]] if you want your e-mail change to "
"be reflected there as well."
msgstr ""

#: TopicUserMappingContrib/data/System/ResetPassword.txt:34
Expand Down Expand Up @@ -3391,7 +3391,7 @@ msgstr ""
msgid "Sandbox test area to experiment in an unrestricted hands-on web."
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:58
#: NatEditPlugin/templates/edit.natedit.tmpl:57
#: NatEditPlugin/templates/edittoolbar.natedit.tmpl:150
msgid "Save"
msgstr ""
Expand Down Expand Up @@ -3523,7 +3523,7 @@ msgstr ""
msgid "See also:"
msgstr ""

#: core/templates/edit.tmpl:51
#: core/templates/edit.tmpl:50
msgid "See below for help in editing this page."
msgstr ""

Expand Down Expand Up @@ -3567,7 +3567,7 @@ msgstr ""
msgid "Select topic parent"
msgstr ""

#: PatternSkin/templates/edit.pattern.tmpl:48 core/templates/edit.tmpl:43
#: PatternSkin/templates/edit.pattern.tmpl:48 core/templates/edit.tmpl:42
msgid "Select, copy and paste your signature text to the bottom of your entry"
msgstr ""

Expand Down Expand Up @@ -3688,8 +3688,8 @@ msgstr ""
msgid "Spaces are replaced by underscores"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:145
#: NatEditPlugin/templates/edit.natedit.tmpl:176
#: NatEditPlugin/templates/edit.natedit.tmpl:144
#: NatEditPlugin/templates/edit.natedit.tmpl:175
msgid "Specific users/groups"
msgstr ""

Expand Down Expand Up @@ -3787,7 +3787,7 @@ msgid "Superscript"
msgstr ""

#: PatternSkin/templates/foswiki.pattern.tmpl:84
msgid "Switch to monotype or propotional font"
msgid "Switch to monotype or proportional font"
msgstr ""

#: NatEditPlugin/templates/edittoolbar.natedit.tmpl:118
Expand Down Expand Up @@ -3816,7 +3816,7 @@ msgstr ""
msgid "Template %1 does not exist"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:83
#: NatEditPlugin/templates/edit.natedit.tmpl:82
#: NatEditPlugin/templates/editdialog.natedit.tmpl:105
#: NatEditPlugin/templates/editdialog.natedit.tmpl:133
#: NatEditPlugin/templates/editdialog.natedit.tmpl:91
Expand Down Expand Up @@ -4647,11 +4647,11 @@ msgstr ""
msgid "Users cannot be removed from %1"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:153
#: NatEditPlugin/templates/edit.natedit.tmpl:152
msgid "Users who may edit:"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:117
#: NatEditPlugin/templates/edit.natedit.tmpl:116
msgid "Users who may view:"
msgstr ""

Expand Down Expand Up @@ -4791,8 +4791,8 @@ msgstr ""

#: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:109
msgid ""
"We noticed you have disabled Javascript. Please switch on Javascript if you "
"wish to register."
"We noticed you have disabled !JavaScript. Please switch on !JavaScript if "
"you wish to register."
msgstr ""

#: TopicUserMappingContrib/data/System/DefaultUserRegistration.txt:109
Expand Down Expand Up @@ -4965,8 +4965,8 @@ msgstr ""

#: core/templates/messages.tmpl:487
msgid ""
"You cannot proceed because either Cookies or Javascript are disabled in your "
"browser."
"You cannot proceed because either Cookies or !JavaScript are disabled in "
"your browser."
msgstr ""

#: core/templates/registermessages.tmpl:194
Expand Down Expand Up @@ -5125,7 +5125,7 @@ msgstr ""
msgid "Your signature to copy/paste"
msgstr ""

#: core/templates/edit.tmpl:43
#: core/templates/edit.tmpl:42
msgid "Your signature to copy/paste:"
msgstr ""

Expand Down Expand Up @@ -5159,6 +5159,7 @@ msgid ""
"[multiple of 3 spaces] * [space] Set [space] VARIABLENAME [space] = [value]"
msgstr ""

#: core/lib/Foswiki/Configure/Checkers/LANGUAGE.pm:44
#: core/lib/Foswiki/I18N.pm:349
msgid "_language_name"
msgstr ""
Expand Down Expand Up @@ -5215,8 +5216,8 @@ msgstr ""
msgid "close display options"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:118
#: NatEditPlugin/templates/edit.natedit.tmpl:154
#: NatEditPlugin/templates/edit.natedit.tmpl:117
#: NatEditPlugin/templates/edit.natedit.tmpl:153
msgid "default as defined in the %1"
msgstr ""

Expand Down Expand Up @@ -5308,7 +5309,7 @@ msgstr ""
msgid "preview"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:123
#: NatEditPlugin/templates/edit.natedit.tmpl:122
msgid "public view access"
msgstr ""

Expand All @@ -5320,16 +5321,16 @@ msgstr ""
msgid "restore form"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:133
#: NatEditPlugin/templates/edit.natedit.tmpl:164
#: NatEditPlugin/templates/edit.natedit.tmpl:132
#: NatEditPlugin/templates/edit.natedit.tmpl:163
msgid "restrict access to %1"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:128
#: NatEditPlugin/templates/edit.natedit.tmpl:127
msgid "restrict read access to users that have an account on this site"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:159
#: NatEditPlugin/templates/edit.natedit.tmpl:158
msgid "restrict write access to users that have an account on this site"
msgstr ""

Expand All @@ -5347,16 +5348,16 @@ msgstr ""
msgid "set preferences"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:143
#: NatEditPlugin/templates/edit.natedit.tmpl:174
#: NatEditPlugin/templates/edit.natedit.tmpl:142
#: NatEditPlugin/templates/edit.natedit.tmpl:173
msgid "specify a list of users and/or groups"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:138
#: NatEditPlugin/templates/edit.natedit.tmpl:137
msgid "strictly deny any access to this topic"
msgstr ""

#: NatEditPlugin/templates/edit.natedit.tmpl:169
#: NatEditPlugin/templates/edit.natedit.tmpl:168
msgid "strictly deny write access to this topic"
msgstr ""

Expand Down

0 comments on commit 1c91485

Please sign in to comment.