Index: src/main/resources/XWiki/OfficeImporter.xml =================================================================== --- src/main/resources/XWiki/OfficeImporter.xml (revision 16224) +++ src/main/resources/XWiki/OfficeImporter.xml (working copy) @@ -57,16 +57,16 @@ #if($isguest) - #error("Guests are not allowed to view the contents of this page.") + #error($msg.get("xe.officeimport.results.notallowed")) #else - 1 Office Importer + 1 $msg.get("xe.officeimport.results.title") <form action='$xwiki.getURL("XWiki.OfficeImporterResults","view")' enctype="multipart/form-data" method="post"> - {table}<p>Document</p>|<p><input id="filepath" type="file" name="filePath" value="" size="40"/></p> - <p>Target Space</p>|<p><input name="targetSpace" type="text"/></p> - <p>Target Page</p>|<p><input name="targetPage" type="text"/></p> - <p>Options</p>|<p>Style Filtering :</p><p><input name="filterStyles" type="radio" value="strict"/>Strict (No styles, content only)<br/><input name="filterStyles" type="radio" value="moderate" checked="checked"/>Moderate (Keep alignments)<br/><input name="filterStyles" type="radio" value="none"/>None (Keep all styles)</p> + {table}<p>$msg.get("xe.officeimport.import.document")</p>|<p><input id="filepath" type="file" name="filePath" value="" size="40"/></p> + <p>$msg.get("xe.officeimport.import.targetspace")</p>|<p><input name="targetSpace" type="text"/></p> + <p>$msg.get("xe.officeimport.import.targetpage")</p>|<p><input name="targetPage" type="text"/></p> + <p>$msg.get("xe.officeimport.import.options")</p>|<p>$msg.get("xe.officeimport.import.filtering")</p><p><input name="filterStyles" type="radio" value="strict"/>$msg.get("xe.officeimport.import.strict")Strict (No styles, content only)<br/><input name="filterStyles" type="radio" value="moderate" checked="checked"/>$msg.get("xe.officeimport.import.moderate")<br/><input name="filterStyles" type="radio" value="none"/>$msg.get("xe.officeimport.import.none")</p> {table} - <p><input type="submit" value="Import"/></p> + <p><input type="submit" value="$msg.get("xe.officeimport.import.import")"/></p> </form> #end Index: src/main/resources/XWiki/OfficeImporterResults.xml =================================================================== --- src/main/resources/XWiki/OfficeImporterResults.xml (revision 16224) +++ src/main/resources/XWiki/OfficeImporterResults.xml (working copy) @@ -14,7 +14,7 @@ 1217261425000 1219045325000 1219045325000 -7.1 +1.1 Office Importer Results @@ -57,27 +57,30 @@ #if($isguest) - #error("Guests are not allowed to view the contents of this page.") + #error($msg.get("xe.officeimport.results.notallowed")) #else - 1 Office Importer + 1 $msg.get("xe.officeimport.results.title") ## Validate fileName #set($fileUpload=$xwiki.fileupload) #set($fileName=$fileUpload.getFileName("filePath")) #if(!$fileName || $fileName=="") - #error("Missing input file. Please [go back>XWiki.OfficeImporter] and correct it.") + #set($goBack = "[$msg.get("xe.officeimport.results.goback")>XWiki.OfficeImporter]") + #error($msg.get("xe.officeimport.results.missingfile", [$goBack])) #end ## Validate targetSpace #if(!$request.targetSpace || $request.targetSpace=="") - #error("Missing target space name. Please [go back>XWiki.OfficeImporter] and correct it.") + #set($goBack = "[$msg.get("xe.officeimport.results.goback")>XWiki.OfficeImporter]") + #error($msg.get("xe.officeimport.results.missingspace", [$goBack])) #else #set($targetSpace=$request.targetSpace) #end ## Validate targetPage #if(!$request.targetPage || $request.targetPage=="") - #error("Missing target page name. Please [go back>XWiki.OfficeImporter] and correct it.") + #set($goBack = "[$msg.get("xe.officeimport.results.goback")>XWiki.OfficeImporter]") + #error($msg.get("xe.officeimport.results.missingpage", [$goBack])) #else #set($targetPage=$request.targetPage) #end @@ -89,7 +92,9 @@ #set($targetDocument="${targetSpace}.${targetPage}") #set($result=$officeimporter.importDocument($fileContent, $fileName, $targetDocument, $options)) #if($result) - #info("Conversion succeeded. You can view the *[result>$targetSpace.$targetPage]*, or you can [go back>XWiki.OfficeImporter] to convert another document.") + #set($goBack = "[$msg.get("xe.officeimport.results.goback")>XWiki.OfficeImporter]") + #set($resultDocument = "*[$msg.get("xe.officeimport.results.result")>$targetSpace.$targetPage]*") + #info($msg.get("xe.officeimport.results.success", [$resultDocument, $goBack])) #else #error($officeimporter.getMessage()) #end