Index: src/main/resources/XWiki/DefaultSkin.xml =================================================================== --- src/main/resources/XWiki/DefaultSkin.xml (revision 16224) +++ src/main/resources/XWiki/DefaultSkin.xml (working copy) @@ -14,7 +14,7 @@ 1167576476000 1167579255000 1169801142000 -1.5 +1.1 @@ -247,10 +247,10 @@ -1 Skin +1 $msg.get("xe.admin.skin.makeyourown") -You can modify the existing look and feel and even create your own. +$msg.get("xe.admin.skin.makeyourown") -* <a href="$doc.getURL("edit","editor=object")">Edit this skin</a> -* [Test this skin>Main.WebHome?skin=${doc.fullName}] +* <a href="$doc.getURL("edit","editor=object")">$msg.get("xe.admin.skin.editskin")</a> +* [$msg.get("xe.admin.skin.testskin")>Main.WebHome?skin=${doc.fullName}] Index: src/main/resources/XWiki/AccountValidation.xml =================================================================== --- src/main/resources/XWiki/AccountValidation.xml (revision 16224) +++ src/main/resources/XWiki/AccountValidation.xml (working copy) @@ -7,14 +7,14 @@ en 0 XWiki.WebHome -xwiki:XWiki.Admin -xwiki:XWiki.Admin +XWiki.Admin +XWiki.Admin -xwiki:XWiki.Admin +XWiki.Admin 1219859029000 1219860006000 1219860006000 -4.1 +1.1 @@ -57,10 +57,10 @@ #if("$!{request.validkey}" != "" && "$!{request.xwikiname}" != "") #if($xwiki.validateUser(true) == 0) - #set($loginURL = $xwiki.getURL('XWiki.XWikiLogin', 'login')) - #info("Your account has been activated. You can now <a href='${loginURL}'>login</a>.") + #set($loginURL = $xwiki.getURL('XWiki.XWikiLogin', 'login')) + #info($msg.get("xe.admin.accountvalidation.success", [${loginURL}])) #else - #warning("There was a problem validating your account. Please contact an administrator.") + #warning($msg.get("xe.admin.accountvalidation.failure")) #end #else $response.sendRedirect($xwiki.getURL("Main.WebHome")) Index: src/main/resources/XWiki/ResetPassword.xml =================================================================== --- src/main/resources/XWiki/ResetPassword.xml (revision 16224) +++ src/main/resources/XWiki/ResetPassword.xml (working copy) @@ -14,7 +14,7 @@ 1219710939000 1228221475000 1228221475000 -2.1 +1.1 Reset password (step 1) @@ -308,12 +308,12 @@ #set($verifClass = "XWiki.ResetPasswordRequestClass") #set($userName = "$!request.get('u')") #if($userName == '') ## First step, display the form requesting the username - 1 Forgot your password? + 1 $msg.get("xe.admin.passwordreset.forgotpassword") - Please enter your username to start the password recovery process. + $msg.get("xe.admin.passwordreset.startprocess") <form method="post" action=""> - <div>Username: <input type="text" name="u"/> <input type="submit" value="Reset password"/></div> + <div> $msg.get("xe.admin.passwordreset.username") <input type="text" name="u"/> <input type="submit" value="$msg.get("xe.admin.passwordreset.resetpassword")"/></div> </form> #else ## Second step, generate the verification string, store it, and send the email ## TODO: Once the usernames are not bound to the XWiki space, revisit this code @@ -326,13 +326,13 @@ #set($userObj = "") #set($userObj = $userDoc.getObject('XWiki.XWikiUsers')) #if("$!userObj" == "") - #warning("The user ~~$userName~~ does not exist.") + #warning($msg.get("xe.admin.passwordreset.nouser", [$userName])) #elseif ($userDoc.getObject('XWiki.LDAPProfileClass')) - #warning("The user ~~$userName~~ is an LDAP user. In that case the password has to be changed on LDAP server.") + #warning($msg.get("xe.admin.passwordreset.ldapuser", [$userName])) #else #set($userEmail = $userObj.getProperty("email").value) #if("$!userEmail" == "") - #error("Cannot reset password: email address not provided in the user profile.") + #error($msg.get("xe.admin.passwordreset.cannotreset")) #else ## Find the object that will hold the verification string #set($verifObj = "") @@ -350,14 +350,14 @@ ## Send an email; the variables will be retrieved from the velocity context #set($mailResult = $xwiki.mailsender.sendMessageFromTemplate($xwiki.getXWikiPreference('admin_email', 'no-reply@xwiki.org'), $userEmail, $util.null, $util.null, $context.language, "XWiki.ResetPasswordMailContent", $context.vcontext)) #if($mailResult == 0) - #info("An e-mail was sent to <tt>${userEmail}</tt>. Please follow the instructions in that e-mail to complete the password reset procedure.") + #info($msg.get("xe.admin.passwordreset.emailsent", [$userEmail])) #else - #error("An unknown problem occured while sending the reset email.") + #error($msg.get("xe.admin.passwordreset.reseterror")) #end #end #end - <a href="$doc.getURL()">&laquo; Retry</a> | - <a href="$xwiki.getURL("XWiki.XWikiLogin", "login", "")">Login &raquo;</a> + <a href="$doc.getURL()">&laquo; $msg.get("xe.admin.passwordreset.retry")</a> | + <a href="$xwiki.getURL("XWiki.XWikiLogin", "login", "")">$msg.get("xe.admin.passwordreset.login") &raquo;</a> #end ## Clear private variables, so that they cannot be accessed from the rest of the page (comments, panels...) #set($verifStr = "") @@ -365,6 +365,6 @@ ## ## #else ## No programming rights, warn and exit - #error("This page requires programming rights to work, which currently isn't true. Please notify an administrator of this problem and try again later.") + #error($msg.get("xe.admin.passwordreset.noprogrammingrights")) #end Index: src/main/resources/XWiki/XWikiUsers.xml =================================================================== --- src/main/resources/XWiki/XWikiUsers.xml (revision 16224) +++ src/main/resources/XWiki/XWikiUsers.xml (working copy) @@ -14,7 +14,7 @@ 1106311618000 1184172413000 1184172413000 -1.14 +1.1 @@ -261,18 +261,18 @@ -1 Users +1 $msg.get("xe.admin.users") -* <a href="$xwiki.getURL("XWiki.Register","register")">Register a user</a> +* <a href="$xwiki.getURL("XWiki.Register","register")">$msg.get("xe.admin.users.registernew")</a> -1 Current Users +1 $msg.get("xe.admin.users.existing") #set ($sql = ", BaseObject as obj where obj.name=doc.fullName and obj.className='XWiki.XWikiUsers'") #foreach ($item in $xwiki.searchDocuments($sql)) * [$item] #end -1 Admin +1 $msg.get("xe.admin.users.administration") * [XWikiUserTemplate] * [XWikiUserSheet] Index: src/main/resources/XWiki/AdminFieldsDisplaySheet.xml =================================================================== --- src/main/resources/XWiki/AdminFieldsDisplaySheet.xml (revision 16224) +++ src/main/resources/XWiki/AdminFieldsDisplaySheet.xml (working copy) @@ -14,7 +14,7 @@ 1211800243000 1214047604000 1214047604000 -10.1 +1.1 AdminFieldsDisplaySheet Index: src/main/resources/XWiki/AdminRightsSheet.xml =================================================================== --- src/main/resources/XWiki/AdminRightsSheet.xml (revision 16224) +++ src/main/resources/XWiki/AdminRightsSheet.xml (working copy) @@ -14,7 +14,7 @@ 1211801338000 1213904460000 1213904460000 -3.1 +1.1 AdminRightsSheet Index: src/main/resources/XWiki/XWikiUserSheet.xml =================================================================== --- src/main/resources/XWiki/XWikiUserSheet.xml (revision 16224) +++ src/main/resources/XWiki/XWikiUserSheet.xml (working copy) @@ -14,7 +14,7 @@ 1106308018000 1228221302000 1228221302000 -3.1 +1.1 @@ -58,8 +58,8 @@ #set($obj = $doc.getObject("XWiki.XWikiUsers")) #if(!$obj) - 1 User Sheet - This stylesheet must be applied on a document containing a XWiki.XWikiUsers object. + 1 $msg.get("xe.admin.users.sheet") + $msg.get("xe.admin.users.applyonusers") #else #if($context.action=="view") @@ -113,7 +113,7 @@ #end #end #end - ## Please do not insert extra empty lines here (as it the validity of the rendered xhtml) + ## Please do not insert extra empty lines here (as it affects the validity of the rendered xhtml) <dl id="xwikiuserprofile"> <dt class="label"><label>$msg.get("platform.core.profile.firstname"):</label></dt> <dd#if($context.action=="view") class="given-name"#end>$doc.display("first_name", $obj)</dd> Index: src/main/resources/XWiki/AdminGroupsSheet.xml =================================================================== --- src/main/resources/XWiki/AdminGroupsSheet.xml (revision 16224) +++ src/main/resources/XWiki/AdminGroupsSheet.xml (working copy) @@ -14,7 +14,7 @@ 1211800831000 1214048145000 1214048145000 -5.1 +1.1 AdminGroupsSheet @@ -84,8 +84,8 @@ #set($mainwk = true) #end <div id="xwikieditcontent"> - <div id="ajax-loader">Loading...<br /> - <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..." title="Loading..." /> + <div id="ajax-loader">$msg.get("xe.admin.groups.loading")<br /> + <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="$msg.get("xe.admin.groups.loading")" title="$msg.get("xe.admin.groups.loading")" /> </div> <table id="groupstable" class="livetable"> <tr><td colspan="3" id="showLimits"></td></tr> @@ -93,7 +93,7 @@ <table class="display" cellpadding="3"> <thead class="theader"> <tr> - <td>Group Name</td><td>Members</td><td>Manage</td> + <td>$msg.get("xe.admin.groups.groupname")</td><td>$msg.get("xe.admin.groups.members")</td><td>$msg.get("xe.admin.groups.manage")</td> </tr> <tr id="table-filters"> <td><input name="name" type="text" class="filter"/></td> @@ -101,9 +101,9 @@ <td> #if(!$mainwk) <select name="wiki" class="filter"> - <option value="local" selected="selected">Local</option> - <option value="global">Global</option> - <option value="both">Both</option> + <option value="local" selected="selected">$msg.get("xe.admin.groups.local")</option> + <option value="global">$msg.get("xe.admin.groups.global")</option> + <option value="both">$msg.get("xe.admin.groups.both")</option> </select> #else <input type="hidden" value="local" name="wiki" /> Index: src/main/resources/XWiki/AdminSheet.xml =================================================================== --- src/main/resources/XWiki/AdminSheet.xml (revision 16224) +++ src/main/resources/XWiki/AdminSheet.xml (working copy) @@ -14,7 +14,7 @@ 1211801518000 1215022379000 1215022379000 -4.1 +1.1 AdminSheet Index: src/main/resources/XWiki/XWikiGroupSheet.xml =================================================================== --- src/main/resources/XWiki/XWikiGroupSheet.xml (revision 16224) +++ src/main/resources/XWiki/XWikiGroupSheet.xml (working copy) @@ -7,6 +7,8 @@ en 0 XWiki.XWikiGroups +XWiki.Admin +XWiki.Admin @@ -55,7 +57,7 @@ $xwiki.jsfx.use("js/xwiki/table/livetable.js", true) $xwiki.ssfx.use("js/xwiki/table/livetable.css", true) <div id="ajax-loader">$msg.get("ui.ajaxTable.loading")<br /> - <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..." title="Loading..." /> + <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="$msg.get("xe.admin.groups.loading")" title="$msg.get("xe.admin.groups.loading")" /> </div> <div id="showLimits"></div> <table id="memberstable" cellspacing="0"> @@ -206,14 +208,14 @@ #warning($msg.get("userdeletioncannotbecanceled")) #set($redirect = $xwiki.getRequestURL()) {table} -<span class="floatleft">Members</span> <a id="adduser" href="$doc.getURL("objectadd","classname=XWiki.XWikiGroups&amp;xredirect=$redirect")" title="$msg.get("addusertogroup")"><span class="hidden">($msg.get("add"))</span></a> | +<span class="floatleft">$msg.get("xe.admin.groups.members")</span> <a id="adduser" href="$doc.getURL("objectadd","classname=XWiki.XWikiGroups&amp;xredirect=$redirect")" title="$msg.get("addusertogroup")"><span class="hidden">($msg.get("add"))</span></a> | #foreach($obj in $objects) $doc.display("member", $obj) | <a class="deletelink" href="$doc.getURL("objectremove", "classname=XWiki.XWikiGroups&amp;classid=${obj.number}&amp;xredirect=${doc.getURL('inline')}")" title="$msg.get("removethisuserfromgroup")">$msg.get("delete")</a> #end ##foreach {table} #else ## inline {table} -<span class="floatleft">Members</span> #if($hasedit)<a id="modifygroup" href="$doc.getURL("inline")"><span class="hidden">($msg.get("edit"))</span></a> +<span class="floatleft">$msg.get("xe.admin.groups.members")</span> #if($hasedit)<a id="modifygroup" href="$doc.getURL("inline")"><span class="hidden">($msg.get("edit"))</span></a> #else #end #foreach($obj in $objects) Index: src/main/resources/XWiki/ResetPasswordComplete.xml =================================================================== --- src/main/resources/XWiki/ResetPasswordComplete.xml (revision 16224) +++ src/main/resources/XWiki/ResetPasswordComplete.xml (working copy) @@ -314,23 +314,23 @@ * @param v The validation string, which will be checked again upon receiving the form. *# #macro(displayForm $message $userName $validationString) - 1 Reset password for ~~${xwiki.getUserName($userName)}~~ + 1 $msg.get("xe.admin.passwordreset.resetfor", [${xwiki.getUserName($userName)}]) #if($message != "") #warning($message) #end - <form action="$doc.getURL()" method="post" onsubmit="if($('password').value == '') {alert('The password cannot be an empty string.'); return false;} else if($('password').value != $('password2').value) {alert('The two passwords do not match.'); return false; }"> + <form action="$doc.getURL()" method="post" onsubmit="if($('password').value == '') {alert('$msg.get("xe.admin.passwordreset.emptystring")'); return false;} else if($('password').value != $('password2').value) {alert('$msg.get("xe.admin.passwordreset.nomatch")'); return false; }"> <div class="hidden"> <input type="hidden" name="u" value="$userName"/> <input type="hidden" name="v" value="$validationString"/> </div> <dl> - <dt><label for="p">New password:</label></dt> + <dt><label for="p">$msg.get("xe.admin.passwordreset.newpassword")</label></dt> <dd><input id="p" type="password" name="p" value="" size="20"/></dd> - <dt><label for="p2">Re-enter new password:</label></dt> + <dt><label for="p2">$msg.get("xe.admin.passwordreset.reenterpassword")</label></dt> <dd><input id="p2" type="password" value="" name="p2" size="20"/></dd> </dl> <div> - <input type="submit" value="Save" class="button"/> + <input type="submit" value="$msg.get("xe.admin.passwordreset.save")" class="button"/> </div> </form> #end @@ -347,14 +347,14 @@ #set($vuserDoc = $xwiki.getDocument($userName)) #if($request.getParameterMap().containsKey("p")) ## Second step, set the user password #if($password == "") - #displayForm("The password cannot be empty." $userName $validationString) + #displayForm($msg.get("xe.admin.passwordreset.notempty") $userName $validationString) #elseif($password != $password2) - #displayForm("The two passwords do not match." $userName $validationString) + #displayForm($msg.get("xe.admin.passwordreset.nomatch") $userName $validationString) #else $vuserDoc.getObject("XWiki.XWikiUsers").set("password", $password) #set($discard = $vuserDoc.removeObjects($verifClass)) $vuserDoc.saveWithProgrammingRights() - #info("The password has been successfully set. Please <a href='$xwiki.getURL('XWiki.XWikiLogin', 'login')'>login</a> to continue.") + #info("$msg.get('xe.admin.passwordreset.success') <a href='$xwiki.getURL('XWiki.XWikiLogin', 'login')'>$msg.get('xe.admin.passwordreset.loginsmall')</a> $msg.get('xe.admin.passwordreset.successend')") #end #else ## First step, request the user password ## The user might not complete this step, and leave the URL in the (public) browser's @@ -366,7 +366,8 @@ #displayForm("" $userName $validationString) #end #else - #error("Wrong parameters. [Back to the password reset page &#187;>ResetPassword]") + #set($backToResetLink = " [$msg.get('xe.admin.passwordreset.backtoreset') &#187;>ResetPassword]") + #error("$msg.get('xe.admin.passwordreset.wrongparameters') ${backToResetLink}") #end ## ## Clear private variables, so that they cannot be accessed from the rest of the page (comments, panels...) @@ -376,6 +377,6 @@ ## ## #else ## No programming rights, warn and exit - #error("This page requires programming rights to work, which currently isn't true. Please notify an administrator of this problem and try again later.") + #error($msg.get("xe.admin.passwordreset.noprogrammingrights")) #end Index: src/main/resources/XWiki/XWikiGroups.xml =================================================================== --- src/main/resources/XWiki/XWikiGroups.xml (revision 16224) +++ src/main/resources/XWiki/XWikiGroups.xml (working copy) @@ -14,7 +14,7 @@ 1106311618000 1177088856000 1177088856000 -1.9 +1.0 Groups @@ -73,22 +73,22 @@ #if($request.create) $response.sendRedirect($xwiki.getURL("XWiki.${request.getParameter('name')}", "inline", "parent=XWiki.XWikiGroups&template=XWiki.XWikiGroupTemplate")) #else -1 Create a new group: +1 $msg.get("xe.admin.groups.create") <form action="$doc.getURL("view", "create=1&amp;xpage=plain")" method="post"> <div> <input type="text" name="name" value="" /> -<input type="submit" value="Create Group" /> +<input type="submit" value="$msg.get("xe.admin.groups.creategroup")" /> </div> </form> -1 Current XWiki Groups +1 $msg.get("xe.admin.groups.currentgroups") #set ($sql = ", BaseObject as obj where obj.name=doc.fullName and obj.className='XWiki.XWikiGroups'") #foreach ($item in $xwiki.searchDocuments($sql)) * [$item] #end -1 Admin +1 $msg.get("xe.admin.groups.administration") * [XWikiGroupTemplate] * [XWikiGroupSheet] Index: src/main/resources/XWiki/XWikiUserTemplate.xml =================================================================== --- src/main/resources/XWiki/XWikiUserTemplate.xml (revision 16224) +++ src/main/resources/XWiki/XWikiUserTemplate.xml (working copy) @@ -14,7 +14,7 @@ 1106311618000 1166177442000 1169801142000 -1.8 +1.1 Index: src/main/resources/XWiki/XWikiGroupTemplate.xml =================================================================== --- src/main/resources/XWiki/XWikiGroupTemplate.xml (revision 16224) +++ src/main/resources/XWiki/XWikiGroupTemplate.xml (working copy) @@ -14,7 +14,7 @@ 1107115982000 1194436282000 1194436282000 -1.3 +1.1 Index: src/main/resources/XWiki/ForgotUsername.xml =================================================================== --- src/main/resources/XWiki/ForgotUsername.xml (revision 16224) +++ src/main/resources/XWiki/ForgotUsername.xml (working copy) @@ -249,29 +249,29 @@ #set($email = "$!request.get('e')") #if($email == '') -1 Forgot your username? +1 $msg.get("xe.admin.passwordreset.forgotusername") -Please enter the email address you provided when creating your account. +$msg.get("xe.admin.passwordreset.enteremail") <form method="post" action=""> - <div>Email: <input type="text" name="e"/> <input type="submit" value="Retrieve username"/></div> + <div>$msg.get("xe.admin.passwordreset.email")<input type="text" name="e"/> <input type="submit" value="$msg.get("xe.admin.passwordreset.retrieve")"/></div> </form> #else #set($results = $xwiki.searchDocuments(", BaseObject obj, StringProperty prop where obj.name = doc.fullName and obj.className = 'XWiki.XWikiUsers' and prop.id.id = obj.id and prop.id.name = 'email' and prop.value = '$email'")) #if($results.size() == 0) - No account is registered using this email address. + $msg.get("xe.admin.passwordreset.noaccountregistered") - [&laquo; Try a different email address>$doc.fullName] | <a href="$xwiki.getURL("XWiki.XWikiLogin", "login", "")">Login &raquo;</a> + [&laquo; $msg.get("xe.admin.passwordreset.differentaddress")>$doc.fullName] | <a href="$xwiki.getURL("XWiki.XWikiLogin", "login", "")">$msg.get("xe.admin.passwordreset.login") &raquo;</a> #elseif($results.size() == 1) - Your username is: *${xwiki.getDocument($results.get(0)).name}* + $msg.get("xe.admin.passwordreset.usernameis") *${xwiki.getDocument($results.get(0)).name}* - <a href="$xwiki.getURL("XWiki.XWikiLogin", "login", "")">Login &raquo;</a> + <a href="$xwiki.getURL("XWiki.XWikiLogin", "login", "")">$msg.get("xe.admin.passwordreset.login") &raquo;</a> #else - The following usernames are registered with this email address: + $msg.get("xe.admin.passwordreset.multipleusernames") #foreach($item in $results) * *${xwiki.getDocument($item).name}* #end - <a href="$xwiki.getURL("XWiki.XWikiLogin", "login", "")">Login &raquo;</a> + <a href="$xwiki.getURL("XWiki.XWikiLogin", "login", "")">$msg.get("xe.admin.passwordreset.login") &raquo;</a> #end #end \ No newline at end of file Index: src/main/resources/XWiki/Admin.xml =================================================================== --- src/main/resources/XWiki/Admin.xml (revision 16224) +++ src/main/resources/XWiki/Admin.xml (working copy) @@ -14,7 +14,7 @@ 1108467450000 1166183159000 1169801141000 -1.13 +1.1 Index: src/main/resources/XWiki/AdminUsersSheet.xml =================================================================== --- src/main/resources/XWiki/AdminUsersSheet.xml (revision 16224) +++ src/main/resources/XWiki/AdminUsersSheet.xml (working copy) @@ -14,7 +14,7 @@ 1211801430000 1214048039000 1214048039000 -5.1 +1.1 AdminUsersSheet @@ -84,8 +84,8 @@ #set($mainwk = true) #end <div id="xwikieditcontent"> - <div id="ajax-loader">Loading...<br /> - <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="Loading..." title="Loading..." /> + <div id="ajax-loader">$msg.get("xe.admin.users.loading")<br /> + <img src="$xwiki.getSkinFile('icons/ajax-loader.gif')" alt="$msg.get("xe.admin.users.loading")" title="$msg.get("xe.admin.users.loading")" /> </div> <table id="userstable" class="livetable"> <tr><td colspan="3" id="showLimits"></td></tr> Index: src/main/resources/XWiki/AdminPresentationSheet.xml =================================================================== --- src/main/resources/XWiki/AdminPresentationSheet.xml (revision 16224) +++ src/main/resources/XWiki/AdminPresentationSheet.xml (working copy) @@ -14,7 +14,7 @@ 1211800290000 1214047286000 1214047286000 -7.1 +1.1 AdminPresentationSheet