[jboss-cvs] jboss-seam/examples/wiki/view ...
Christian Bauer
christian at hibernate.org
Fri Oct 12 12:31:25 EDT 2007
User: cbauer
Date: 07/10/12 12:31:24
Modified: examples/wiki/view
dirDisplay_m.xhtml docDisplay_d.xhtml
docEdit_m.xhtml search_d.xhtml dirDisplay_d.xhtml
userRegister_m.xhtml tagDisplay_m.xhtml
tagDisplay_d.xhtml adminHome_d.xhtml
dirEdit_m.xhtml userHome_d.xhtml userList_d.xhtml
dirEdit_d.xhtml fileEdit_d.xhtml docHistory_d.xhtml
message.xhtml docDisplay_m.xhtml docEdit_d.xhtml
search_m.xhtml adminHome_m.xhtml docHistory_m.xhtml
userRegister_d.xhtml userList_m.xhtml
fileEdit_m.xhtml userHome_m.xhtml
Log:
Internationalized almost all strings
Revision Changes Path
1.2 +37 -16 jboss-seam/examples/wiki/view/dirDisplay_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dirDisplay_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- dirDisplay_m.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ dirDisplay_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -8,29 +8,42 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
-<ui:define name="screenname">Directory: #{directoryHome.instance.name}</ui:define>
+<ui:define name="screenname">#{directoryHome.instance.name}</ui:define>
<ui:define name="control">
<s:fragment rendered="#{!empty directoryHome.parentDirectory}">
- <s:link id="createDir" styleClass="linkNavigation" accesskey="S" view="/dirEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">New <u>S</u>ubdirectory
+ <s:link id="createDir" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.CreateSubdirectory.accesskey']}"
+ view="/dirEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.CreateSubdirectory']}"/>
<f:param name="directoryId"/>
<f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
</s:link>
- <s:link id="editDir" styleClass="linkNavigation" accesskey="E" view="/dirEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'edit', directoryHome.instance)}"><u>E</u>dit Directory</s:link>
+ <s:link id="editDir" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.EditDirectory.accesskey']}"
+ view="/dirEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'edit', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.EditDirectory']}"/>
+ </s:link>
- <s:link id="createDoc" styleClass="linkNavigation" accesskey="N" view="/docEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}"><u>N</u>ew Document
+ <s:link id="createDoc" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.NewDocument.accesskey']}"
+ view="/docEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.NewDocument']}"/>
<f:param name="documentId"/>
<f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
</s:link>
- <s:link id="uploadFile" styleClass="linkNavigation" accesskey="U" view="/fileEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}"><u>U</u>pload File
+ <s:link id="uploadFile" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.UploadFile.accesskey']}"
+ view="/fileEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.UploadFile']}"/>
<f:param name="fileId"/>
<f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
</s:link>
@@ -38,21 +51,29 @@
</s:fragment>
<s:fragment rendered="#{empty directoryHome.parentDirectory}">
- <s:link id="createArea" styleClass="linkNavigation" accesskey="N" view="/dirEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}"><u>N</u>ew Area
+ <s:link id="createArea" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.NewArea.accesskey']}"
+ view="/dirEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.NewArea']}"/>
<f:param name="directoryId"/>
<f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
</s:link>
- <s:link id="editRoot" styleClass="linkNavigation" accesskey="E" view="/dirEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'edit', directoryHome.instance)}"><u>E</u>dit Wiki Root
+ <s:link id="editRoot" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.EditWikiRoot.accesskey']}"
+ view="/dirEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'edit', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.EditWikiRoot']}"/>
<f:param name="parentDirectoryId"/>
</s:link>
</s:fragment>
<h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{directoryHome.instance.feed.id}"
- styleClass="linkNavigation" rendered="#{not empty directoryHome.instance.feed}">Subscribe</h:outputLink>
+ styleClass="linkNavigation" rendered="#{not empty directoryHome.instance.feed}">
+ <h:outputText value="#{messages['lacewiki.button.DirectoryFeed']}"/>
+ </h:outputLink>
</ui:define>
@@ -85,7 +106,7 @@
</h:panelGrid>
</s:link>
<h:outputText rendered="#{empty directoryHome.parentDirectory or !s:hasPermission('Node','read',directoryHome.parentDirectory)}"
- value="This directory is empty."/>
+ value="#{messages['lacewiki.label.dirDisplay.DirectoryIsEmpty']}"/>
</s:div>
1.5 +26 -12 jboss-seam/examples/wiki/view/docDisplay_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docDisplay_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay_d.xhtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- docDisplay_d.xhtml 1 Oct 2007 19:08:04 -0000 1.4
+++ docDisplay_d.xhtml 12 Oct 2007 16:31:24 -0000 1.5
@@ -15,21 +15,34 @@
<ui:define name="controlTwo">
- <s:link id="createDoc" styleClass="linkNavigation" accesskey="C" view="/docEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'create', documentHome.instance.parent)}"><u>C</u>reate
+ <s:link id="createDoc" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.CreateDocument.accesskey']}"
+ view="/docEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', documentHome.instance.parent)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.CreateDocument']}"/>
<f:param name="documentId" value=""/>
<f:param name="parentDirectoryId" value="#{documentHome.instance.parent.id}"/>
</s:link>
- <s:link id="editDoc" styleClass="linkNavigation" accesskey="E" view="/docEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'edit', documentHome.instance)}"><u>E</u>dit</s:link>
+ <s:link id="editDoc" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.EditDocument.accesskey']}"
+ view="/docEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'edit', documentHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.EditDocument']}"/>
+ </s:link>
- <s:link id="showHistory" styleClass="linkNavigation" accesskey="I" view="/docHistory_#{skin}.xhtml"
- rendered="#{documentHome.historicalNodesPresent}">H<u>i</u>story
+ <s:link id="showHistory" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.HistoryDocument.accesskey']}"
+ view="/docHistory_#{skin}.xhtml"
+ rendered="#{documentHome.historicalNodesPresent}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.HistoryDocument']}"/>
<f:param name="nodeId" value="#{documentHome.nodeId}"/>
</s:link>
- <s:link id="browseDir" styleClass="linkNavigation" accesskey="B" view="/dirDisplay_#{skin}.xhtml"><u>B</u>rowse
+ <s:link id="browseDir" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.BrowseDirectory.accesskey']}"
+ view="/dirDisplay_#{skin}.xhtml">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.BrowseDirectory']}"/>
<f:param name="directoryId" value="#{documentHome.parentDirectory.id}"/>
</s:link>
@@ -59,7 +72,7 @@
<s:div rendered="#{documentHome.instance.pluginsUsed.contains('showTags') and not empty documentHome.instance.tags}"
styleClass="documentTags undecoratedLink">
<s:div>
- Tags: 
+ #{messages['lacewiki.label.docDisplay.Tags']}: 
<ui:repeat var="tag" value="#{documentHome.instance.tagsSplit}">
<s:link view="/tagDisplay_#{skin}.xhtml" value="#{tag}">
<f:param value="#{tag}" name="tag"/>
@@ -74,7 +87,7 @@
<s:div rendered="#{wikiPreferences.showDocumentCreatorHistory and not documentHome.instance.pluginsUsed.contains('hideCreatorHistory')}"
styleClass="documentCreatorHistory undecoratedLink">
<s:div>
- Created: 
+ #{messages['lacewiki.label.docDisplay.Created']}: 
<h:outputText value="#{documentHome.instance.createdOn}">
<f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
</h:outputText>
@@ -88,7 +101,7 @@
<h:outputText value=")"/>
</s:div>
<s:div rendered="#{not empty documentHome.instance.lastModifiedBy}">
- Last Modified: 
+ #{messages['lacewiki.label.docDisplay.LastModified']}: 
<h:outputText value="#{documentHome.instance.lastModifiedOn}">
<f:convertDateTime pattern="dd. MMM yyyy, HH:mm" timeZone="#{wikiPreferences.timeZone}"/>
</h:outputText>
@@ -102,7 +115,7 @@
<h:outputText value=")"/>
</s:div>
<s:div rendered="#{documentHome.historicalNodesPresent}">
- Revisions: 
+ #{messages['lacewiki.label.docDisplay.Revisions']}: 
<ui:repeat var="hnode" value="#{documentHome.historicalNodes}">
<h:outputText value="#{hnode.lastModifiedOn}">
@@ -111,7 +124,8 @@
<h:outputText value=" #{wikiPreferences.timeZone} (#{hnode.lastModifiedByUsername})"/>
 
- <s:link view="/docHistory_#{skin}.xhtml" action="#{nodeHistory.diff}">Diff
+ <s:link view="/docHistory_#{skin}.xhtml" action="#{nodeHistory.diff}">
+ <h:outputText value="#{messages['lacewiki.label.docDisplay.Diff']}"/>
<f:param name="nodeId" value="#{documentHome.instance.id}"/>
<f:param name="historicalNodeId" value="#{hnode.historyId}"/>
</s:link>
1.2 +26 -17 jboss-seam/examples/wiki/view/docEdit_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docEdit_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docEdit_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- docEdit_m.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ docEdit_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -9,15 +9,21 @@
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
<ui:define name="screenname">
- <h:outputText value="Create document" rendered="#{!documentHome.managed}"/>
- <h:outputText value="Edit document" rendered="#{documentHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.docEdit.CreateDocument']}" rendered="#{!documentHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.docEdit.EditDocument']}" rendered="#{documentHome.managed}"/>
</ui:define>
<ui:define name="control">
- <s:link id="exitManaged" styleClass="linkNavigation" rendered="#{documentHome.managed}" action="exitManaged">Exit Editor</s:link>
-
- <s:link id="exitUnmanaged" styleClass="linkNavigation" rendered="#{!documentHome.managed}" action="exitUnmanaged">Exit Editor</s:link>
+ <s:link id="exitManaged" styleClass="linkNavigation" rendered="#{documentHome.managed}" action="exitManaged"
+ accesskey="#{messages['lacewiki.button.ExitEditor.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.ExitEditor']}"/>
+ </s:link>
+
+ <s:link id="exitUnmanaged" styleClass="linkNavigation" rendered="#{!documentHome.managed}" action="exitUnmanaged"
+ accesskey="#{messages['lacewiki.button.ExitEditor.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.ExitEditor']}"/>
+ </s:link>
</ui:define>
@@ -25,29 +31,29 @@
<h:form><s:validateAll>
- <div>Directory: #{documentHome.parentDirectory.name}</div>
+ <div>#{messages['lacewiki.label.docEdit.Directory']}: #{documentHome.parentDirectory.name}</div>
<div class="errorMessage"><h:message for="name"/></div>
- <div>Name: 
+ <div>#{messages['lacewiki.label.docEdit.Name']}: 
<h:inputText id="name" size="30" maxlength="255" required="true" value="#{documentHome.instance.name}"/>
</div>
<div>
<h:selectBooleanCheckbox value="#{documentHome.instance.nameAsTitle}"/>
-  Render name as document title
+  #{messages['lacewiki.label.docEdit.RenderNameAsTitle']}
</div>
<div>
<h:selectBooleanCheckbox value="#{documentHome.minorRevision}"/>
-  Minor change, don't create a new revision
+  #{messages['lacewiki.label.docEdit.MinorChange']}
</div>
<s:fragment rendered="#{not documentHome.managed}">
<div>
<h:selectBooleanCheckbox value="#{documentHome.pushOnFeeds}">
</h:selectBooleanCheckbox>
-  Create entry on parent directory feeds
+  #{messages['lacewiki.label.docEdit.CreateOnParentFeeds']}
</div>
<div>
<h:selectBooleanCheckbox value="#{documentHome.pushOnSiteFeed}"/>
-  Create entry on global site feed (requires entry on parent feeds)
+  #{messages['lacewiki.label.docEdit.CreateOnSiteFeed']}
</div>
</s:fragment>
@@ -55,20 +61,20 @@
<s:fragment rendered="#{documentHome.siteFeedEntryPresent}">
<div>
<h:selectBooleanCheckbox value="#{documentHome.pushOnFeeds}"/>
-  Push changes onto feeds
+  #{messages['lacewiki.label.docEdit.PushOnFeeds']}
</div>
</s:fragment>
<s:fragment rendered="#{not documentHome.siteFeedEntryPresent}">
<s:div styleClass="entry">
<div>
<h:selectBooleanCheckbox value="#{documentHome.pushOnFeeds}"/>
- Push changes onto feeds of parent directories
+ #{messages['lacewiki.label.docEdit.PushOnParentFeeds']}
</div>
</s:div>
<s:div id="pushOnSiteFeedSwitch">
<div>
<h:selectBooleanCheckbox value="#{documentHome.pushOnSiteFeed}"/>
-  Create entry on global site feed (requires changes on parent feeds)
+  #{messages['lacewiki.label.docEdit.CreateOnSiteFeed']}
</div>
</s:div>
</s:fragment>
@@ -84,9 +90,12 @@
</div>
<s:div styleClass="formControls">
- <h:commandButton action="#{documentHome.persist}" rendered="#{!documentHome.managed}" value="Save"/>
- <h:commandButton action="#{documentHome.update}" rendered="#{documentHome.managed}" value="Update"/>
- <h:commandButton action="#{documentHome.remove}" rendered="#{documentHome.managed and documentHome.instance.id != wikiStart.id}" value="Delete"/>
+ <h:commandButton action="#{documentHome.persist}" rendered="#{!documentHome.managed}"
+ value="#{messages['lacewiki.button.Save']}"/>
+ <h:commandButton action="#{documentHome.update}" rendered="#{documentHome.managed}"
+ value="#{messages['lacewiki.button.Update']}"/>
+ <h:commandButton action="#{documentHome.remove}" rendered="#{documentHome.managed and documentHome.instance.id != wikiStart.id}"
+ value="#{messages['lacewiki.button.Delete']}"/>
</s:div>
</s:validateAll></h:form>
1.2 +27 -19 jboss-seam/examples/wiki/view/search_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: search_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/search_d.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- search_d.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ search_d.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -10,11 +10,16 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/template.xhtml">
-<ui:define name="screenname">Search: #{wikiSearch.simpleQuery}</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.search.Search']}: #{wikiSearch.simpleQuery}"/>
+</ui:define>
<ui:define name="controlTwo">
- <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end"
+ accesskey="#{messages['lacewiki.button.Close.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.Close']}"/>
+ </s:link>
</ui:define>
@@ -36,7 +41,7 @@
cellpadding="0" cellspacing="0" border="0">
<f:facet name="header">
- <h:outputText value="Search"/>
+ <h:outputText value="#{messages['lacewiki.label.search.Search']}"/>
</f:facet>
<h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
@@ -45,25 +50,25 @@
<s:selectItems value="#{searchRegistry.searchableEntities}"
var="se"
label="#{se.description}"
- noSelectionLabel="All"/>
+ noSelectionLabel="#{messages['lacewiki.label.search.All']}"/>
<a:support status="searchForm:status" event="onchange" reRender="searchControl, searchPager, searchResult" action="#{wikiSearch.search}"/>
</h:selectOneMenu>
</h:panelGrid>
<h:panelGrid columns="2" rendered="#{empty wikiSearch.selectedSearchableEntity}" cellpadding="0" cellspacing="0" border="0">
- <h:outputText styleClass="label" value="Terms: "/>
+ <h:outputText styleClass="label" value="#{messages['lacewiki.label.search.Terms']}: "/>
<h:inputText value="#{wikiSearch.simpleQuery}" size="28" maxlength="1000" tabindex="1"/>
</h:panelGrid>
<s:span rendered="#{not empty wikiSearch.selectedSearchableEntity}"> </s:span>
<h:panelGrid columns="2" rendered="#{empty wikiSearch.selectedSearchableEntity}" cellpadding="0" cellspacing="0" border="0">
<h:selectBooleanCheckbox value="#{wikiSearch.simpleQueryMatchExactPhrase}" tabindex="1"/>
- <h:outputText styleClass="label" style="white-space:nowrap;" value=" Exact phrase"/>
+ <h:outputText styleClass="label" style="white-space:nowrap;" value=" #{messages['lacewiki.label.search.ExactPhrase']}"/>
</h:panelGrid>
<s:span rendered="#{not empty wikiSearch.selectedSearchableEntity}"> </s:span>
<h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0">
- <h:outputText styleClass="label" value="Results: "/>
+ <h:outputText styleClass="label" value="#{messages['lacewiki.label.search.Results']}: "/>
<h:selectOneMenu value="#{wikiSearch.pageSize}" id="pageSize" tabindex="1">
<f:selectItem itemLabel="5" itemValue="5"/>
<f:selectItem itemLabel="15" itemValue="15"/>
@@ -75,7 +80,10 @@
<a:commandLink id="find" styleClass="buttonNonpersistent" reRender="workspaceSwitcher, searchControl, searchPager, searchResult"
status="searchForm:status"
action="#{wikiSearch.search()}"
- tabindex="1" accesskey="F"><span class="buttonLabel"><u>F</u>ind</span></a:commandLink>
+ tabindex="1" accesskey="#{messages['lacewiki.button.search.Find.accesskey']}">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.search.Find']}"/>
+
+ </a:commandLink>
</h:panelGrid>
@@ -92,25 +100,25 @@
cellpadding="0" cellspacing="0" border="0">
<h:column>
- <h:outputText styleClass="label" value="#{search.property.description}"/>
+ <h:outputText styleClass="label" value="#{search.property.description}:"/>
</h:column>
<h:column>
<h:panelGrid columns="5" rendered="#{search.property.type == 'PHRASE'}">
<h:inputText value="#{search.terms['include']}" size="32" tabindex="1"/>
- <h:outputText styleClass="label" value=" Exclude: "/>
+ <h:outputText styleClass="label" value=" #{messages['lacewiki.label.search.Exclude']}: "/>
<h:inputText value="#{search.terms['exclude']}" size="32" tabindex="1"/>
<h:selectBooleanCheckbox value="#{search.terms['matchExactPhrase']}" tabindex="1"/>
- <h:outputText styleClass="label" value=" Match exact phrase"/>
+ <h:outputText styleClass="label" value=" #{messages['lacewiki.label.search.ExactPhrase']}"/>
</h:panelGrid>
<s:div rendered="#{search.property.type == 'PASTDATE'}">
<h:selectOneMenu value="#{search.terms['numOfDays']}" tabindex="1">
- <f:selectItem itemLabel="at any time" itemValue=""/>
- <f:selectItem itemLabel="last 7 days" itemValue="7"/>
- <f:selectItem itemLabel="last 30 days" itemValue="30"/>
- <f:selectItem itemLabel="last 6 months" itemValue="180"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.search.AtAnyTime']}" itemValue=""/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.search.Last7Days']}" itemValue="7"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.search.Last30Days']}" itemValue="30"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.search.Last6Months']}" itemValue="180"/>
</h:selectOneMenu>
</s:div>
@@ -142,9 +150,9 @@
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
rendered="#{!wikiSearch.previousPageAvailable}"/>
- <h:outputText value="#{wikiSearch.firstRow} to
- #{wikiSearch.lastRow} of
- #{wikiSearch.totalCount} hit(s)"/>
+ <h:outputText value="#{wikiSearch.firstRow} #{messages['lacewiki.label.search.To']}
+ #{wikiSearch.lastRow} #{messages['lacewiki.label.search.Of']}
+ #{wikiSearch.totalCount} #{messages['lacewiki.label.search.Hits']}"/>
<h:commandLink action="#{wikiSearch.nextPage()}" rendered="#{wikiSearch.nextPageAvailable}" tabindex="7">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.next.gif" width="13" height="11"/>
@@ -183,7 +191,7 @@
</h:dataTable>
<s:div styleClass="formFields minorPadding" rendered="#{wikiSearch.totalCount == 0}">
- <h:outputText value="No hits, please try again."/>
+ <h:outputText value="#{messages['lacewiki.label.search.NoHits']}"/>
</s:div>
</s:div>
1.3 +41 -20 jboss-seam/examples/wiki/view/dirDisplay_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dirDisplay_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirDisplay_d.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- dirDisplay_d.xhtml 15 Sep 2007 17:06:18 -0000 1.2
+++ dirDisplay_d.xhtml 12 Oct 2007 16:31:24 -0000 1.3
@@ -15,23 +15,36 @@
<s:fragment rendered="#{!empty directoryHome.parentDirectory}">
- <s:link id="createDir" styleClass="linkNavigation" accesskey="S" view="/dirEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">New <u>S</u>ubdirectory
+ <s:link id="createDir" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.CreateSubdirectory.accesskey']}"
+ view="/dirEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.CreateSubdirectory']}"/>
<f:param name="directoryId"/>
<f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
</s:link>
- <s:link id="editDir" styleClass="linkNavigation" accesskey="E" view="/dirEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'edit', directoryHome.instance)}"><u>E</u>dit Directory</s:link>
+ <s:link id="editDir" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.EditDirectory.accesskey']}"
+ view="/dirEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'edit', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.EditDirectory']}"/>
+ </s:link>
- <s:link id="createDoc" styleClass="linkNavigation" accesskey="N" view="/docEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}"><u>N</u>ew Document
+ <s:link id="createDoc" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.NewDocument.accesskey']}"
+ view="/docEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.NewDocument']}"/>
<f:param name="documentId"/>
<f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
</s:link>
- <s:link id="uploadFile" styleClass="linkNavigation" accesskey="U" view="/fileEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}"><u>U</u>pload File
+ <s:link id="uploadFile" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.UploadFile.accesskey']}"
+ view="/fileEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.UploadFile']}"/>
<f:param name="fileId"/>
<f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
</s:link>
@@ -39,21 +52,29 @@
</s:fragment>
<s:fragment rendered="#{empty directoryHome.parentDirectory}">
- <s:link id="createArea" styleClass="linkNavigation" accesskey="N" view="/dirEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}"><u>N</u>ew Area
+ <s:link id="createArea" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.NewArea.accesskey']}"
+ view="/dirEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'create', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.NewArea']}"/>
<f:param name="directoryId"/>
<f:param name="parentDirectoryId" value="#{directoryHome.instance.id}"/>
</s:link>
- <s:link id="editRoot" styleClass="linkNavigation" accesskey="E" view="/dirEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'edit', directoryHome.instance)}"><u>E</u>dit Wiki Root
+ <s:link id="editRoot" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.EditWikiRoot.accesskey']}"
+ view="/dirEdit_#{skin}.xhtml"
+ rendered="#{s:hasPermission('Node', 'edit', directoryHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.EditWikiRoot']}"/>
<f:param name="parentDirectoryId"/>
</s:link>
</s:fragment>
<h:outputLink value="#{facesContext.externalContext.request.contextPath}/servlets/feeds/atom.seam?feedId=#{directoryHome.instance.feed.id}"
- styleClass="linkNavigation" rendered="#{not empty directoryHome.instance.feed}">Subscribe</h:outputLink>
+ styleClass="linkNavigation" rendered="#{not empty directoryHome.instance.feed}">
+ <h:outputText value="#{messages['lacewiki.button.DirectoryFeed']}"/>
+ </h:outputLink>
</ui:define>
@@ -87,7 +108,7 @@
</h:panelGrid>
</s:link>
<h:outputText rendered="#{empty directoryHome.parentDirectory or !s:hasPermission('Node','read',directoryHome.parentDirectory)}"
- value="This directory is empty."/>
+ value="#{messages['lacewiki.label.dirDisplay.DirectoryIsEmpty']}"/>
</s:div>
@@ -130,7 +151,7 @@
<h:column>
<f:facet name="header">
- Name
+ #{messages['lacewiki.label.dirDisplay.Name']}
</f:facet>
<s:span rendered="#{wiki:isDirectory(node)}">
@@ -166,28 +187,28 @@
<h:column>
<f:facet name="header">
- Owner
+ #{messages['lacewiki.label.dirDisplay.Owner']}
</f:facet>
#{node.createdBy.fullname}
</h:column>
<h:column>
<f:facet name="header">
- Read Access
+ #{messages['lacewiki.label.dirDisplay.ReadAccess']}
</f:facet>
#{wiki:truncateString(wiki:resolveAccessLevel(node.readAccessLevel).roleNames, 15, '...')}
</h:column>
<h:column>
<f:facet name="header">
- Write Access
+ #{messages['lacewiki.label.dirDisplay.WriteAccess']}
</f:facet>
#{wiki:truncateString(wiki:resolveAccessLevel(node.writeAccessLevel).roleNames, 15, '...')}
</h:column>
<h:column rendered="#{!empty node.lastModifiedOn and !empty node.lastModifiedBy}">
<f:facet name="header">
- Last Modified On
+ #{messages['lacewiki.label.dirDisplay.LastModifiedOn']}
</f:facet>
<h:outputText value="#{node.lastModifiedOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
@@ -197,7 +218,7 @@
<h:column rendered="#{empty node.lastModifiedOn or empty node.lastModifiedBy}">
<f:facet name="header">
- Last Modified On
+ #{messages['lacewiki.label.dirDisplay.LastModifiedOn']}
</f:facet>
-
</h:column>
1.2 +4 -2 jboss-seam/examples/wiki/view/userRegister_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userRegister_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userRegister_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- userRegister_m.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ userRegister_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -8,10 +8,12 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
-<ui:define name="screenname">Registration</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.userRegister.Registration']}"/>
+</ui:define>
<ui:define name="content">
- Registration is not available with this skin.
+ <h:outputText value="#{messages['lacewiki.label.userRegister.NotAvailableForSkin']}"/>
</ui:define>
</ui:composition>
1.2 +4 -2 jboss-seam/examples/wiki/view/tagDisplay_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: tagDisplay_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/tagDisplay_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tagDisplay_m.xhtml 1 Oct 2007 19:08:04 -0000 1.1
+++ tagDisplay_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -8,10 +8,12 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
-<ui:define name="screenname">Tag Display</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.tagDisplay.Tag']}"/>
+</ui:define>
<ui:define name="content">
- Tag Display is not available with this skin.
+ <h:outputText value="#{messages['lacewiki.label.tagDisplay.NotAvailableForSkin']}"/>
</ui:define>
</ui:composition>
1.2 +8 -6 jboss-seam/examples/wiki/view/tagDisplay_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: tagDisplay_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/tagDisplay_d.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- tagDisplay_d.xhtml 1 Oct 2007 19:08:04 -0000 1.1
+++ tagDisplay_d.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -7,7 +7,9 @@
xmlns:h="http://java.sun.com/jsf/html"
template="themes/#{wikiPreferences.themeName}/template.xhtml">
-<ui:define name="screenname">Tag: #{tagHome.tag}</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.tagDisplay.Tag']}: #{tagHome.tag}"/>
+</ui:define>
<ui:define name="content">
@@ -29,19 +31,19 @@
</h:column>
<h:column>
<f:facet name="header">
- Tag: #{tagHome.tag}
+ <h:outputText value="#{messages['lacewiki.label.tagDisplay.Tag']}: #{tagHome.tag}"/>
</f:facet>
<h:outputLink value="#{wiki:renderURL(node)}">#{node.name}</h:outputLink>
</h:column>
<h:column>
<f:facet name="header">
- Owner
+ <h:outputText value="#{messages['lacewiki.label.tagDisplay.Owner']}"/>
</f:facet>
#{node.createdBy.fullname}
</h:column>
<h:column>
<f:facet name="header">
- Created On
+ <h:outputText value="#{messages['lacewiki.label.tagDisplay.CreatedOn']}"/>
</f:facet>
<h:outputText value="#{node.createdOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
@@ -49,7 +51,7 @@
</h:column>
<h:column rendered="#{!empty node.lastModifiedOn and !empty node.lastModifiedBy}">
<f:facet name="header">
- Last Modified On
+ <h:outputText value="#{messages['lacewiki.label.tagDisplay.LastModifiedOn']}"/>
</f:facet>
<h:outputText value="#{node.lastModifiedOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
@@ -58,7 +60,7 @@
</h:column>
<h:column rendered="#{empty node.lastModifiedOn or empty node.lastModifiedBy}">
<f:facet name="header">
- Last Modified On
+ <h:outputText value="#{messages['lacewiki.label.tagDisplay.LastModifiedOn']}"/>
</f:facet>
-
</h:column>
1.4 +43 -26 jboss-seam/examples/wiki/view/adminHome_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: adminHome_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/adminHome_d.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- adminHome_d.xhtml 2 Oct 2007 04:30:34 -0000 1.3
+++ adminHome_d.xhtml 12 Oct 2007 16:31:24 -0000 1.4
@@ -11,12 +11,15 @@
template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="screenname">
- <h:outputText value="System Administration"/>
+ <h:outputText value="#{messages['lacewiki.label.adminHome.Administration']}"/>
</ui:define>
<ui:define name="controlTwo">
- <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end"
+ accesskey="#{messages['lacewiki.button.Close.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.Close']}"/>
+ </s:link>
</ui:define>
@@ -64,12 +67,24 @@
<ul>
<li class="formTabsTitle">
- <h:outputText value="Administration"/>
+ <h:outputText value="#{messages['lacewiki.label.adminHome.Administration']}"/>
</li>
- <li id="systemStatsTab"><a href="#systemStats" accesskey="Y">S<u>y</u>stem Statistics</a></li>
- <li id="rolesPermissionsTab"><a href="#rolesPermissions" accesskey="O">R<u>o</u>les & Permissions</a></li>
- <li id="linkProtocolsTab"><a href="#linkProtocols" accesskey="L"><u>L</u>ink Protocols</a></li>
- <li id="systemPrefsTab"><a href="#systemPrefs" accesskey="R">P<u>r</u>eferences</a></li>
+ <li id="systemStatsTab"><a href="#systemStats"
+ accesskey="#{messages['lacewiki.button.adminHome.SystemStatistics.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.adminHome.SystemStatistics']}"/>
+ </a></li>
+ <li id="rolesPermissionsTab"><a href="#rolesPermissions"
+ accesskey="#{messages['lacewiki.button.adminHome.RolesPermissions.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.adminHome.RolesPermissions']}"/>
+ </a></li>
+ <li id="linkProtocolsTab"><a href="#linkProtocols"
+ accesskey="#{messages['lacewiki.button.adminHome.LinkProtocols.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.adminHome.LinkProtocols']}"/>
+ </a></li>
+ <li id="systemPrefsTab"><a href="#systemPrefs"
+ accesskey="#{messages['lacewiki.button.adminHome.Preferences.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.adminHome.Preferences']}"/>
+ </a></li>
</ul>
<div id="formTabsTitle"/>
@@ -101,25 +116,25 @@
<h:column>
<f:facet name="header">
- Search index
+ #{messages['lacewiki.label.adminHome.SearchIndex']}
</f:facet>
#{ie.description}
</h:column>
<h:column>
<f:facet name="header">
- # of indexed documents
+ #{messages['lacewiki.label.adminHome.NumOfIndexedDocuments']}
</f:facet>
#{ie.numOfIndexedDocuments}
</h:column>
<h:column>
<f:facet name="header">
- # of indexed terms
+ #{messages['lacewiki.label.adminHome.NumOfIndexedTerms']}
</f:facet>
#{ie.numOfIndexedTerms}
</h:column>
<h:column>
<f:facet name="header">
- Index size
+ #{messages['lacewiki.label.adminHome.IndexSize']}
</f:facet>
#{wiki:displayFilesize(ie.indexSizeInBytes)}
</h:column>
@@ -128,7 +143,9 @@
jQuery(function(){ getIndexingProgress("#{ie.clazz.name}") });
</script>
<a:commandLink status="adminForm:status" id="resetSearchIndex" styleClass="button resetIndexButton" reRender="indexStatistics"
- action="#{adminHome.resetSearchIndex()}"><span class="buttonLabel">Rebuild Index</span></a:commandLink>
+ action="#{adminHome.resetSearchIndex()}">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.adminHome.RebuildIndex']}"/>
+ </a:commandLink>
</h:column>
</h:dataTable>
@@ -144,13 +161,6 @@
<s:div id="linkProtocolsRegion" styleClass="formFields" style="padding: 20px;">
<a:region>
- <p>
- Link protocols enable custom prefixes in wiki text links, e.g. you can write
- [=>jbseam://123] and have it rendered as a link to http://my.jbseam.site/123.
- If you remove an existing link protocol that is in use, all links will be
- rendered broken.
- </p>
-
<h:dataTable id="linkProtocolTable" var="lp"
value="#{linkProtocols}"
rendered="#{linkProtocols.rowCount >0}"
@@ -164,19 +174,21 @@
<h:column>
<f:facet name="header">
- Prefix
+ #{messages['lacewiki.label.adminHome.Prefix']}
</f:facet>
#{lp.prefix}
</h:column>
<h:column>
<f:facet name="header">
- Target Link
+ #{messages['lacewiki.label.adminHome.TargetLink']}
</f:facet>
#{lp.link}
</h:column>
<h:column>
<a:commandLink status="adminForm:status" id="removeLinkProtocol" styleClass="buttonNonpersistent" reRender="linkProtocolsRegion"
- action="#{adminHome.removeLinkProtocol()}"><span class="buttonLabel">Remove</span></a:commandLink>
+ action="#{adminHome.removeLinkProtocol()}">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.adminHome.Remove']}"/>
+ </a:commandLink>
</h:column>
</h:dataTable>
</a:region>
@@ -185,12 +197,12 @@
<s:div id="linkProtocolForm" styleClass="formFields wideLabels">
<s:decorate id="prefixDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Prefix</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.adminHome.Prefix']}</ui:define>
<h:inputText id="prefix" value="#{adminHome.linkProtocol.prefix}" maxlength="10" size="10" tabindex="1"/>
</s:decorate>
<s:decorate id="linkDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Target with [[link]] placeholder</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.adminHome.TargetWithPlaceHolder']}</ui:define>
<h:inputText id="link" value="#{adminHome.linkProtocol.link}" maxlength="1000" size="40" tabindex="1"/>
</s:decorate>
@@ -198,7 +210,9 @@
<div class="label"> </div>
<div class="input">
<a:commandLink status="adminForm:status" id="addLinkProtocol" styleClass="buttonNonpersistent" reRender="linkProtocolsRegion"
- action="#{adminHome.addLinkProtocol}"><span class="buttonLabel">Add</span></a:commandLink>
+ action="#{adminHome.addLinkProtocol}">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.adminHome.Add']}"/>
+ </a:commandLink>
</div>
</div>
</s:div>
@@ -226,7 +240,10 @@
<a:commandLink status="adminForm:status" id="update" styleClass="button saveButton" reRender="body" oncomplete="wrapBoxes();"
action="#{adminHome.update}"
- tabindex="9" accesskey="S"><span class="buttonLabel"><u>S</u>ave Settings</span></a:commandLink>
+ tabindex="9"
+ accesskey="#{messages['lacewiki.button.adminHome.SaveSettings.accesskey']}">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.adminHome.SaveSettings']}"/>
+ </a:commandLink>
</div>
</div>
1.2 +24 -14 jboss-seam/examples/wiki/view/dirEdit_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dirEdit_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirEdit_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- dirEdit_m.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ dirEdit_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -9,15 +9,21 @@
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
<ui:define name="screenname">
- <h:outputText value="Create directory" rendered="#{!directoryHome.managed}"/>
- <h:outputText value="Edit directory" rendered="#{directoryHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.CreateDirectory']}" rendered="#{!directoryHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.EditDirectory']}" rendered="#{directoryHome.managed}"/>
</ui:define>
<ui:define name="control">
- <s:link id="exitManaged" styleClass="linkNavigation" rendered="#{directoryHome.managed}" action="exitManaged">Exit Editor</s:link>
-
- <s:link id="exitUnmanaged" styleClass="linkNavigation" rendered="#{!directoryHome.managed}" action="exitUnmanaged">Exit Editor</s:link>
+ <s:link id="exitManaged" styleClass="linkNavigation" rendered="#{directoryHome.managed}" action="exitManaged"
+ accesskey="#{messages['lacewiki.button.ExitEditor.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.ExitEditor']}"/>
+ </s:link>
+
+ <s:link id="exitUnmanaged" styleClass="linkNavigation" rendered="#{!directoryHome.managed}" action="exitUnmanaged"
+ accesskey="#{messages['lacewiki.button.ExitEditor.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.ExitEditor']}"/>
+ </s:link>
</ui:define>
@@ -25,16 +31,18 @@
<h:form><s:validateAll>
- <s:div rendered="#{!empty directoryHome.parentDirectory}">Parent: #{directoryHome.parentDirectory.name}</s:div>
+ <s:div rendered="#{!empty directoryHome.parentDirectory}">
+ #{messages['lacewiki.label.dirEdit.Parent']}: #{directoryHome.parentDirectory.name}
+ </s:div>
<div class="errorMessage"><h:message for="name"/></div>
- <div>Name: 
+ <div>#{messages['lacewiki.label.dirEdit.Name']}: 
<h:inputText id="name" size="30" maxlength="255" required="true" value="#{directoryHome.instance.name}"/>
</div>
<div class="errorMessage"><h:message for="description"/></div>
- <div>Description: 
+ <div>#{messages['lacewiki.label.dirEdit.Description']}: 
<h:inputText id="description" size="30" maxlength="512" required="false" value="#{directoryHome.instance.description}"/>
</div>
- <div>Default Document: 
+ <div>#{messages['lacewiki.label.dirEdit.DefaultDocument']}: 
<h:selectOneMenu value="#{directoryHome.instance.defaultDocument}" converter="#{restrictedEntityConverter}">
<s:selectItems value="#{directoryHome.childDocuments}"
var="document"
@@ -45,18 +53,20 @@
<div>
<h:selectBooleanCheckbox value="#{directoryHome.hasFeed}"
disabled="#{empty directoryHome.parentDirectory}"/>
-  Enable syndication feed (disabling invalidates subcriber link)
-
+ <h:outputText value=" #{messages['lacewiki.label.dirEdit.EnableFeed']}"/>
</div>
<s:div styleClass="formControls">
- <h:commandButton action="#{directoryHome.persist}" rendered="#{!directoryHome.managed}" value="Save"/>
- <h:commandButton action="#{directoryHome.update}" rendered="#{directoryHome.managed}" value="Update"/>
+ <h:commandButton action="#{directoryHome.persist}" rendered="#{!directoryHome.managed}"
+ value="#{messages['lacewiki.button.Save']}"/>
+ <h:commandButton action="#{directoryHome.update}" rendered="#{directoryHome.managed}"
+ value="#{messages['lacewiki.button.Update']}"/>
<h:commandButton action="#{directoryHome.remove}"
rendered="#{empty directoryHome.instance.children
and directoryHome.managed
and !empty directoryHome.parentDirectory
- and directoryHome.instance.id != wikiPreferences.memberAreaId}" value="Delete"/>
+ and directoryHome.instance.id != wikiPreferences.memberAreaId}"
+ value="#{messages['lacewiki.button.Delete']}"/>
</s:div>
</s:validateAll></h:form>
1.3 +63 -27 jboss-seam/examples/wiki/view/userHome_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userHome_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userHome_d.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- userHome_d.xhtml 24 Sep 2007 08:23:19 -0000 1.2
+++ userHome_d.xhtml 12 Oct 2007 16:31:24 -0000 1.3
@@ -11,12 +11,15 @@
template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="screenname">
- <h:outputText value="Member Account '#{userHome.instance.username}'"/>
+ <h:outputText value="#{messages['lacewiki.label.userHome.MemberAccount']} '#{userHome.instance.username}'"/>
</ui:define>
<ui:define name="controlTwo">
- <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end"
+ accesskey="#{messages['lacewiki.button.Close.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.Close']}"/>
+ </s:link>
</ui:define>
@@ -41,11 +44,20 @@
<ul>
<li class="formTabsTitle">
- <h:outputText value="Edit user"/>
+ <h:outputText value="#{messages['lacewiki.label.userHome.EditUser']}"/>
</li>
- <li id="userAccountTab"><a href="#userAccount" accesskey="N">Accou<u>n</u>t</a></li>
- <li id="userProfileTab"><a href="#userProfile" accesskey="I">Prof<u>i</u>le</a></li>
- <li id="userPrefsTab"><a href="#userPreferences" accesskey="R">P<u>r</u>eferences</a></li>
+ <li id="userAccountTab"><a href="#userAccount"
+ accesskey="#{messages['lacewiki.button.userHome.Account.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.userHome.Account']}"/>
+ </a></li>
+ <li id="userProfileTab"><a href="#userProfile"
+ accesskey="#{messages['lacewiki.button.userHome.Profile.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.userHome.Profile']}"/>
+ </a></li>
+ <li id="userPrefsTab"><a href="#userPreferences"
+ accesskey="#{messages['lacewiki.button.userHome.Preferences.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.userHome.Preferences']}"/>
+ </a></li>
</ul>
<div id="formTabsTitle"/>
@@ -55,66 +67,78 @@
<div class="formFields wideLabels">
<s:validateAll>
+ <a:region>
<s:decorate id="firstnameDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="userAccountTab"/>
<ui:param name="fieldId" value="firstname"/>
- <ui:define name="label">First name</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userHome.FirstName']}</ui:define>
<h:inputText tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.firstname}">
<a:support status="userHomeForm:status" event="onblur" reRender="firstnameDecorate"/>
</h:inputText>
</s:decorate>
+ </a:region>
+ <a:region>
<s:decorate id="lastnameDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="userAccountTab"/>
<ui:param name="fieldId" value="lastname"/>
- <ui:define name="label">Last name</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userHome.LastName']}</ui:define>
<h:inputText tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.lastname}">
<a:support status="userHomeForm:status" event="onblur" reRender="lastnameDecorate"/>
</h:inputText>
</s:decorate>
+ </a:region>
+ <a:region>
<s:decorate id="emailDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="userAccountTab"/>
<ui:param name="fieldId" value="email"/>
- <ui:define name="label">E-Mail</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userHome.Email']}</ui:define>
<h:inputText tabindex="1" size="40" maxlength="255" required="true" value="#{userHome.instance.email}"
disabled="#{userHome.instance.username == guestUser.username}">
<a:support status="userHomeForm:status" event="onblur" reRender="emailDecorate"/>
</h:inputText>
</s:decorate>
+ </a:region>
+ <a:region>
<s:decorate id="usernameDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="userAccountTab"/>
<ui:param name="fieldId" value="username"/>
- <ui:define name="label">Username</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userHome.Username']}</ui:define>
<h:inputText tabindex="1" size="16" maxlength="16" required="true" value="#{userHome.instance.username}"
disabled="#{userHome.instance.username == adminUser.username
or userHome.instance.username == guestUser.username}">
<a:support status="userHomeForm:status" event="onblur" action="#{userHome.validateUsername}" reRender="usernameDecorate"/>
</h:inputText>
</s:decorate>
+ </a:region>
+ <a:region>
<s:decorate id="passwordDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="userAccountTab"/>
<ui:param name="fieldId" value="password"/>
- <ui:define name="label">Password</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userHome.Password']}</ui:define>
<h:inputSecret tabindex="1" size="15" maxlength="15"
redisplay="true" value="#{userHome.password}"
disabled="#{userHome.instance.username == guestUser.username}">
<a:support status="userHomeForm:status" event="onblur" action="#{userHome.validatePassword}" reRender="passwordDecorate"/>
</h:inputSecret>
</s:decorate>
+ </a:region>
+ <a:region>
<s:decorate id="passwordControlDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="userAccountTab"/>
<ui:param name="fieldId" value="passwordControl"/>
- <ui:define name="label">Repeat password</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userHome.RepeatPassword']}</ui:define>
<h:inputSecret tabindex="1" size="15" maxlength="15"
redisplay="true" value="#{userHome.passwordControl}"
disabled="#{userHome.instance.username == guestUser.username}">
<a:support status="userHomeForm:status" event="onblur" action="#{userHome.validatePasswordControl}" reRender="passwordControlDecorate"/>
</h:inputSecret>
</s:decorate>
+ </a:region>
<s:div rendered="#{s:hasPermission('User', 'isAdmin', currentUser)
and userHome.instance.id != adminUser.id
@@ -124,14 +148,16 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{userHome.instance.activated}" tabindex="1"/>
- Account is active
+ <h:outputText value="#{messages['lacewiki.label.userHome.AccountIsActive']}"/>
</div>
</s:div>
</s:div>
<s:div styleClass="entry" rendered="#{userHome.instance.id != adminUser.id and userHome.instance.id != guestUser.id}">
- <s:div styleClass="label">Roles:</s:div>
+ <s:div styleClass="label">
+ <h:outputText value="#{messages['lacewiki.label.userHome.Roles']}"/>
+ </s:div>
<div class="input">
<h:selectManyListbox value="#{userHome.roles}" tabindex="1"
disabled="#{!s:hasPermission('User', 'editRoles', currentUser)}"
@@ -154,7 +180,9 @@
<s:validateAll>
<s:div styleClass="entry" rendered="#{!empty userHome.instance.profile.image}">
- <div class="label">Portrait:</div>
+ <div class="label">
+ <h:outputText value="#{messages['lacewiki.label.userHome.Portrait']}"/>
+ </div>
<div class="output">
<s:graphicImage value="#{userHome.instance.profile.image}" style="border: 1px solid black;"/>
</div>
@@ -163,7 +191,7 @@
<s:decorate id="uploadDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="userProfileTab"/>
<ui:param name="fieldId" value="userimage"/>
- <ui:define name="label">Upload Portrait (max. #{wiki:displayFilesize(200000)})</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userHome.UploadPortrait']} (#{messages['lacewiki.label.userHome.UploadMax']}. #{wiki:displayFilesize(200000)})</ui:define>
<s:fileUpload id="upload" data="#{userHome.portraitImageData}"
contentType="#{userHome.portraitContentType}"/>
</s:decorate>
@@ -173,7 +201,7 @@
<ui:param name="textEditorId" value="bio"/>
<ui:param name="textPreviewId" value="bioPreview"/>
<ui:param name="namingContainer" value="userHomeForm"/>
- <ui:param name="label" value="Bio"/>
+ <ui:param name="label" value="#{messages['lacewiki.label.userHome.Bio']}"/>
<ui:param name="valueBinding" value="#{userHome.instance.profile.bio}"/>
<ui:param name="valueMaxLength" value="1000"/>
<ui:param name="textEditorColumns" value="50"/>
@@ -192,7 +220,7 @@
<s:decorate id="websiteDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="userProfileTab"/>
<ui:param name="fieldId" value="website"/>
- <ui:define name="label">Website</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userHome.Website']}</ui:define>
<h:inputText tabindex="1" size="60" maxlength="1000" value="#{userHome.instance.profile.website}">
<a:support status="userHomeForm:status" event="onblur" reRender="websiteDecorate"/>
</h:inputText>
@@ -201,7 +229,7 @@
<s:decorate id="locationDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="userProfileTab"/>
<ui:param name="fieldId" value="location"/>
- <ui:define name="label">Location</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userHome.Location']}</ui:define>
<h:inputText tabindex="1" size="40" maxlength="255" value="#{userHome.instance.profile.location}">
<a:support status="userHomeForm:status" event="onblur" reRender="locationDecorate"/>
</h:inputText>
@@ -210,7 +238,7 @@
<s:decorate id="occupationDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="userProfileTab"/>
<ui:param name="fieldId" value="occupation"/>
- <ui:define name="label">Occupation</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userHome.Occupation']}</ui:define>
<h:inputText tabindex="1" size="60" maxlength="1000" value="#{userHome.instance.profile.occupation}">
<a:support status="userHomeForm:status" event="onblur" reRender="occupationDecorate"/>
</h:inputText>
@@ -221,7 +249,7 @@
<ui:param name="textEditorId" value="signature"/>
<ui:param name="textPreviewId" value="signaturePreview"/>
<ui:param name="namingContainer" value="userHomeForm"/>
- <ui:param name="label" value="Signature"/>
+ <ui:param name="label" value="#{messages['lacewiki.label.userHome.Signature']}"/>
<ui:param name="valueBinding" value="#{userHome.instance.profile.signature}"/>
<ui:param name="valueMaxLength" value="1000"/>
<ui:param name="textEditorColumns" value="50"/>
@@ -264,15 +292,23 @@
and userHome.instance.id != guestUser.id
and userHome.instance.id != adminUser.id
and s:hasPermission('User', 'isAdmin', currentUser)}"
- action="#{userHome.createHomeDirectory}"><span class="buttonLabel">Create Home Directory</span></h:commandLink>
+ action="#{userHome.createHomeDirectory}">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.userHome.CreateHomeDirectory']}"/>
+ </h:commandLink>
<h:commandLink id="update" styleClass="button saveButton"
action="#{userHome.update}"
- tabindex="1" accesskey="S"><span class="buttonLabel"><u>S</u>ave Settings</span></h:commandLink>
-
- <h:outputLink id="delete" value="#" tabindex="1" accesskey="D" styleClass="button"
- rendered="#{s:hasPermission('User', 'delete', userHome.instance)}"><j4j:idProxy
- id="openDialogDelete"/><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
+ tabindex="1"
+ accesskey="#{messages['lacewiki.button.userHome.SaveSettings.accesskey']}">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.userHome.SaveSettings']}"/>
+ </h:commandLink>
+
+ <h:outputLink id="delete" value="#" tabindex="1"
+ accesskey="#{messages['lacewiki.button.userHome.Delete.accesskey']}"
+ styleClass="button"
+ rendered="#{s:hasPermission('User', 'delete', userHome.instance)}"><j4j:idProxy id="openDialogDelete"/>
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.userHome.Delete']}"/>
+ </h:outputLink>
</div>
1.2 +30 -20 jboss-seam/examples/wiki/view/userList_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userList_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userList_d.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- userList_d.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ userList_d.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -8,15 +8,23 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/template.xhtml">
-<ui:define name="screenname">Member List</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.userList.MemberList']}"/>
+</ui:define>
<ui:define name="controlTwo">
- <s:link id="createUser" styleClass="linkNavigation" accesskey="C" view="/userRegister_#{skin}.xhtml" propagation="none"
- rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"><u>C</u>reate Account
+ <s:link id="createUser" styleClass="linkNavigation"
+ accesskey="#{messages['lacewiki.button.userList.CreateAccount.accesskey']}"
+ view="/userRegister_#{skin}.xhtml" propagation="none"
+ rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.userList.CreateAccount']}"/>
</s:link>
- <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end"
+ accesskey="#{messages['lacewiki.button.Close.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.Close']}"/>
+ </s:link>
</ui:define>
@@ -37,31 +45,31 @@
cellpadding="0" cellspacing="0" border="0">
<f:facet name="header">
- <h:outputText value="Search members"/>
+ <h:outputText value="#{messages['lacewiki.label.userList.SearchMembers']}"/>
</f:facet>
<h:panelGroup>
- <h:outputText styleClass="label" value="Username:"/> 
+ <h:outputText styleClass="label" value="#{messages['lacewiki.label.userList.Username']}:"/> 
<h:inputText id="username" value="#{userSearch.exampleUser.username}" maxlength="35" size="8" tabindex="1"/>
</h:panelGroup>
<h:panelGroup>
- <h:outputText styleClass="label" value="First name:"/> 
+ <h:outputText styleClass="label" value="#{messages['lacewiki.label.userList.FirstName']}:"/> 
<h:inputText id="firstname" value="#{userSearch.exampleUser.firstname}" maxlength="35" size="8" tabindex="2"/>
</h:panelGroup>
<h:panelGroup>
- <h:outputText styleClass="label" value="Last name:"/> 
+ <h:outputText styleClass="label" value="#{messages['lacewiki.label.userList.LastName']}:"/> 
<h:inputText id="lastname" value="#{userSearch.exampleUser.lastname}" maxlength="35" size="8" tabindex="3"/>
</h:panelGroup>
<h:panelGroup>
- <h:outputText styleClass="label" value="E-mail:"/> 
+ <h:outputText styleClass="label" value="#{messages['lacewiki.label.userList.Email']}:"/> 
<h:inputText id="email" value="#{userSearch.exampleUser.email}" maxlength="35" size="8" tabindex="4"/>
</h:panelGroup>
<h:panelGroup>
- <h:outputLabel styleClass="label" for="pageSize">Show:</h:outputLabel> 
+ <h:outputLabel styleClass="label" for="pageSize">#{messages['lacewiki.label.userList.Show']}:</h:outputLabel> 
<h:selectOneMenu value="#{userSearch.pageSize}" id="pageSize" tabindex="5" style="font-size:100%">
<f:selectItem itemLabel="5" itemValue="5"/>
<f:selectItem itemLabel="15" itemValue="15"/>
@@ -71,7 +79,9 @@
<h:commandLink id="find" styleClass="buttonNonpersistent"
action="#{userSearch.find()}"
- tabindex="6" accesskey="I"><span class="buttonLabel">F<u>i</u>nd</span></h:commandLink>
+ tabindex="6" accesskey="#{messages['lacewiki.button.userList.Find.accesskey']}">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.userList.Find']}"/>
+ </h:commandLink>
</h:panelGrid>
@@ -95,7 +105,7 @@
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/blank.gif" width="13" height="11"
rendered="#{!userSearch.previousPageAvailable}"/>
- <h:outputText value="Found: #{userSearch.rowCount} member(s)"/>
+ <h:outputText value="#{messages['lacewiki.label.userList.Found']} #{userSearch.rowCount} #{messages['lacewiki.label.userList.Members']}"/>
<h:commandLink action="#{userSearch.nextPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="7">
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/page.next.gif" width="13" height="11"/>
@@ -133,12 +143,12 @@
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'username'}"/>
- Username
+ <h:outputText value="#{messages['lacewiki.label.userList.Username']}"/>
</h:commandLink>
</f:facet>
<h:outputLink value="#{wiki:renderHomeURL(u)}" rendered="#{!empty u.memberHome}">#{u.username}</h:outputLink>
- <h:outputText rendered="#{empty u.memberHome}">#{u.username}</h:outputText>
- <h:outputText rendered="#{!u.activated}"> (Not Activated)</h:outputText>
+ <h:outputText rendered="#{empty u.memberHome}" value="#{u.username}"/>
+ <h:outputText rendered="#{!u.activated}" value=" (#{messages['lacewiki.label.userList.NotActivated']})"/>
</h:column>
<h:column>
@@ -148,7 +158,7 @@
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'firstname'}"/>
- First name
+ <h:outputText value="#{messages['lacewiki.label.userList.FirstName']}"/>
</h:commandLink>
</f:facet>
#{u.firstname}
@@ -161,7 +171,7 @@
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'lastname'}"/>
- Last name
+ <h:outputText value="#{messages['lacewiki.label.userList.LastName']}"/>
</h:commandLink>
</f:facet>
#{u.lastname}
@@ -174,7 +184,7 @@
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'email'}"/>
- E-mail address
+ <h:outputText value="#{messages['lacewiki.label.userList.Email']}"/>
</h:commandLink>
</f:facet>
<h:outputLink value="#{wiki:escapeEmailURL(wiki:concat('mailto:', u.email))}">#{wiki:escapeAtSymbol(u.email)}</h:outputLink>
@@ -187,7 +197,7 @@
rendered="#{!userSearch.orderDescending and userSearch.orderByProperty == 'createdOn'}"/>
<h:graphicImage value="/themes/#{wikiPreferences.themeName}/img/sortindicator.down.gif" width="8" height="8"
rendered="#{userSearch.orderDescending and userSearch.orderByProperty == 'createdOn'}"/>
- Joined on
+ <h:outputText value="#{messages['lacewiki.label.userList.JoinedOn']}"/>
</h:commandLink>
</f:facet>
<h:outputText value="#{u.createdOn}">
@@ -198,7 +208,7 @@
<h:column rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
<s:link styleClass="buttonNonpersistent" view="/userHome_#{skin}.xhtml" propagation="none">
<f:param name="userId" value="#{u.id}"/>
- <span class="buttonLabel">Edit</span>
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.userList.Edit']}"/>
</s:link>
</h:column>
1.2 +38 -18 jboss-seam/examples/wiki/view/dirEdit_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: dirEdit_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/dirEdit_d.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- dirEdit_d.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ dirEdit_d.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -11,17 +11,21 @@
template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="screenname">
- <h:outputText value="Create directory" rendered="#{!directoryHome.managed}"/>
- <h:outputText value="Edit directory" rendered="#{directoryHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.CreateDirectory']}" rendered="#{!directoryHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.EditDirectory']}" rendered="#{directoryHome.managed}"/>
</ui:define>
<ui:define name="controlTwo">
<s:link id="exitManaged" styleClass="linkNavigation" rendered="#{directoryHome.managed}" action="exitManaged"
- accesskey="E"><u>E</u>xit Editor</s:link>
+ accesskey="#{messages['lacewiki.button.ExitEditor.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.ExitEditor']}"/>
+ </s:link>
<s:link id="exitUnmanaged" styleClass="linkNavigation" rendered="#{!directoryHome.managed}" action="exitUnmanaged"
- accesskey="E"><u>E</u>xit Editor</s:link>
+ accesskey="#{messages['lacewiki.button.ExitEditor.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.ExitEditor']}"/>
+ </s:link>
</ui:define>
@@ -46,8 +50,8 @@
<ui:include src="includes/statusIndicator.xhtml"/>
<div class="formHead">
- <h:outputText value="New directory" rendered="#{!directoryHome.managed}"/>
- <h:outputText value="Edit directory" rendered="#{directoryHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.CreateDirectory']}" rendered="#{!directoryHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.EditDirectory']}" rendered="#{directoryHome.managed}"/>
</div>
<div class="formFields formBorder">
@@ -55,14 +59,18 @@
<s:validateAll>
<s:div styleClass="entry" rendered="#{!empty directoryHome.parentDirectory}">
- <div class="label">Parent:</div>
+ <div class="label">
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.Parent']}:"/>
+ </div>
<div class="output">
<h:outputText value="#{directoryHome.parentDirectory.name}"/>
</div>
</s:div>
<s:div styleClass="entry" rendered="#{directoryHome.managed}">
- <div class="label">Created On:</div>
+ <div class="label">
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.CreatedOn']}:"/>
+ </div>
<div class="output">
<h:outputText value="#{directoryHome.instance.createdOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
@@ -75,14 +83,14 @@
</s:div>
<s:decorate id="nameDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Name</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.dirEdit.Name']}</ui:define>
<h:inputText size="25" maxlength="255" required="true" tabindex="1" value="#{directoryHome.instance.name}">
<a:support status="directoryEditForm:status" event="onblur" reRender="nameDecorate"/>
</h:inputText>
</s:decorate>
<s:decorate id="descriptionDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Description</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.dirEdit.Description']}</ui:define>
<h:inputText size="50" maxlength="512" required="false" tabindex="1" value="#{directoryHome.instance.description}">
<a:support status="directoryEditForm:status" event="onblur" reRender="descriptionDecorate"/>
</h:inputText>
@@ -96,7 +104,9 @@
<s:span id="defaultDocumentSelector">
<s:div styleClass="entry" rendered="#{directoryHome.managed and !empty directoryHome.parentDirectory and !empty directoryHome.childDocuments}">
- <div class="label">Default document:</div>
+ <div class="label">
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.DefaultDocument']}:"/>
+ </div>
<div class="input">
<h:selectOneMenu value="#{directoryHome.instance.defaultDocument}" converter="#{restrictedEntityConverter}" tabindex="2">
<s:selectItems value="#{directoryHome.childDocuments}"
@@ -110,7 +120,9 @@
<s:div styleClass="entry"
rendered="#{!empty directoryHome.instance.children and s:hasPermission('Node', 'editMenu', directoryHome.instance)}">
- <div class="label">Menu items:</div>
+ <div class="label">
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.MenuItems']}:"/>
+ </div>
<div class="input">
<h:dataTable id="menuItemTable" var="node" style="width:50%"
@@ -174,7 +186,7 @@
<div class="input">
<h:selectBooleanCheckbox value="#{directoryHome.hasFeed}" tabindex="2"
disabled="#{empty directoryHome.parentDirectory}"/>
- Enable syndication feed (disabling invalidates subcriber link)
+ <h:outputText value="#{messages['lacewiki.label.dirEdit.EnableFeed']}"/>
<a:commandLink id="resetFeed" reRender="messageBoxContainer"
action="#{directoryHome.resetFeed}"
rendered="#{!empty directoryHome.instance.feed}"
@@ -192,16 +204,24 @@
<h:commandLink id="save" styleClass="button"
action="#{directoryHome.persist}"
rendered="#{!directoryHome.managed}"
- tabindex="6" accesskey="S"><span class="buttonLabel"><u>S</u>ave</span></h:commandLink>
+ tabindex="6" accesskey="#{messages['lacewiki.button.dirEdit.Save.accesskey']}">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.dirEdit.Save']}"/>
+ </h:commandLink>
<h:commandLink id="update" styleClass="button"
action="#{directoryHome.update}"
rendered="#{directoryHome.managed}"
- tabindex="7" accesskey="U"><span class="buttonLabel"><u>U</u>pdate</span></h:commandLink>
-
- <h:outputLink id="delete" value="#" tabindex="8" accesskey="D" styleClass="button"
+ tabindex="7" accesskey="#{messages['lacewiki.button.dirEdit.Update.accesskey']}">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.dirEdit.Update']}"/>
+ </h:commandLink>
+
+ <h:outputLink id="delete" value="#" tabindex="8"
+ accesskey="#{messages['lacewiki.button.dirEdit.Delete.accesskey']}"
+ styleClass="button"
rendered="#{directoryHome.managed and !empty directoryHome.parentDirectory and directoryHome.instance.id != wikiPreferences.memberAreaId}"><j4j:idProxy
- id="openDialogDelete"/><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
+ id="openDialogDelete"/>
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.dirEdit.Delete']}"/>
+ </h:outputLink>
</div>
</div>
1.2 +37 -25 jboss-seam/examples/wiki/view/fileEdit_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: fileEdit_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/fileEdit_d.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- fileEdit_d.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ fileEdit_d.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -11,13 +11,16 @@
template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="screenname">
- <h:outputText value="Upload File" rendered="#{!fileHome.managed}"/>
- <h:outputText value="Edit File" rendered="#{fileHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.fileEdit.UploadFile']}" rendered="#{!fileHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.fileEdit.EditFile']}" rendered="#{fileHome.managed}"/>
</ui:define>
<ui:define name="controlTwo">
- <s:link id="exit" styleClass="linkNavigation" action="exit" accesskey="E"><u>E</u>xit Editor</s:link>
+ <s:link id="exit" styleClass="linkNavigation" action="exit"
+ accesskey="#{messages['lacewiki.button.ExitEditor.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.ExitEditor']}"/>
+ </s:link>
</ui:define>
@@ -47,14 +50,14 @@
<ui:include src="includes/statusIndicator.xhtml"/>
<div class="formHead">
- <h:outputText value="Create file" rendered="#{!fileHome.managed}"/>
- <h:outputText value="Edit file" rendered="#{fileHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.fileEdit.UploadFile']}" rendered="#{!fileHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.fileEdit.EditFile']}" rendered="#{fileHome.managed}"/>
</div>
<div class="formFields formBorder wideLabels">
<s:div styleClass="entry">
- <div class="label">Directory:</div>
+ <div class="label">#{messages['lacewiki.label.fileEdit.Directory']}:</div>
<div class="output">
<s:span id="directoryNameDisplay">#{fileHome.parentDirectory.name}</s:span>
@@ -65,7 +68,7 @@
</s:div>
<s:div styleClass="entry" rendered="#{fileHome.managed}">
- <div class="label">Created On:</div>
+ <div class="label">#{messages['lacewiki.label.fileEdit.CreatedOn']}:</div>
<div class="output">
<h:outputText value="#{fileHome.instance.createdOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
@@ -78,7 +81,7 @@
</s:div>
<s:decorate id="nameDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Name</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.fileEdit.Name']}</ui:define>
<h:inputText size="50" maxlength="255" required="true" tabindex="1" value="#{fileHome.instance.name}">
<a:support status="fileEditForm:status" event="onblur" reRender="nameDecorate"/>
</h:inputText>
@@ -89,7 +92,7 @@
<s:div id="details" rendered="#{fileHome.managed}">
<div class="entry">
- <div class="label">File Details:</div>
+ <div class="label">#{messages['lacewiki.label.fileEdit.FileDetails']}:</div>
<div class="output">
<h:panelGroup>
<h:outputLink value="#{wiki:renderURL(fileHome.instance)}">
@@ -103,7 +106,7 @@
<s:div rendered="#{fileHome.managed and empty fileHome.instance.imageMetaInfo and not empty fileHome.availableImporters}">
<div class="entry">
- <div class="label">Converters:</div>
+ <div class="label">#{messages['lacewiki.label.fileEdit.Converters']}:</div>
<div class="input">
<h:selectOneMenu value="#{fileHome.selectedImporter}" tabindex="1">
<s:selectItems value="#{fileHome.availableImporters}"
@@ -119,12 +122,12 @@
<s:div rendered="#{fileHome.managed and not empty fileHome.instance.imageMetaInfo}">
<div class="entry">
- <div class="label">Original Image Size:</div>
+ <div class="label">#{messages['lacewiki.label.fileEdit.OriginalImageSize']}:</div>
<div class="output">#{fileHome.instance.imageMetaInfo.sizeX} x #{fileHome.instance.imageMetaInfo.sizeY} pixel</div>
</div>
<s:div styleClass="entry" id="imagePreview">
- <div class="label">Image Preview:</div>
+ <div class="label">#{messages['lacewiki.label.fileEdit.ImagePreview']}:</div>
<div class="output">
<h:panelGrid columns="1">
<h:panelGroup>
@@ -150,14 +153,14 @@
</s:div>
<div class="entry">
- <div class="label">Show in documents:</div>
+ <div class="label">#{messages['lacewiki.label.fileEdit.ShowInDocuments']}:</div>
<div class="input">
<h:selectOneMenu value="#{fileHome.instance.imageMetaInfo.thumbnail}" styleClass="" tabindex="4">
- <f:selectItem itemLabel="Small thumbnail" itemValue="S"/>
- <f:selectItem itemLabel="Medium thumbnail" itemValue="M"/>
- <f:selectItem itemLabel="Large thumbnail" itemValue="L"/>
- <f:selectItem itemLabel="Full size " itemValue="F"/>
- <f:selectItem itemLabel="As attachment" itemValue="A"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.fileEdit.SmallThumbnail']}" itemValue="S"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.fileEdit.MediumThumbnail']}" itemValue="M"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.fileEdit.LargeThumbnail']}" itemValue="L"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.fileEdit.FullSize']}" itemValue="F"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.fileEdit.AsAttachment']}" itemValue="A"/>
</h:selectOneMenu>
</div>
</div>
@@ -166,7 +169,7 @@
<s:div id="uploadControl">
<s:decorate id="uploadDecorate" template="includes/formFieldDecorate.xhtml" rendered="#{empty fileHome.selectedImporter}">
- <ui:define name="label">Upload (max. #{wiki:displayFilesize(org.jboss.seam.web.multipartFilter.maxRequestSize)})</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.fileEdit.Upload']} (#{messages['lacewiki.label.fileEdit.UploadMax']} #{wiki:displayFilesize(org.jboss.seam.web.multipartFilter.maxRequestSize)})</ui:define>
<s:fileUpload id="upload" data="#{fileHome.filedata}" contentType="#{fileHome.contentType}" fileName="#{fileHome.filename}"/>
</s:decorate>
</s:div>
@@ -180,15 +183,24 @@
<h:commandLink id="save" action="#{fileHome.persist}"
rendered="#{!fileHome.managed}"
- tabindex="5" accesskey="S" styleClass="button"><span class="buttonLabel"><u>S</u>ave</span></h:commandLink>
+ tabindex="5" accesskey="#{messages['lacewiki.button.fileEdit.Save.accesskey']}"
+ styleClass="button">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.fileEdit.Save']}"/>
+ </h:commandLink>
<h:commandLink id="update" action="#{fileHome.update}"
rendered="#{fileHome.managed}"
- tabindex="6" accesskey="U" styleClass="button"><span class="buttonLabel"><u>U</u>pdate</span></h:commandLink>
-
- <h:outputLink id="delete" value="#" tabindex="7" accesskey="D" styleClass="button"
- rendered="#{fileHome.managed}"><j4j:idProxy
- id="openDialogDelete"/><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
+ tabindex="6" accesskey="#{messages['lacewiki.button.fileEdit.Update.accesskey']}"
+ styleClass="button">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.fileEdit.Update']}"/>
+ </h:commandLink>
+
+ <h:outputLink id="delete" value="#" tabindex="7"
+ accesskey="#{messages['lacewiki.button.fileEdit.Delete.accesskey']}"
+ styleClass="button"
+ rendered="#{fileHome.managed}"><j4j:idProxy id="openDialogDelete"/>
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.fileEdit.Delete']}"/>
+ </h:outputLink>
</div>
</div>
1.3 +25 -12 jboss-seam/examples/wiki/view/docHistory_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docHistory_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory_d.xhtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- docHistory_d.xhtml 6 Sep 2007 15:54:28 -0000 1.2
+++ docHistory_d.xhtml 12 Oct 2007 16:31:24 -0000 1.3
@@ -9,11 +9,16 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/template.xhtml">
-<ui:define name="screenname">Document History</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.docHistory.DocumentHistory']} #{nodeHistory.currentNode.name}"/>
+</ui:define>
<ui:define name="controlTwo">
- <s:link id="close" styleClass="linkNavigation" action="exit" accesskey="E">Clos<u>e</u></s:link>
+ <s:link id="close" styleClass="linkNavigation" action="exit"
+ accesskey="#{messages['lacewiki.button.Close.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.Close']}"/>
+ </s:link>
</ui:define>
@@ -22,25 +27,25 @@
<h:form rendered="#{historicalNodeList.rowCount >0}" styleClass="box">
<div class="form">
- <div class="formHead">Document History: #{nodeHistory.currentNode.name}</div>
+ <div class="formHead">#{messages['lacewiki.label.docHistory.DocumentHistory']}: #{nodeHistory.currentNode.name}</div>
<div class="formFields formBorder">
<s:div styleClass="entry">
- <div class="label">Current revision:</div>
+ <div class="label">#{messages['lacewiki.label.docHistory.CurrentRevision']}:</div>
<div class="output">
<h:outputText value="#{nodeHistory.currentNode.revision}"/>
</div>
</s:div>
<s:div styleClass="entry">
- <div class="label">Parent:</div>
+ <div class="label">#{messages['lacewiki.label.docHistory.Parent']}:</div>
<div class="output">
<h:outputText value="#{nodeHistory.currentNode.parent.name}"/>
</div>
</s:div>
<s:div styleClass="entry">
- <div class="label">Created On:</div>
+ <div class="label">#{messages['lacewiki.label.docHistory.CreatedOn']}:</div>
<div class="output">
<h:outputText value="#{nodeHistory.currentNode.createdOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
@@ -50,7 +55,7 @@
</s:div>
<s:div styleClass="entry" rendered="#{!empty nodeHistory.currentNode.lastModifiedBy}">
- <div class="label">Last Modified On:</div>
+ <div class="label">#{messages['lacewiki.label.docHistory.LastModifiedOn']}:</div>
<div class="output">
<h:outputText value="#{nodeHistory.currentNode.lastModifiedOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
@@ -60,7 +65,7 @@
</s:div>
<s:div styleClass="entry">
- <div class="label">Historical revisions:</div>
+ <div class="label">#{messages['lacewiki.label.docHistory.HistoricalRevisions']}:</div>
<div class="input">
<h:dataTable id="historyTable" var="hnode" style="width:50%"
@@ -88,14 +93,19 @@
<a:commandLink id="show"
action="#{nodeHistory.displayHistoricalRevision}"
reRender="messageBoxContainer, diffResult, historicalPreview"
- tabindex="3" styleClass="buttonNonpersistent"><span class="buttonLabel">Show</span></a:commandLink>
- <s:link id="diff" action="#{nodeHistory.diff}" tabindex="3" styleClass="buttonNonpersistent"><span class="buttonLabel">Diff</span>
+ tabindex="3" styleClass="buttonNonpersistent">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.docHistory.Show']}"/>
+ </a:commandLink>
+ <s:link id="diff" action="#{nodeHistory.diff}" tabindex="3" styleClass="buttonNonpersistent">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.docHistory.Diff']}"/>
<f:param name="historicalNodeId" value="#{hnode.historyId}"/>
</s:link>
<h:commandLink id="rollback"
action="#{nodeHistory.rollback}"
tabindex="4" styleClass="buttonNonpersistent"
- rendered="#{s:hasPermission('Node', 'edit', nodeHistory.currentNode)}"><span class="buttonLabel">Rollback</span></h:commandLink>
+ rendered="#{s:hasPermission('Node', 'edit', nodeHistory.currentNode)}">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.docHistory.Rollback']}"/>
+ </h:commandLink>
</h:column>
</h:dataTable>
@@ -112,7 +122,10 @@
<div class="input">
<h:commandLink id="purge" action="#{nodeHistory.purgeHistory}"
- tabindex="4" accesskey="U" styleClass="button"><span class="buttonLabel">P<u>u</u>rge History</span></h:commandLink>
+ tabindex="4" accesskey="#{messages['lacewiki.button.docHistory.PurgeHistory.accesskey']}"
+ styleClass="button">
+ <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.docHistory.PurgeHistory']}"/>
+ </h:commandLink>
</div>
</div>
1.7 +1 -1 jboss-seam/examples/wiki/view/message.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: message.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/message.xhtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- message.xhtml 25 Aug 2007 17:59:21 -0000 1.6
+++ message.xhtml 12 Oct 2007 16:31:24 -0000 1.7
@@ -6,7 +6,7 @@
xmlns:wiki="http://jboss.com/products/seam/wiki">
<head>
- <title>Message</title>
+ <title><h:outputText value="#{messages['lacewiki.label.Message']}"/></title>
</head>
<body>
1.4 +25 -13 jboss-seam/examples/wiki/view/docDisplay_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docDisplay_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docDisplay_m.xhtml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- docDisplay_m.xhtml 10 Oct 2007 07:09:00 -0000 1.3
+++ docDisplay_m.xhtml 12 Oct 2007 16:31:24 -0000 1.4
@@ -14,20 +14,29 @@
<ui:define name="control">
<s:link id="createDoc" styleClass="linkNavigation" view="/docEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'create', documentHome.instance.parent)}">Create
+ accesskey="#{messages['lacewiki.button.CreateDocument.accesskey']}"
+ rendered="#{s:hasPermission('Node', 'create', documentHome.instance.parent)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.CreateDocument']}"/>
<f:param name="documentId" value=""/>
<f:param name="parentDirectoryId" value="#{documentHome.instance.parent.id}"/>
</s:link>
<s:link id="editDoc" styleClass="linkNavigation" view="/docEdit_#{skin}.xhtml"
- rendered="#{s:hasPermission('Node', 'edit', documentHome.instance)}">Edit</s:link>
+ accesskey="#{messages['lacewiki.button.EditDocument.accesskey']}"
+ rendered="#{s:hasPermission('Node', 'edit', documentHome.instance)}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.EditDocument']}"/>
+ </s:link>
<s:link id="showHistory" styleClass="linkNavigation" view="/docHistory_#{skin}.xhtml"
- rendered="#{documentHome.historicalNodesPresent}">History
+ accesskey="#{messages['lacewiki.button.HistoryDocument.accesskey']}"
+ rendered="#{documentHome.historicalNodesPresent}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.HistoryDocument']}"/>
<f:param name="nodeId" value="#{documentHome.nodeId}"/>
</s:link>
- <s:link id="browseDir" styleClass="linkNavigation" view="/dirDisplay_#{skin}.xhtml">Browse
+ <s:link id="browseDir" styleClass="linkNavigation" view="/dirDisplay_#{skin}.xhtml"
+ accesskey="#{messages['lacewiki.button.BrowseDirectory.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.BrowseDirectory']}"/>
<f:param name="directoryId" value="#{documentHome.parentDirectory.id}"/>
</s:link>
@@ -52,7 +61,10 @@
<s:fragment rendered="#{not empty commentHome.comments and documentHome.instance.enableComments}">
<br/>
<div class="boxHeader">
- #{wiki:sizeOf(commentHome.comments)} comment(s):
+ <h:outputText value="#{wiki:sizeOf(commentHome.comments)} #{messages['lacewiki.label.commentsDisplay.Comment']}:"
+ rendered="#{wiki:sizeOf(commentHome.comments) == 1}"/>
+ <h:outputText value="#{wiki:sizeOf(commentHome.comments)} #{messages['lacewiki.label.commentsDisplay.Comments']}:"
+ rendered="#{wiki:sizeOf(commentHome.comments) > 1}"/>
</div>
<h:panelGrid columns="1" rowClasses="rowEven, rowOdd">
@@ -114,20 +126,20 @@
<s:fragment rendered="#{documentHome.instance.enableComments and documentHome.instance.enableCommentForm}">
<br/>
- <div class="boxHeader">Post Comment:</div>
+ <div class="boxHeader">#{messages['lacewiki.label.commentForm.PostComment']}:</div>
<h:form id="commentForm"><s:validateAll>
<div class="errorMessage"><h:message for="userName"/></div>
- <div>Name: <br/><h:inputText size="30" maxlength="100" required="true" id="userName" value="#{commentHome.comment.fromUserName}"/></div>
+ <div>#{messages['lacewiki.label.commentForm.Name']}: <br/><h:inputText size="30" maxlength="100" required="true" id="userName" value="#{commentHome.comment.fromUserName}"/></div>
<div class="errorMessage"><h:message for="userEmail"/></div>
- <div>E-mail address (optional): <br/><h:inputText size="30" maxlength="255" required="false" id="userEmail" value="#{commentHome.comment.fromUserEmail}"/></div>
+ <div>#{messages['lacewiki.label.commentForm.Email']}: <br/><h:inputText size="30" maxlength="255" required="false" id="userEmail" value="#{commentHome.comment.fromUserEmail}"/></div>
<div class="errorMessage"><h:message for="userHomepage"/></div>
- <div>Homepage URL (optional): <br/><h:inputText size="30" maxlength="1000" required="false" id="userHomepage" value="#{commentHome.comment.fromUserHomepage}"/></div>
+ <div>#{messages['lacewiki.label.commentForm.Homepage']}: <br/><h:inputText size="30" maxlength="1000" required="false" id="userHomepage" value="#{commentHome.comment.fromUserHomepage}"/></div>
<div class="errorMessage"><h:message for="subject"/></div>
- <div>Subject: <br/><h:inputText size="30" maxlength="255" required="true" id="subject" value="#{commentHome.comment.subject}"/></div>
+ <div>#{messages['lacewiki.label.commentForm.Subject']}: <br/><h:inputText size="30" maxlength="255" required="true" id="subject" value="#{commentHome.comment.subject}"/></div>
<div class="errorMessage"><h:message for="comment"/></div>
<div>
@@ -139,14 +151,14 @@
</div>
<s:div rendered="#{!identity.loggedIn}">
- <div>Verification question: What is the result of <h:outputText value="#{captcha.question}"/>?</div>
+ <div>#{messages['lacewiki.label.VerificationQuestion']}: #{messages['lacewiki.label.VerificationQuestionQuestion']} <h:outputText value="#{captcha.question}"/>?</div>
<div class="errorMessage"><h:message for="verifyCaptcha"/></div>
- <div>Enter response: </div>
+ <div>#{messages['lacewiki.label.VerificationEnterResponse']}: </div>
<h:inputText size="5" maxlength="5" required="true" id="verifyCaptcha" value="#{captcha.response}"/>
</s:div>
<div class="formControls">
- <h:commandButton action="#{commentHome.persist}" value="Post Comment"/>
+ <h:commandButton action="#{commentHome.persist}" value="#{messages['lacewiki.label.commentForm.PostComment']}"/>
</div>
</s:validateAll></h:form>
1.8 +51 -30 jboss-seam/examples/wiki/view/docEdit_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docEdit_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docEdit_d.xhtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- docEdit_d.xhtml 2 Oct 2007 04:02:45 -0000 1.7
+++ docEdit_d.xhtml 12 Oct 2007 16:31:24 -0000 1.8
@@ -11,17 +11,21 @@
template="themes/#{wikiPreferences.themeName}/template.xhtml">
<ui:define name="screenname">
- <h:outputText value="Create document" rendered="#{!documentHome.managed}"/>
- <h:outputText value="Edit document" rendered="#{documentHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.docEdit.CreateDocument']}" rendered="#{!documentHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.docEdit.EditDocument']}" rendered="#{documentHome.managed}"/>
</ui:define>
<ui:define name="controlTwo">
<s:link id="exitManaged" styleClass="linkNavigation" rendered="#{documentHome.managed}" action="exitManaged"
- accesskey="E"><u>E</u>xit Editor</s:link>
+ accesskey="#{messages['lacewiki.button.ExitEditor.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.ExitEditor']}"/>
+ </s:link>
<s:link id="exitUnmanaged" styleClass="linkNavigation" rendered="#{!documentHome.managed}" action="exitUnmanaged"
- accesskey="E"><u>E</u>xit Editor</s:link>
+ accesskey="#{messages['lacewiki.button.ExitEditor.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.ExitEditor']}"/>
+ </s:link>
</ui:define>
@@ -59,8 +63,8 @@
<ul>
<li class="formTabsTitle">
- <h:outputText value="Create document" rendered="#{!documentHome.managed}"/>
- <h:outputText value="Edit document" rendered="#{documentHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.docEdit.CreateDocument']}" rendered="#{!documentHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.docEdit.EditDocument']}" rendered="#{documentHome.managed}"/>
</li>
<li id="docContentTab"><a href="#docContent" accesskey="C"><u>C</u>ontent</a></li>
<li id="docPropertiesTab"><a href="#docProperties" accesskey="T">Proper<u>t</u>ies</a></li>
@@ -74,7 +78,7 @@
<div class="formFields">
<s:div styleClass="entry">
- <div class="label">Directory:</div>
+ <div class="label">#{messages['lacewiki.label.docEdit.Directory']}:</div>
<div class="output">
<s:span id="directoryNameDisplay">#{documentHome.parentDirectory.name}</s:span>
@@ -88,7 +92,7 @@
<s:decorate id="nameDecorate" template="includes/formFieldDecorate.xhtml">
<ui:param name="tabId" value="docContentTab"/>
<ui:param name="fieldId" value="name"/>
- <ui:define name="label">Name</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.docEdit.Name']}</ui:define>
<h:inputText tabindex="1" size="70" maxlength="255" required="true" value="#{documentHome.instance.name}">
<a:support status="docEditForm:status" event="onblur" reRender="nameDecorate, contentPreview"/>
</h:inputText>
@@ -100,7 +104,7 @@
<h:selectBooleanCheckbox value="#{documentHome.instance.nameAsTitle}" tabindex="1">
<a:support status="docEditForm:status" event="onchange" reRender="contentPreview"/>
</h:selectBooleanCheckbox>
- Render name as document title
+ <h:outputText value="#{messages['lacewiki.label.docEdit.RenderNameAsTitle']}"/>
</div>
</s:div>
@@ -108,7 +112,7 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{documentHome.minorRevision}" tabindex="1"/>
- Minor change, don't create a new revision
+ <h:outputText value="#{messages['lacewiki.label.docEdit.MinorChange']}"/>
</div>
</s:div>
@@ -119,7 +123,7 @@
<h:selectBooleanCheckbox value="#{documentHome.pushOnFeeds}" tabindex="1">
<a:support status="docEditForm:status" event="onchange" reRender="pushOnSiteFeedSwitchUnmanaged"/>
</h:selectBooleanCheckbox>
- Create entry on parent directory feeds
+ <h:outputText value="#{messages['lacewiki.label.docEdit.CreateOnParentFeeds']}"/>
</div>
</s:div>
<s:div id="pushOnSiteFeedSwitchUnmanaged">
@@ -127,7 +131,7 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox disabled="#{not documentHome.pushOnFeeds}" value="#{documentHome.pushOnSiteFeed}" tabindex="1"/>
- Create entry on global site feed
+ <h:outputText value="#{messages['lacewiki.label.docEdit.CreateOnSiteFeed']}"/>
</div>
</s:div>
</s:div>
@@ -139,7 +143,7 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox value="#{documentHome.pushOnFeeds}" tabindex="1"/>
- Push changes onto feeds
+ <h:outputText value="#{messages['lacewiki.label.docEdit.PushOnFeeds']}"/>
</div>
</s:div>
</s:fragment>
@@ -150,7 +154,7 @@
<h:selectBooleanCheckbox value="#{documentHome.pushOnFeeds}" tabindex="1">
<a:support status="docEditForm:status" event="onchange" reRender="pushOnSiteFeedSwitch"/>
</h:selectBooleanCheckbox>
- Push changes onto feeds of parent directories
+ <h:outputText value="#{messages['lacewiki.label.docEdit.PushOnParentFeeds']}"/>
</div>
</s:div>
<s:div id="pushOnSiteFeedSwitch">
@@ -158,7 +162,7 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox disabled="#{not documentHome.pushOnFeeds}" value="#{documentHome.pushOnSiteFeed}" tabindex="1"/>
- Create entry on global site feed
+ <h:outputText value="#{messages['lacewiki.label.docEdit.CreateOnSiteFeed']}"/>
</div>
</s:div>
</s:div>
@@ -169,7 +173,7 @@
<ui:param name="textEditorId" value="content"/>
<ui:param name="textPreviewId" value="#{documentHome.enabledPreview ? 'contentPreview' : ''}"/>
<ui:param name="namingContainer" value="docEditForm"/>
- <ui:param name="label" value="Content"/>
+ <ui:param name="label" value="#{messages['lacewiki.label.docEdit.Content']}"/>
<ui:param name="textEditorColumns" value="#{docEditorPreferences.properties['regularEditAreaColumns']}"/>
<ui:param name="textEditorRows" value="#{docEditorPreferences.properties['regularEditAreaRows']}"/>
<ui:param name="valueBinding" value="#{documentHome.formContent}"/>
@@ -186,7 +190,7 @@
event="onchange"
reRender="contentPreview, docEditForm:contentTextEditor, pluginSwitch"/>
</h:selectBooleanCheckbox>
- Enable live preview
+ <h:outputText value="#{messages['lacewiki.label.docEdit.EnableLivePreview']}"/>
</div>
</s:div>
@@ -197,7 +201,7 @@
<h:selectBooleanCheckbox value="#{documentHome.showPluginPrefs}" tabindex="1">
<a:support status="docEditForm:status" event="onchange" reRender="contentPreview"/>
</h:selectBooleanCheckbox>
- Show plugin settings in preview
+ <h:outputText value="#{messages['lacewiki.label.docEdit.ShowPluginSettings']}"/>
</div>
</s:div>
</s:div>
@@ -213,7 +217,9 @@
<div class="formFields">
<s:div styleClass="entry" rendered="#{documentHome.managed}">
- <div class="label">Created On:</div>
+ <div class="label">
+ <h:outputText value="#{messages['lacewiki.label.docEdit.CreatedOn']}:"/>
+ </div>
<div class="output">
<h:outputText value="#{documentHome.instance.createdOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
@@ -229,12 +235,14 @@
<s:div styleClass="entry">
- <div class="label">Options:</div>
+ <div class="label">
+ <h:outputText value="#{messages['lacewiki.label.docEdit.Options']}:"/>
+ </div>
<div class="input">
<h:selectBooleanCheckbox value="#{documentHome.instance.enableComments}" tabindex="1">
<a:support status="docEditForm:status" event="onchange" reRender="commentFormSwitch"/>
</h:selectBooleanCheckbox>
- Enable comments
+ <h:outputText value="#{messages['lacewiki.label.docEdit.EnableComments']}"/>
</div>
</s:div>
@@ -243,13 +251,15 @@
<div class="label"> </div>
<div class="input">
<h:selectBooleanCheckbox disabled="#{not documentHome.instance.enableComments}" value="#{documentHome.instance.enableCommentForm}" tabindex="1"/>
- Allow posting of new comments
+ <h:outputText value="#{messages['lacewiki.label.docEdit.AllowCommentPosting']}"/>
</div>
</s:div>
</s:div>
<s:div styleClass="entry">
- <div class="label">Tags:</div>
+ <div class="label">
+ <h:outputText value="#{messages['lacewiki.label.docEdit.Tags']}:"/>
+ </div>
<div class="input">
<h:inputText id="tagsInput" tabindex="1" size="70" maxlength="1024" required="false" value="#{documentHome.instance.tags}">
<a:support event="onblur" reRender="popularTagsList"/>
@@ -274,7 +284,9 @@
reRender="popularTagsList"/>
<s:div styleClass="entry" id="popularTagsList">
- <div class="label">Popular Tags:</div>
+ <div class="label">
+ <h:outputText value="#{messages['lacewiki.label.docEdit.PopularTags']}:"/>
+ </div>
<div class="input">
<h:panelGroup>
<ui:repeat var="tagCount" value="#{documentHome.popularTags}">
@@ -306,15 +318,24 @@
<h:commandLink id="save" action="#{documentHome.persist}"
rendered="#{!documentHome.managed}"
- tabindex="1" accesskey="S" styleClass="button saveButton"><span class="buttonLabel"><u>S</u>ave</span></h:commandLink>
+ tabindex="1" accesskey="#{messages['lacewiki.button.docEdit.Save.accesskey']}"
+ styleClass="button saveButton">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.docEdit.Save']}"/>
+ </h:commandLink>
<h:commandLink id="update" action="#{documentHome.update}"
rendered="#{documentHome.managed}"
- tabindex="1" accesskey="U" styleClass="button saveButton"><span class="buttonLabel"><u>U</u>pdate</span></h:commandLink>
-
- <h:outputLink id="delete" value="#" tabindex="1" accesskey="D" styleClass="button"
- rendered="#{documentHome.managed and documentHome.instance.id != wikiStart.id}"><j4j:idProxy
- id="openDialogDelete"/><span class="buttonLabel"><u>D</u>elete</span></h:outputLink>
+ tabindex="1" accesskey="#{messages['lacewiki.button.docEdit.Update.accesskey']}"
+ styleClass="button saveButton">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.docEdit.Update']}"/>
+ </h:commandLink>
+
+ <h:outputLink id="delete" value="#" tabindex="1"
+ accesskey="#{messages['lacewiki.button.docEdit.Delete.accesskey']}"
+ styleClass="button"
+ rendered="#{documentHome.managed and documentHome.instance.id != wikiStart.id}"><j4j:idProxy id="openDialogDelete"/>
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.docEdit.Delete']}"/>
+ </h:outputLink>
</div>
</div>
1.2 +22 -9 jboss-seam/examples/wiki/view/search_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: search_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/search_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- search_m.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ search_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -8,11 +8,16 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
-<ui:define name="screenname">Search: #{wikiSearch.simpleQuery}</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.search.Search']}: #{wikiSearch.simpleQuery}"/>
+</ui:define>
<ui:define name="control">
- <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end">Close</s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end"
+ accesskey="#{messages['lacewiki.button.Close.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.Close']}"/>
+ </s:link>
</ui:define>
@@ -21,7 +26,7 @@
<h:form id="searchForm">
<h:inputText value="#{wikiSearch.simpleQuery}" size="28" maxlength="1000"/>
- <h:commandButton action="#{wikiSearch.search()}" value="Find"/>
+ <h:commandButton action="#{wikiSearch.search()}" value="#{messages['lacewiki.button.Find']}"/>
</h:form>
@@ -30,11 +35,19 @@
<h:panelGrid columns="5"
cellpadding="0" cellspacing="0" border="0"
rendered="#{wikiSearch.totalCount > 0}">
- <h:commandButton action="#{wikiSearch.firstPage()}" rendered="#{wikiSearch.previousPageAvailable}" value="First Page"/>
- <h:commandButton action="#{wikiSearch.previousPage()}" rendered="#{wikiSearch.previousPageAvailable}" value="Previous Page"/>
- <h:outputText value="#{wikiSearch.firstRow} to #{wikiSearch.lastRow} of #{wikiSearch.totalCount} hit(s)"/>
- <h:commandButton action="#{wikiSearch.nextPage()}" rendered="#{wikiSearch.nextPageAvailable}" value="Next Page"/>
- <h:commandButton action="#{wikiSearch.lastPage()}" rendered="#{wikiSearch.nextPageAvailable}" value="Last Page"/>
+ <h:commandButton action="#{wikiSearch.firstPage()}" rendered="#{wikiSearch.previousPageAvailable}"
+ value="#{messages['lacewiki.button.FirstPage']}"/>
+ <h:commandButton action="#{wikiSearch.previousPage()}" rendered="#{wikiSearch.previousPageAvailable}"
+ value="#{messages['lacewiki.button.PreviousPage']}"/>
+
+ <h:outputText value="#{wikiSearch.firstRow} #{messages['lacewiki.label.search.To']}
+ #{wikiSearch.lastRow} #{messages['lacewiki.label.search.Of']}
+ #{wikiSearch.totalCount} #{messages['lacewiki.label.search.Hits']}"/>
+
+ <h:commandButton action="#{wikiSearch.nextPage()}" rendered="#{wikiSearch.nextPageAvailable}"
+ value="#{messages['lacewiki.button.NextPage']}"/>
+ <h:commandButton action="#{wikiSearch.lastPage()}" rendered="#{wikiSearch.nextPageAvailable}"
+ value="#{messages['lacewiki.button.LastPage']}"/>
</h:panelGrid>
</h:form>
</s:div>
@@ -58,7 +71,7 @@
</h:dataTable>
<s:div styleClass="formFields minorPadding" rendered="#{wikiSearch.totalCount == 0}">
- <h:outputText value="No hits, please try again."/>
+ <h:outputText value="#{messages['lacewiki.label.search.NoHits']}"/>
</s:div>
</s:div>
1.2 +4 -2 jboss-seam/examples/wiki/view/adminHome_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: adminHome_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/adminHome_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- adminHome_m.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ adminHome_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -8,10 +8,12 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
-<ui:define name="screenname">Administration</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.adminHome.Administration']}"/>
+</ui:define>
<ui:define name="content">
- Administration is not available with this skin.
+ <h:outputText value="#{messages['lacewiki.label.adminHome.NotAvailableForSkin']}"/>
</ui:define>
</ui:composition>
1.2 +18 -13 jboss-seam/examples/wiki/view/docHistory_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: docHistory_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/docHistory_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- docHistory_m.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ docHistory_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -8,31 +8,36 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
-<ui:define name="screenname">Document History: #{nodeHistory.currentNode.name}</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.docHistory.DocumentHistory']} #{nodeHistory.currentNode.name}"/>
+</ui:define>
<ui:define name="control">
- <s:link id="close" styleClass="linkNavigation" action="exit">Close</s:link>
+ <s:link id="close" styleClass="linkNavigation" action="exit"
+ accesskey="#{messages['lacewiki.button.Close.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.Close']}"/>
+ </s:link>
</ui:define>
<ui:define name="content">
<h:form rendered="#{historicalNodeList.rowCount >0}" styleClass="box">
- <div>Current revision: <h:outputText value="#{nodeHistory.currentNode.revision}"/></div>
- <div>Parent: <h:outputText value="#{nodeHistory.currentNode.parent.name}"/></div>
- <div>Created On: 
+ <div>#{messages['lacewiki.label.docHistory.CurrentRevision']}: <h:outputText value="#{nodeHistory.currentNode.revision}"/></div>
+ <div>#{messages['lacewiki.label.docHistory.Parent']}: <h:outputText value="#{nodeHistory.currentNode.parent.name}"/></div>
+ <div>#{messages['lacewiki.label.docHistory.CreatedOn']}: 
<h:outputText value="#{nodeHistory.currentNode.createdOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
</h:outputText>
(#{nodeHistory.currentNode.createdBy.username})
</div>
- <div>Last Modified On: 
+ <div>#{messages['lacewiki.label.docHistory.LastModifiedOn']}: 
<h:outputText value="#{nodeHistory.currentNode.lastModifiedOn}">
<f:convertDateTime type="both" timeZone="#{wikiPreferences.timeZone}"/>
</h:outputText>
(#{nodeHistory.currentNode.lastModifiedBy.username})
</div>
- <div>Historical revisions:</div>
+ <div>#{messages['lacewiki.label.docHistory.HistoricalRevisions']}:</div>
<h:dataTable id="historyTable" var="hnode"
value="#{historicalNodeList}"
@@ -52,20 +57,20 @@
</h:column>
<h:column>
- <h:commandButton action="#{nodeHistory.displayHistoricalRevision}" value="Show"/>
- </h:column>
- <h:column>
- <h:commandButton action="#{nodeHistory.diff}" value="Diff"/>
+ <h:commandButton action="#{nodeHistory.displayHistoricalRevision}"
+ value="#{messages['lacewiki.button.Show']}"/>
</h:column>
<h:column>
- <h:commandButton action="#{nodeHistory.rollback}" value="Rollback"
+ <h:commandButton action="#{nodeHistory.rollback}"
+ value="#{messages['lacewiki.button.Rollback']}"
rendered="#{s:hasPermission('Node', 'edit', nodeHistory.currentNode)}"/>
</h:column>
</h:dataTable>
<s:div rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}" styleClass="formControls">
- <h:commandButton id="purge" action="#{nodeHistory.purgeHistory}" value="Purge History"/>
+ <h:commandButton id="purge" action="#{nodeHistory.purgeHistory}"
+ value="#{messages['lacewiki.button.PurgeHistory']}"/>
</s:div>
</h:form>
1.2 +40 -15 jboss-seam/examples/wiki/view/userRegister_d.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userRegister_d.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userRegister_d.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- userRegister_d.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ userRegister_d.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -9,11 +9,16 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/template.xhtml">
-<ui:define name="screenname">Registration</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.userRegister.Registration']}"/>
+</ui:define>
<ui:define name="controlTwo">
- <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end" accesskey="E">Clos<u>e</u></s:link>
+ <s:link id="close" styleClass="linkNavigation" view="/wiki.xhtml" propagation="end"
+ accesskey="#{messages['lacewiki.button.Close.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.Close']}"/>
+ </s:link>
</ui:define>
@@ -25,71 +30,87 @@
<ui:include src="includes/statusIndicator.xhtml"/>
<div class="formHead">
- <h:outputText rendered="#{not s:hasPermission('User', 'isAdmin', currentUser)}" value="Register new account"/>
- <h:outputText rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}" value="Create new account"/>
+ <h:outputText rendered="#{not s:hasPermission('User', 'isAdmin', currentUser)}"
+ value="#{messages['lacewiki.label.userRegister.RegisterNewAccount']}"/>
+ <h:outputText rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"
+ value="#{messages['lacewiki.label.userRegister.CreateNewAccount']}"/>
</div>
<div class="formFields formBorder wideLabels">
+ <a:region>
<s:decorate id="firstnameDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">First name</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userRegister.FirstName']}</ui:define>
<h:inputText tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.firstname}">
<a:support status="userRegisterForm:status" event="onblur" reRender="firstnameDecorate"/>
</h:inputText>
</s:decorate>
+ </a:region>
+ <a:region>
<s:decorate id="lastnameDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Last name</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userRegister.LastName']}</ui:define>
<h:inputText tabindex="1" size="40" maxlength="63" required="true" value="#{userHome.instance.lastname}">
<a:support status="userRegisterForm:status" event="onblur" reRender="lastnameDecorate"/>
</h:inputText>
</s:decorate>
+ </a:region>
+ <a:region>
<s:decorate id="emailDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">E-Mail</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userRegister.Email']}</ui:define>
<h:inputText tabindex="3" size="40" maxlength="255" required="true" value="#{userHome.instance.email}">
<a:support status="userRegisterForm:status" event="onblur" reRender="emailDecorate"/>
</h:inputText>
</s:decorate>
+ </a:region>
+ <a:region>
<s:decorate id="usernameDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Username</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userRegister.Username']}</ui:define>
<h:inputText tabindex="4" size="16" maxlength="16" required="true" id="username" value="#{userHome.instance.username}">
<a:support status="userRegisterForm:status" event="onblur" action="#{userHome.validateUsername}" reRender="usernameDecorate"/>
</h:inputText>
</s:decorate>
+ </a:region>
+ <a:region>
<s:decorate id="passwordDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Password</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userRegister.Password']}</ui:define>
<h:inputSecret tabindex="5" size="15" maxlength="15"
redisplay="true" value="#{userHome.password}">
<a:support status="userRegisterForm:status" event="onblur" action="#{userHome.validatePassword}" reRender="passwordDecorate"/>
</h:inputSecret>
</s:decorate>
+ </a:region>
+ <a:region>
<s:decorate id="passwordControlDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Repeat password</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.userRegister.RepeatPassword']}</ui:define>
<h:inputSecret tabindex="6" size="15" maxlength="15"
redisplay="true" value="#{userHome.passwordControl}">
<a:support status="userRegisterForm:status" event="onblur" action="#{userHome.validatePasswordControl}" reRender="passwordControlDecorate"/>
</h:inputSecret>
</s:decorate>
+ </a:region>
+ <a:region>
<s:div rendered="#{not s:hasPermission('User', 'isAdmin', currentUser)}">
<s:div styleClass="entry">
- <div class="label">Verification question:</div>
+ <div class="label">#{messages['lacewiki.label.VerificationQuestion']}:</div>
<div class="output">
- What is the result of <h:outputText value="#{captcha.question}"/>?
+ #{messages['lacewiki.label.VerificationQuestionQuestion']} <h:outputText value="#{captcha.question}"/>?
</div>
</s:div>
<s:decorate id="verifyCaptchaDecorate" template="includes/formFieldDecorate.xhtml">
- <ui:define name="label">Enter response</ui:define>
+ <ui:define name="label">#{messages['lacewiki.label.VerificationEnterResponse']}</ui:define>
<h:inputSecret tabindex="7" size="5" maxlength="5" required="true"
redisplay="true" id="verifyCaptcha" value="#{captcha.response}">
</h:inputSecret>
</s:decorate>
</s:div>
+ </a:region>
</div>
@@ -101,11 +122,15 @@
<h:commandLink id="register" styleClass="button" rendered="#{not s:hasPermission('User', 'isAdmin', currentUser)}"
action="#{userHome.persist}"
- tabindex="8" accesskey="G"><span class="buttonLabel">Re<u>g</u>ister</span></h:commandLink>
+ tabindex="8" accesskey="#{messages['lacewiki.button.userRegister.Register.accesskey']}">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.userRegister.Register']}"/>
+ </h:commandLink>
<h:commandLink id="create" styleClass="button" rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"
action="#{userHome.persist}"
- tabindex="8" accesskey="C"><span class="buttonLabel"><u>C</u>reate Account</span></h:commandLink>
+ tabindex="8" accesskey="#{messages['lacewiki.button.userRegister.Create.accesskey']}">
+ <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.userRegister.Create']}"/>
+ </h:commandLink>
</div>
</div>
1.2 +4 -2 jboss-seam/examples/wiki/view/userList_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userList_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userList_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- userList_m.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ userList_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -8,10 +8,12 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
-<ui:define name="screenname">User List</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.userList.MemberList']}"/>
+</ui:define>
<ui:define name="content">
- User search is not available with this skin.
+ <h:outputText value="#{messages['lacewiki.label.userList.NotAvailableForSkin']}"/>
</ui:define>
</ui:composition>
1.2 +32 -21 jboss-seam/examples/wiki/view/fileEdit_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: fileEdit_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/fileEdit_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- fileEdit_m.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ fileEdit_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -9,13 +9,16 @@
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
<ui:define name="screenname">
- <h:outputText value="Upload File" rendered="#{!fileHome.managed}"/>
- <h:outputText value="Edit File" rendered="#{fileHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.fileEdit.UploadFile']}" rendered="#{!fileHome.managed}"/>
+ <h:outputText value="#{messages['lacewiki.label.fileEdit.EditFile']}" rendered="#{fileHome.managed}"/>
</ui:define>
<ui:define name="control">
- <s:link id="exit" styleClass="linkNavigation" action="exit">Exit</s:link>
+ <s:link id="exit" styleClass="linkNavigation" action="exit"
+ accesskey="#{messages['lacewiki.button.ExitEditor.accesskey']}">
+ <h:outputText escape="false" value="#{messages['lacewiki.button.ExitEditor']}"/>
+ </s:link>
</ui:define>
@@ -23,13 +26,13 @@
<h:form enctype="multipart/form-data"><s:validateAll>
- <div>Directory: #{fileHome.parentDirectory.name}</div>
+ <div>#{messages['lacewiki.label.fileEdit.Directory']}: #{fileHome.parentDirectory.name}</div>
<div class="errorMessage"><h:message for="name"/></div>
- <div>Name: 
+ <div>#{messages['lacewiki.label.fileEdit.Name']}: 
<h:inputText id="name" size="30" maxlength="255" required="true" value="#{fileHome.instance.name}"/>
</div>
<s:div rendered="#{fileHome.managed}">
- File Details: 
+ #{messages['lacewiki.label.fileEdit.FileDetails']}: 
<h:panelGroup>
<h:outputLink value="#{wiki:renderURL(fileHome.instance)}">
<h:outputText value="#{fileHome.instance.filename}, #{wiki:displayFilesize(fileHome.instance.filesize)}, #{fileHome.instance.contentType}"/>
@@ -39,13 +42,16 @@
<s:div rendered="#{fileHome.managed and not empty fileHome.instance.imageMetaInfo}">
<div>
- Original Image Size: #{fileHome.instance.imageMetaInfo.sizeX} x #{fileHome.instance.imageMetaInfo.sizeY} pixel
+ #{messages['lacewiki.label.fileEdit.OriginalImageSize']}: #{fileHome.instance.imageMetaInfo.sizeX} x #{fileHome.instance.imageMetaInfo.sizeY} pixel
</div>
<h:panelGrid columns="1">
<h:panelGroup>
- <h:commandButton id="zoomOut" action="#{fileHome.zoomPreviewOut}" value="Zoom Out"/>
- <h:commandButton id="actualSize" action="#{fileHome.zoomActualSize}" value="Actual Size"/>
- <h:commandButton id="zoomIn" action="#{fileHome.zoomPreviewIn}" value="Zoom In"/>
+ <h:commandButton id="zoomOut" action="#{fileHome.zoomPreviewOut}"
+ value="#{messages['lacewiki.button.fileEdit.ZoomOut']}"/>
+ <h:commandButton id="actualSize" action="#{fileHome.zoomActualSize}"
+ value="#{messages['lacewiki.button.fileEdit.ActualSize']}"/>
+ <h:commandButton id="zoomIn" action="#{fileHome.zoomPreviewIn}"
+ value="#{messages['lacewiki.button.fileEdit.ZoomIn']}"/>
</h:panelGroup>
<h:outputLink value="#{facesContext.externalContext.requestContextPath}/servlets/files/download.seam?fileId=#{fileHome.instance.id}">
<s:graphicImage value="#{fileHome.instance.data}" style="border: 1px solid black;">
@@ -53,27 +59,32 @@
</s:graphicImage>
</h:outputLink>
</h:panelGrid>
- <div>Show in documents: 
- <h:selectOneMenu value="#{fileHome.instance.imageMetaInfo.thumbnail}">
- <f:selectItem itemLabel="Small thumbnail" itemValue="S"/>
- <f:selectItem itemLabel="Medium thumbnail" itemValue="M"/>
- <f:selectItem itemLabel="Large thumbnail" itemValue="L"/>
- <f:selectItem itemLabel="Full size " itemValue="F"/>
- <f:selectItem itemLabel="As attachment" itemValue="A"/>
+
+ <div>#{messages['lacewiki.label.fileEdit.ShowInDocuments']}: 
+ <h:selectOneMenu value="#{fileHome.instance.imageMetaInfo.thumbnail}" styleClass="" tabindex="4">
+ <f:selectItem itemLabel="#{messages['lacewiki.label.fileEdit.SmallThumbnail']}" itemValue="S"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.fileEdit.MediumThumbnail']}" itemValue="M"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.fileEdit.LargeThumbnail']}" itemValue="L"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.fileEdit.FullSize']}" itemValue="F"/>
+ <f:selectItem itemLabel="#{messages['lacewiki.label.fileEdit.AsAttachment']}" itemValue="A"/>
</h:selectOneMenu>
</div>
+
</s:div>
<div>
- Upload (max. #{wiki:displayFilesize(org.jboss.seam.web.multipartFilter.maxRequestSize)}): 
+ #{messages['lacewiki.label.fileEdit.Upload']} (#{messages['lacewiki.label.fileEdit.UploadMax']} #{wiki:displayFilesize(org.jboss.seam.web.multipartFilter.maxRequestSize)}): 
<s:fileUpload id="upload" data="#{fileHome.filedata}" contentType="#{fileHome.contentType}" fileName="#{fileHome.filename}"/>
</div>
<div class="formControls">
- <h:commandButton action="#{fileHome.persist}" rendered="#{!fileHome.managed}" value="Save"/>
- <h:commandButton action="#{fileHome.update}" rendered="#{fileHome.managed}" value="Update"/>
- <h:commandButton action="#{fileHome.remove}" rendered="#{fileHome.managed}" value="Delete"/>
+ <h:commandButton action="#{fileHome.persist}" rendered="#{!fileHome.managed}"
+ value="#{messages['lacewiki.button.Save']}"/>
+ <h:commandButton action="#{fileHome.update}" rendered="#{fileHome.managed}"
+ value="#{messages['lacewiki.button.Update']}"/>
+ <h:commandButton action="#{fileHome.remove}" rendered="#{fileHome.managed}"
+ value="#{messages['lacewiki.button.Delete']}"/>
</div>
1.2 +4 -2 jboss-seam/examples/wiki/view/userHome_m.xhtml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: userHome_m.xhtml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/userHome_m.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- userHome_m.xhtml 4 Sep 2007 09:33:18 -0000 1.1
+++ userHome_m.xhtml 12 Oct 2007 16:31:24 -0000 1.2
@@ -8,10 +8,12 @@
xmlns:wiki="http://jboss.com/products/seam/wiki"
template="themes/#{wikiPreferences.themeName}/#{skin}/template.xhtml">
-<ui:define name="screenname">Member Account</ui:define>
+<ui:define name="screenname">
+ <h:outputText value="#{messages['lacewiki.label.userHome.MemberAccount']}"/>
+</ui:define>
<ui:define name="content">
- Account management is not available with this skin.
+ <h:outputText value="#{messages['lacewiki.label.userHome.NotAvailableForSkin']}"/>
</ui:define>
</ui:composition>
More information about the jboss-cvs-commits
mailing list