Index: src/main/resources/Blog/Unpublished.xml =================================================================== --- src/main/resources/Blog/Unpublished.xml (revision 16224) +++ src/main/resources/Blog/Unpublished.xml (working copy) @@ -25,7 +25,7 @@ false #includeMacros("Blog.BlogCode") -1 Unpublished articles +1 $msg.get("xe.blog.unpublished.entries") #getBlogEntriesBaseQuery($query) #getUnpublishedBlogEntries($xwiki.getDocument('Blog.WebHome') $query $entries) Index: src/main/resources/Blog/Migration.xml =================================================================== --- src/main/resources/Blog/Migration.xml (revision 16224) +++ src/main/resources/Blog/Migration.xml (working copy) @@ -39,18 +39,18 @@ $!entryObj.set('hidden', 0) #set($discard = $articleDoc.removeObjects('XWiki.ArticleClass')) $articleDoc.setContent($newContent) - $!articleDoc.save("Migrated old blog article to the new blog application", true) - * Updated [$entryObj.title>$article] (in space [$articleDoc.space>${articleDoc.space}.WebHome]) + $!articleDoc.save($msg.get("xe.blog.migration.migrated"), true) + * $msg.get("xe.blog.migration.updated") [$entryObj.title>$article] ($msg.get("xe.blog.migration.inspace") [$articleDoc.space>${articleDoc.space}.WebHome]) #else - * Skipping protected document [$article] + * $msg.get("xe.blog.migration.skipping") [$article] #end #end - Done. [Back to the blog>Blog.WebHome] + $msg.get("xe.blog.migration.done") [$msg.get("xe.blog.migration.backtoblog")>Blog.WebHome] #else - Please confirm that you want to migrate old articles to the new blog application: + $msg.get("xe.blog.migration.pleaseconfirm") <form action="$doc.getURL()" method="post"> - <div><input type="submit" name="migrate" value="Confirm"/></div> + <div><input type="submit" name="migrate" value="$msg.get("xe.blog.migration.confirm")"/></div> </form> - [Back to the blog>Blog.WebHome] + [$msg.get("xe.blog.migration.backtoblog")>Blog.WebHome] #end Index: src/main/resources/Blog/ArchivePanel.xml =================================================================== --- src/main/resources/Blog/ArchivePanel.xml (revision 16224) +++ src/main/resources/Blog/ArchivePanel.xml (working copy) @@ -145,7 +145,7 @@ #end #end #else - #info("No articles yet...") + #info($msg.get("xe.blog.archive.noarticle")) #end #panelfooter() #end Index: src/main/resources/Blog/CreatePost.xml =================================================================== --- src/main/resources/Blog/CreatePost.xml (revision 16224) +++ src/main/resources/Blog/CreatePost.xml (working copy) @@ -36,12 +36,12 @@ #if($space == '') #set($space = $doc.space) #end - 1.1 Create a new post + 1.1 $msg.get("xe.blog.post.createpost") <form action="${xwiki.getURL('Blog.CreatePost')}" id="newBlogPost" method="post"> <div> <input type="hidden" name="entrySpace" value="$space"/> - <input type="text" name="entryTitle" value="Post title"/> - <input type="submit" value="Create"/> + <input type="text" name="entryTitle" value="$msg.get("xe.blog.post.title")"/> + <input type="submit" value="$msg.get("xe.blog.post.create")"/> </div> </form> #else Index: src/main/resources/Blog/WebHome.xml =================================================================== --- src/main/resources/Blog/WebHome.xml (revision 16224) +++ src/main/resources/Blog/WebHome.xml (working copy) @@ -135,7 +135,7 @@ 10 -The Wiki blog +Blog #includeForm("Blog.BlogSheet") Index: src/main/resources/Blog/BlogCode.xml =================================================================== --- src/main/resources/Blog/BlogCode.xml (revision 16224) +++ src/main/resources/Blog/BlogCode.xml (working copy) @@ -76,10 +76,10 @@ $blogDoc.display('description') #end #elseif($doc.fullName == $blogSheet) - 1 Blog sheet - This sheet should be used to display blog documents. + 1 $msg.get("xe.blog.code.blogsheet") + $msg.get("xe.blog.code.sheetexplanation") #else - #warning('This is not a blog document!') + #warning($msg.get("xe.blog.code.notblog")) #end #end ## @@ -444,9 +444,9 @@ #displayEntryTitle($entryDoc $entryObj) #if($doc.fullName == $entryDoc.fullName) #if(!$isPublished) - #warning('This blog post is not published yet.') + #warning($msg.get("xe.blog.code.published")) #elseif($isHidden) - #warning('This blog post is hidden.') + #warning($msg.get("xe.blog.code.hidden")) #end #end #displayEntryContent($entryDoc $entryObj $onlyExtract) @@ -513,7 +513,7 @@ #macro(displayPublishButton $entryDoc $entryObj) #isPublished($entryObj $isPublished) #if(!$isPublished && $entryDoc.creator == $context.user && $xwiki.hasAccessLevel("edit", $context.user, $entryDoc.fullName)) - <a href="$blogPublisher.getURL('view', "entryName=${util.encodeURI($entryDoc.fullName)}&amp;xredirect=${util.encodeURI($thisURL)}")" title="This blog post is not published yet. Publish it">#toolImage('publish.png' 'publish ')</a>## + <a href="$blogPublisher.getURL('view', "entryName=${util.encodeURI($entryDoc.fullName)}&amp;xredirect=${util.encodeURI($thisURL)}")" title="$msg.get("xe.blog.code.notpublished")">#toolImage('publish.png' 'publish ')</a>## #end #end ## @@ -531,9 +531,9 @@ ## Only published articles can be hidden. Unpublished articles are considered already hidden. #if($isPublished && $entryDoc.creator == $context.user && $xwiki.hasAccessLevel('edit', $context.user, $entryDoc.fullName)) #if ($isHidden) - <a class="blog-tool-show" href="$entryDoc.getURL('save', "${entryObj.getxWikiClass().getName()}_${entryObj.number}_hidden=0&amp;comment=Made%20entry%20visible&amp;xredirect=${util.encodeURI($thisURL)}")" title="This blog post is not visible to other users. Make it visible">#toolImage('show.png', 'show ')</a>## + <a class="blog-tool-show" href="$entryDoc.getURL('save', "${entryObj.getxWikiClass().getName()}_${entryObj.number}_hidden=0&amp;comment=$msg.get('xe.blog.code.madevisible')&amp;xredirect=${util.encodeURI($thisURL)}")" title="$msg.get("xe.blog.code.makevisible")">#toolImage('show.png', 'show ')</a>## #else - <a class="blog-tool-hide" href="$entryDoc.getURL('save', "${entryObj.getxWikiClass().getName()}_${entryObj.number}_hidden=1&amp;comment=Hidden%20entry&amp;xredirect=${util.encodeURI($thisURL)}")" title="Hide this blog post from other users">#toolImage('hide.png' 'hide ')</a>## + <a class="blog-tool-hide" href="$entryDoc.getURL('save', "${entryObj.getxWikiClass().getName()}_${entryObj.number}_hidden=1&amp;comment=$msg.get('xe.blog.code.hid')&amp;xredirect=${util.encodeURI($thisURL)}")" title="$msg.get("xe.blog.code.hide")">#toolImage('hide.png' 'hide ')</a>## #end #end #end @@ -548,7 +548,7 @@ *### #macro(displayEditButton $entryDoc $entryObj) #if($xwiki.hasAccessLevel("edit", $context.user, $entryDoc.fullName)) - <a href="$entryDoc.getURL('inline')" title="Edit this blog post">#toolImage('edit.png' 'edit ')</a>## + <a href="$entryDoc.getURL('inline')" title="$msg.get("xe.blog.code.editpost")">#toolImage('edit.png' 'edit ')</a>## #end #end ## @@ -563,7 +563,7 @@ *### #macro(displayDeleteButton $entryDoc $entryObj) #if($xwiki.hasAccessLevel("delete", $context.user, $entryDoc.fullName)) - <a href="$entryDoc.getURL('delete')" title="Delete this blog post">#toolImage('delete.png' 'delete ')</a>## + <a href="$entryDoc.getURL('delete')" title="$msg.get("xe.blog.code.deletepost")">#toolImage('delete.png' 'delete ')</a>## #end #end ## @@ -629,7 +629,7 @@ * #end ## *### #else - #set($entryContent = "${entryContent} <a href='${entryDoc.getURL()}' title='Read the full entry'>...</a>") + #set($entryContent = "${entryContent} <a href='${entryDoc.getURL()}' title='$msg.get('xe.blog.code.readpost')'>...</a>") #end #end ## @@ -645,9 +645,9 @@ <div class="entry-footer"> #isPublished($entryObj $isPublished) #if($isPublished) - Posted by ## + $msg.get("xe.blog.code.postedby") ## #else - Created by ## + $msg.get("xe.blog.code.createdby") ## #end <address class="author vcard">#userfn($entryDoc.creator)</address> ## #getEntryDate($entryDoc $entryObj $entryDate) @@ -656,11 +656,11 @@ ## Since the publish date and update date are not set at the exact same time, there could be a small difference that ## we assume cannot be more than 3 seconds. #if($entryDoc.date.time - $entryDate.time > 3000) - | Modified by <address class="author vcard">#userfn($entryDoc.author)</address> ## + | $msg.get("xe.blog.code.modifiedby") <address class="author vcard">#userfn($entryDoc.author)</address> ## at <abbr class="updated" title="#formatdateISO($entryDoc.date)">$xwiki.formatDate($entryDoc.date, "MMM dd, yyyy HH:mm")</abbr> ## #end - | <a href="$entryDoc.getURL('view', '#Comments')">$entryDoc.comments.size() Comment(s)</a> ## - | <a href="$entryDoc.getURL('view')" rel="bookmark">Permalink</a> + | <a href="$entryDoc.getURL('view', '#Comments')">$entryDoc.comments.size() $msg.get("xe.blog.code.comments")</a> ## + | <a href="$entryDoc.getURL('view')" rel="bookmark">$msg.get("xe.blog.code.permalink")</a> </div> ## entry-footer #end ## @@ -681,7 +681,7 @@ #set($categoryDoc = $!xwiki.getDocument($category)) #if(!$categoryDoc.isNew() && $categoryDoc.getObject(${blogCategoryClassname})) #if($first) - in + $msg.get("xe.blog.code.in") #set($first = false) #else, #end## if first <a rel="tag" href="$xwiki.getURL(${category})">$!xwiki.getDocument($category).getObject($blogCategoryClassname).getProperty('name').value</a>## @@ -705,19 +705,19 @@ <div class="pagingLinks"> #getRequestedWeek($weekDate) $weekDate.addWeeks(-1)## - <span class="prevPage">*[&laquo; Previous week>$doc.name?year=$weekDate.weekyear&amp;week=$weekDate.weekOfWeekyear]*</span> + <span class="prevPage">*[&laquo; $msg.get("xe.blog.code.previousweek")>$doc.name?year=$weekDate.weekyear&amp;week=$weekDate.weekOfWeekyear]*</span> #sep() $weekDate.addWeeks(2)## 2 because we already subtracted 1 above - <span class=" nextPage">*[Next week &raquo;>$doc.name?year=$weekDate.weekyear&amp;week=$weekDate.weekOfWeekyear]*</span> + <span class=" nextPage">*[$msg.get("xe.blog.code.nextweek") &raquo;>$doc.name?year=$weekDate.weekyear&amp;week=$weekDate.weekOfWeekyear]*</span> </div> #elseif($displayType == 'monthly') <div class="pagingLinks"> #getRequestedMonth($monthDate) $monthDate.addMonths(-1)## - <span class="prevPage">*[&laquo; Previous month>$doc.name?year=$monthDate.year&amp;month=$monthDate.monthOfYear]*</span> + <span class="prevPage">*[&laquo; $msg.get("xe.blog.code.previousmonth")>$doc.name?year=$monthDate.year&amp;month=$monthDate.monthOfYear]*</span> #sep() $monthDate.addMonths(2)## 2 because we already subtracted 1 above - <span class=" nextPage">*[Next month &raquo;>$doc.name?year=$monthDate.year&amp;month=$monthDate.monthOfYear]*</span> + <span class=" nextPage">*[$msg.get("xe.blog.code.nextmonth") &raquo;>$doc.name?year=$monthDate.year&amp;month=$monthDate.monthOfYear]*</span> </div> #elseif($displayType == 'all') #else @@ -734,15 +734,15 @@ <div class="pagingLinks"> #if ($currentPageNumber < $totalPages) #set($currentPageNumber = $currentPageNumber + 1) - <span class="prevPage">*[&laquo; Older posts>$doc.name?page=${currentPageNumber}&amp;ipp=${itemsPerPage}$queryString]*</span> #set($currentPageNumber = $currentPageNumber - 1) + <span class="prevPage">*[&laquo; $msg.get("xe.blog.code.olderposts")>$doc.name?page=${currentPageNumber}&amp;ipp=${itemsPerPage}$queryString]*</span> #end #if ($currentPageNumber > 1) #if ($currentPageNumber < $totalPages) #sep() #end #set($currentPageNumber = $currentPageNumber - 1) - <span class="nextPage">*[Newer posts &raquo;>$doc.name?page=${currentPageNumber}&amp;ipp=${itemsPerPage}$queryString]*</span> + <span class="nextPage">*[$msg.get("xe.blog.code.newerposts") &raquo;>$doc.name?page=${currentPageNumber}&amp;ipp=${itemsPerPage}$queryString]*</span> #set($currentPageNumber = $currentPageNumber + 1) #end <span class="clear"></span> Index: src/main/resources/Blog/UnpublishedPanel.xml =================================================================== --- src/main/resources/Blog/UnpublishedPanel.xml (revision 16224) +++ src/main/resources/Blog/UnpublishedPanel.xml (working copy) @@ -105,17 +105,17 @@ #set($query = "$!{query} and isPublished.value = 0") #set($unpublishedEntries = $xwiki.searchDocuments("${query} order by publishDate.value desc", 5, 0)) #if($unpublishedEntries.size() > 0 || $showEmptyPanels) - #panelheader("Unpublished Posts") + #panelheader($msg.get("xe.blog.unpublished.entries")) #foreach($entryDoc in $xwiki.wrapDocs($unpublishedEntries)) #getEntryObject($entryDoc $entryObj) * [$!{entryDoc.display('title', 'view', $entryObj)}>$!{entryDoc.fullName}] #end - [View all ($xwiki.countDocuments($query))>Blog.Unpublished] + [$msg.get("xe.blog.unpublished.viewall") ($xwiki.countDocuments($query))>Blog.Unpublished] #panelfooter() #end -Shosw the most recent unpublished blog entries. +Shows the most recent unpublished blog entries. Blog.UnpublishedPanel Index: src/main/resources/Blog/Management.xml =================================================================== --- src/main/resources/Blog/Management.xml (revision 16224) +++ src/main/resources/Blog/Management.xml (working copy) @@ -31,7 +31,7 @@ ## TODO: Display the number of articles in each blog ## TODO: Provide some management links: delete, edit title, configure... ## -1 Existing blogs +1 $msg.get("xe.blog.manage.existing") #foreach($item in $xwiki.wrapDocs($xwiki.searchDocuments(", BaseObject obj where obj.name = doc.fullName and obj.className = '$blogClassname'"))) #getBlogTitle($item $title) @@ -45,13 +45,13 @@ ## ## New blog ## -1 Create a new blog +1 $msg.get("xe.blog.manage.createnew") #set($title = "$!request.blogTitle") #if($title != '') #set($space = "$!request.blogSpace") #if($space == '') - #warning('No space provided. Please enter a valid space where the blog should be created.') + #warning($msg.get("xe.blog.manage.nospace")) #else #if("$!request.blogType" == 'main') #set($blogDocName = "${space}.WebHome") @@ -68,17 +68,17 @@ <form action="${xwiki.getURL('Blog.Management')}" id="newBlog" method="post"> <div> <dl> - <dt><label for="blogSpace">Space:</label></dt> + <dt><label for="blogSpace">$msg.get("xe.blog.manage.space")</label></dt> <dd><input type="text" name="blogSpace" id="blogSpace" value=""/></dd> - <dt><label for="blogTitle">Title:</label></dt> - <dd><input type="text" name="blogTitle" id="blogTitle" value="Blog title"/></dd> - <dt><label for="blogType">Blog type:</label></dt> + <dt><label for="blogTitle">$msg.get("xe.blog.manage.title")</label></dt> + <dd><input type="text" name="blogTitle" id="blogTitle" value="$msg.get("xe.blog.manage.blogtitle")"/></dd> + <dt><label for="blogType">$msg.get("xe.blog.manage.blogtype")</label></dt> <dd><select name="blogType" id="blogType"> - <option value="inner" selected="selected">blog inside an existing space</option> - <option value="main">blog as the main content of a space</option> + <option value="inner" selected="selected">$msg.get("xe.blog.manage.inside")</option> + <option value="main">$msg.get("xe.blog.manage.main")</option> </select></dd> </dl> - <input type="submit" value="Create"/> + <input type="submit" value="$msg.get("xe.blog.manage.create")"/> </div> </form> #else ## !hasAdmin Index: src/main/resources/Blog/CategorySheet.xml =================================================================== --- src/main/resources/Blog/CategorySheet.xml (revision 16224) +++ src/main/resources/Blog/CategorySheet.xml (working copy) @@ -29,12 +29,12 @@ #info("$doc.display('description')") #if($context.action != "inline") -1.1.1 Subcategories +1.1.1 $msg.get("xe.blog.categories.subcategories") #if($hasEdit) <div style="float: right; width: 60%"> <div class="plainmessage"> <fieldset> - <legend>Add new subcategory</legend> + <legend>$msg.get("xe.blog.categories.addsubcategory")</legend> #set($parentCategory = $doc.fullName) #includeTopic("Blog.AddCategory") </fieldset> @@ -45,7 +45,7 @@ #displayCategoriesHierarchyRecursive($tree $doc.fullName 1 'simple') <div class="clearfloats"></div> -1.1.1 Articles from this category +1.1.1 $msg.get("xe.blog.categories.articles") #getEntriesForCategory($doc.fullName $entries $total) #displayBlog($entries 'category' true) ## displayNavigationLinks requires a blog document, to determine how should the entries be split into pages. Return this @@ -53,9 +53,9 @@ #displayNavigationLinks($doc) #end #elseif($doc.fullName == $blogCategorySheet) - 1 Category sheet - This sheet should be used to display blog categories. + 1 $msg.get("xe.blog.categories.sheet") + $msg.get("xe.blog.categories.sheetmessage") #else - #warning('This is not a blog category!') + #warning($msg.get("xe.blog.categories.notcategory")) #end Index: src/main/resources/Blog/CategoriesPanel.xml =================================================================== --- src/main/resources/Blog/CategoriesPanel.xml (revision 16224) +++ src/main/resources/Blog/CategoriesPanel.xml (working copy) @@ -104,7 +104,7 @@ #getCategoriesHierarchy('Blog' $tree) #displayCategoriesHierarchy($tree 'simple') #if($xwiki.hasAdminRights()) - <div style="font-size:75%;">(<a href="$xwiki.getURL('Blog.ManageCategories')">Edit Categories</a>)</div> + <div style="font-size:75%;">(<a href="$xwiki.getURL('Blog.ManageCategories')">$msg.get("xe.blog.categories.edit")</a>)</div> #end #panelfooter() Index: src/main/resources/Blog/ManageCategories.xml =================================================================== --- src/main/resources/Blog/ManageCategories.xml (revision 16224) +++ src/main/resources/Blog/ManageCategories.xml (working copy) @@ -26,9 +26,9 @@ #set($space = "$!request.space") #includeMacros("Blog.CategoriesCode") -1 Manage blog categories +1 $msg.get("xe.blog.categories.manage") -1.1 Existing categories +1.1 $msg.get("xe.blog.categories.existingcategories") #if ("$!request.action" == "delete") #foreach($item in $request.getParameterValues("${blogPostClassname}__category")) #deleteCategory($item) @@ -44,11 +44,11 @@ #getCategoriesHierarchy("" $tree) #displayCategoriesHierarchy($tree 'selectable') <input type="hidden" name="manage" value="true"/> - <input type="submit" name="delete" value="Delete selected categories"/> + <input type="submit" name="delete" value="$msg.get("xe.blog.categories.deleteselected")"/> </div> </form> -1.1 Add a category +1.1 $msg.get("xe.blog.categories.addcategory") #showCreateCategoryBox($tree) Index: src/main/resources/Blog/Archive.xml =================================================================== --- src/main/resources/Blog/Archive.xml (revision 16224) +++ src/main/resources/Blog/Archive.xml (working copy) @@ -64,14 +64,14 @@ #end #end #else - #info("No articles yet...") + #info($msg.get("xe.blog.archive.noarticle")) #end #end ## ## ## #macro(displayBlogYearArchive $blogDoc $year) - 1 Blog posts for $year + 1 $msg.get("xe.blog.archive.postsyear", [$year]) #getBlogEntriesBaseQuery($query) #set($query = "${query} and (doc.space = '${blogDoc.space}' or doc.parent = '${blogDoc.fullName}')") #set($query = "${query} and year(publishDate.value) = $year") @@ -89,13 +89,12 @@ #getEntryObject($entryDoc $entryObj) #isPublished($entryObj $isPublished) #isHidden($entryObj $isHidden) - * <a href="$entryDoc.getURL()">$entryDoc.display('title', 'view', $entryObj)</a>#if(!$isPublished) (unpublished)#elseif($isHidden) (hidden)#end - + * <a href="$entryDoc.getURL()">$entryDoc.display('title', 'view', $entryObj)</a>#if(!$isPublished) $msg.get("xe.blog.archive.unpublished")#elseif($isHidden) $msg.get("xe.blog.archive.hidden")#end #end #end #end #else - #info("No articles in this year...") + #info($msg.get("xe.blog.archive.noarticlesyear")) #end #end ## @@ -106,7 +105,7 @@ #set($tempDate = $xwiki.jodatime.mutableDateTime) $tempDate.setYear($util.parseInt($year))## $tempDate.setMonthOfYear($util.parseInt($month))## - 1 Blog posts for $dateFormatter.print($tempDate) + 1 $msg.get("xe.blog.archive.postsfor") $dateFormatter.print($tempDate) #getBlogEntriesBaseQuery($query) #set($query = "${query} and (doc.space = '${blogDoc.space}' or doc.parent = '${blogDoc.fullName}')") #set($query = "${query} and year(publishDate.value) = $year and month(publishDate.value) = $month") @@ -117,7 +116,7 @@ #displayEntry($entryDoc $entryObj true) #end #else - #info("No articles in this month...") + #info($msg.get("xe.blog.archive.noarticlesmonth")) #end #end ## Index: src/main/resources/Blog/Publisher.xml =================================================================== --- src/main/resources/Blog/Publisher.xml (revision 16224) +++ src/main/resources/Blog/Publisher.xml (working copy) @@ -39,7 +39,7 @@ #set($discard = $entryObj.set('published', 1)) ## Uncomment if you want to always set the publication date to the date when the post was actually published. ## #set($discard = $entryObj.set('publishDate', $util.date)) - $entryDoc.save('Published article') + $entryDoc.save($msg.get("xe.blog.publisher.published")) #end #end #end Index: src/main/resources/Blog/AddCategory.xml =================================================================== --- src/main/resources/Blog/AddCategory.xml (revision 16224) +++ src/main/resources/Blog/AddCategory.xml (working copy) @@ -39,10 +39,12 @@ #set($content = "${content}eForm('Blog.CategorySheet')") $newCategoryDoc.setContent($content) $newCategoryDoc.save() - #info("The category [$newCategoryDoc.name>$newCategoryDoc.fullName] has been created.") + #set($catLink = "[${newCategoryDoc.name}>${newCategoryDoc.fullName}]") + #info($msg.get("xe.blog.category.created", [$catLink])) #else $response.setStatus(409) - #warning("The category [$newCategoryDoc.name>$newCategoryDoc.fullName] already exists.") + #set($catLink = "[${newCategoryDoc.name}>${newCategoryDoc.fullName}]") + #warning($msg.get("xe.blog.category.exists", [$catLink])) #end #end <form action="" method="post"> @@ -51,10 +53,10 @@ <input type="hidden" name="space" value="$space"/> #end <dl> -<dt><label for="name">Name:</label></dt> +<dt><label for="name">$msg.get("xe.blog.categories.name")</label></dt> <dd><input type="text" name="name" id="name" style="width: 95%"/></dd> #if("$!parentCategory" == "") -<dt><label for="parent">Parent category:</label></dt> +<dt><label for="parent">$msg.get("xe.blog.categories.parentcategory")</label></dt> #set($sql = ", BaseObject obj where ") #if($space != "") #set($sql = "${sql}doc.space = '${space}' and ") @@ -69,10 +71,10 @@ #else <dt><input type="hidden" name="parent" value="$parentCategory"/></dt> #end -<dt><label for="description">Description:</label></dt> +<dt><label for="description">$msg.get("xe.blog.categories.description")</label></dt> <dd><textarea name="description" id="description" rows="2" cols="20" style="width: 95%"></textarea></dd> </dl> -<span class="buttonwrapper"><input type="submit" value="Add" class="button"/></span> +<span class="buttonwrapper"><input type="submit" value="$msg.get("xe.blog.categories.add")" class="button"/></span> </div> </form> Index: src/main/resources/Blog/CategoriesCode.xml =================================================================== --- src/main/resources/Blog/CategoriesCode.xml (revision 16224) +++ src/main/resources/Blog/CategoriesCode.xml (working copy) @@ -276,15 +276,15 @@ <form action="" method="post"> <div class='create-category'> <input type="hidden" name="action" value="create"/> - <label>New category: <input type="text" name="newCategoryName"></input></label> - <label>Parent: + <label>$msg.get("xe.blog.categories.new") <input type="text" name="newCategoryName"></input></label> + <label>$msg.get("xe.blog.categories.parent") <select name="newCategoryParent" id="blog_category_selectBox"> - <option value="${defaultCategoryParent}" selected="selected">None</option> + <option value="${defaultCategoryParent}" selected="selected">$msg.get("xe.blog.categories.none")</option> $!processedCategories.clear()## #displayCategoriesHierarchy($tree 'option') </select> </label> - <span class="buttonwrapper"><input class="button" type="button" value="Add" id="blog_AddCategoryButton"></input></span> + <span class="buttonwrapper"><input class="button" type="button" value="$msg.get("xe.blog.categories.add")" id="blog_AddCategoryButton"></input></span> </div> </form> #end @@ -324,7 +324,7 @@ #if($xwiki.hasAccessLevel('edit', $context.user, $item)) #set($blogEntryDoc = $xwiki.getDocument($item)) #set($discard = $blogEntryDoc.getObject(${blogPostClassname}).getProperty('category').value.remove($category)) - $blogEntryDoc.save('Remove deleted category') + $blogEntryDoc.save('$msg.get("xe.blog.categories.remove")') #end #end $categoryDoc.delete() Index: src/main/resources/Blog/BlogPostSheet.xml =================================================================== --- src/main/resources/Blog/BlogPostSheet.xml (revision 16224) +++ src/main/resources/Blog/BlogPostSheet.xml (working copy) @@ -27,7 +27,7 @@ #includeMacros("Blog.CategoriesCode") #getEntryObject($doc $entryObj) #if("$!entryObj" == '') - #warning("This is not a blog post!") + #warning($msg.get("xe.blog.sheet.notpost")) #elseif($context.action != 'inline') ## View mode #isPublished($entryObj $isPublished) @@ -36,13 +36,13 @@ #displayBlog([$doc.fullName] 'single' false) #else <dl> - <dt>Title:</dt> + <dt>$msg.get("xe.blog.sheet.title")</dt> <dd>$doc.display("title", "edit", $entryObj)</dd> - <dt>Content:</dt> + <dt>$msg.get("xe.blog.sheet.content")</dt> <dd>$doc.display("content", "edit", $entryObj)</dd> - <dt>Summary (optional):</dt> + <dt>$msg.get("xe.blog.sheet.summary")</dt> <dd>$doc.display("extract", "edit", $entryObj)</dd> - <dt>Category:</dt> + <dt>$msg.get("xe.blog.sheet.category")</dt> <dd> #getCategoriesHierarchy('' $tree) <div id="blog_category_container"> @@ -54,8 +54,10 @@ #isPublished($entryObj $isPublished) #if($isPublished) #if($doc.creator == $context.user) - #publishMessageBox("This article was published on ${doc.display('publishDate', 'view', $entryObj)}") - #hideMessageBox("Hide article $doc.display('hidden', 'edit', $entryObj)") + #set(${publicationDate} = ${doc.display('publishDate', 'view', $entryObj)}) + #publishMessageBox($msg.get("xe.blog.sheet.publicationdate", [${publicationDate}])) + #set($hideArticle = ${doc.display('hidden', 'edit', $entryObj)}) + #hideMessageBox($msg.get("xe.blog.sheet.hidearticle", [${hideArticle}])) #end #else #set($defaultDate = $xwiki.getDocument($blogPostTemplate).getObject($blogPostClassname).getProperty('publishDate').value.time) @@ -63,7 +65,7 @@ ## The publish date was not set, force it to be the creation date $entryObj.set('publishDate', $doc.creationDate) #end - #publishMessageBox("This article is not published yet. <label>*Publish ${doc.display('published', 'edit', $entryObj)}*</label>\\<label>Set the publication date to: ${doc.display('publishDate', 'edit', $entryObj)}</label>") + #publishMessageBox("$msg.get('xe.blog.sheet.notpublished') <label>*$msg.get('xe.blog.sheet.publish') ${doc.display('published', 'edit', $entryObj)}*</label>\\<label>$msg.get('xe.blog.sheet.setdate') ${doc.display('publishDate', 'edit', $entryObj)}</label>") #end #set($newtitle = $request.title) #if($newtitle)