[jboss-cvs] jboss-seam/examples/wiki/view/includes ...

Christian Bauer christian at hibernate.org
Fri Oct 12 12:31:26 EDT 2007


  User: cbauer  
  Date: 07/10/12 12:31:26

  Modified:    examples/wiki/view/includes            
                        deleteConfirmation.xhtml commentsDisplay.xhtml
                        ownerSelector.xhtml wikiTextEditor.xhtml
                        accessLevelSelector.xhtml userControl.xhtml
                        popupDialog.xhtml searchControl.xhtml
                        commentForm.xhtml helpPopup.xhtml
                        attachmentDisplay.xhtml
  Removed:     examples/wiki/view/includes             previewPopup.xhtml
  Log:
  Internationalized almost all strings
  
  Revision  Changes    Path
  1.8       +4 -4      jboss-seam/examples/wiki/view/includes/deleteConfirmation.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: deleteConfirmation.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/deleteConfirmation.xhtml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- deleteConfirmation.xhtml	31 Aug 2007 17:50:55 -0000	1.7
  +++ deleteConfirmation.xhtml	12 Oct 2007 16:31:26 -0000	1.8
  @@ -12,7 +12,7 @@
           <script type="text/javascript">
   
           var fadeInDeleteDialog = function(hash) {
  -            jQuery("#deleteDialog\\:delete", hash.w).attr("accesskey", "O");
  +            jQuery("#deleteDialog\\:delete", hash.w).attr("accesskey", "#{messages['lacewiki.button.OK.accesskey']}");
               fadeInPopupDialog(hash);
           };
   
  @@ -32,12 +32,12 @@
                   });
           });</script>
       </ui:define>
  -    <ui:define name="dialogTitle">Delete confirmation</ui:define>
  -    <ui:define name="dialogContent"><p align="center">Are you sure you want to delete <br/>'#{home.instance}'?</p></ui:define>
  +    <ui:define name="dialogTitle">#{messages['lacewiki.label.DeleteConfirmation']}</ui:define>
  +    <ui:define name="dialogContent"><p align="center">#{messages['lacewiki.label.AreYouSureYouWantToDelete']} <br/>'#{home.instance}'?</p></ui:define>
       <ui:define name="dialogControls">
           <h:form style="display:inline" id="deleteDialog">
               <a:commandLink id="delete" action="#{home.remove}" styleClass="button" reRender="#{reRender}">
  -                <span class="buttonLabel"><u>O</u>k</span>
  +                <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.OK']}"/>
               </a:commandLink>
           </h:form>
       </ui:define>
  
  
  
  1.14      +5 -3      jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: commentsDisplay.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/commentsDisplay.xhtml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- commentsDisplay.xhtml	1 Oct 2007 19:08:09 -0000	1.13
  +++ commentsDisplay.xhtml	12 Oct 2007 16:31:26 -0000	1.14
  @@ -17,8 +17,10 @@
                    cellpadding="0" cellspacing="0" border="0">
           <f:facet name="header">
               <s:div styleClass="regularHeader alignLeft">
  -                <h:outputText value="#{wiki:sizeOf(commentHome.comments)}&#160;comment:" rendered="#{wiki:sizeOf(commentHome.comments) == 1}"/>
  -                <h:outputText value="#{wiki:sizeOf(commentHome.comments)}&#160;comments:" rendered="#{wiki:sizeOf(commentHome.comments) > 1}"/>
  +                <h:outputText value="#{wiki:sizeOf(commentHome.comments)}&#160;#{messages['lacewiki.label.commentsDisplay.Comment']}:"
  +                              rendered="#{wiki:sizeOf(commentHome.comments) == 1}"/>
  +                <h:outputText value="#{wiki:sizeOf(commentHome.comments)}&#160;#{messages['lacewiki.label.commentsDisplay.Comments']}:"
  +                              rendered="#{wiki:sizeOf(commentHome.comments) > 1}"/>
               </s:div>
           </f:facet>
           <c:forEach var="c" items="#{commentHome.comments}">
  @@ -65,7 +67,7 @@
                   <div align="right">
                       <h:form rendered="#{s:hasPermission('Comment', 'delete', documentHome.instance)}">
                           <a:commandLink action="#{commentHome.remove(c.id)}" reRender="comments" oncomplete="wrapBoxes();"
  -                                       styleClass="button"><span class="buttonLabel">Remove Comment</span></a:commandLink>
  +                                       styleClass="button"><span class="buttonLabel">#{messages['lacewiki.button.commentsDisplay.RemoveComment']}</span></a:commandLink>
                       </h:form>
                   </div>
   
  
  
  
  1.7       +18 -13    jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ownerSelector.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/ownerSelector.xhtml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- ownerSelector.xhtml	1 Sep 2007 08:42:48 -0000	1.6
  +++ ownerSelector.xhtml	12 Oct 2007 16:31:26 -0000	1.7
  @@ -20,7 +20,7 @@
                   });
           });</script>
       </ui:define>
  -    <ui:define name="dialogTitle">Select owner...</ui:define>
  +    <ui:define name="dialogTitle">#{messages['lacewiki.label.ownerSelector.SelectOwner']}</ui:define>
       <ui:define name="dialogContent">
   
           <h:form>
  @@ -36,29 +36,32 @@
                            cellpadding="0" cellspacing="0" border="0">
   
                   <h:panelGroup>
  -                    <h:outputText styleClass="label" value="Username:"/>&#160;
  +                    <h:outputText styleClass="label" value="#{messages['lacewiki.label.userList.Username']}:"/>&#160;
                       <h:inputText id="username" value="#{userSearch.exampleUser.username}" maxlength="35" size="10" tabindex="20"/>
                   </h:panelGroup>
   
                   <h:panelGroup>
  -                    <h:outputText styleClass="label" value="First name:"/>&#160;
  +                    <h:outputText styleClass="label" value="#{messages['lacewiki.label.userList.FirstName']}:"/>&#160;
                       <h:inputText id="firstname" value="#{userSearch.exampleUser.firstname}" maxlength="35" size="10" tabindex="20"/>
                   </h:panelGroup>
   
                   <h:panelGroup>
  -                    <h:outputText styleClass="label" value="Last name:"/>&#160;
  +                    <h:outputText styleClass="label" value="#{messages['lacewiki.label.userList.LastName']}:"/>&#160;
                       <h:inputText id="lastname" value="#{userSearch.exampleUser.lastname}" maxlength="35" size="10" tabindex="20"/>
                   </h:panelGroup>
   
                   <h:panelGroup>
  -                    <h:outputText styleClass="label" value="E-mail:"/>&#160;
  +                    <h:outputText styleClass="label" value="#{messages['lacewiki.label.userList.Email']}:"/>&#160;
                       <h:inputText id="email" value="#{userSearch.exampleUser.email}" maxlength="35" size="10" tabindex="20"/>
                   </h:panelGroup>
   
                   <a:commandLink id="find" styleClass="buttonNonpersistent" reRender="dialogOwnerSelectionContent"
                                  oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
                                  action="#{userSearch.find()}"
  -                               tabindex="20" accesskey="F"><span class="buttonLabel"><u>F</u>ind</span></a:commandLink>
  +                               tabindex="20"
  +                               accesskey="#{messages['lacewiki.button.userList.Find.accesskey']}">
  +                    <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.userList.Find']}"/>
  +                </a:commandLink>
   
               </h:panelGrid>
           </div>
  @@ -85,7 +88,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']}"/>
   
                   <a:commandLink action="#{userSearch.nextPage()}" rendered="#{userSearch.nextPageAvailable}" tabindex="20"
                                  oncomplete="jQuery('#dialogOwnerSelection').jqmAddClose('.closeDialog')"
  @@ -128,11 +131,11 @@
                                               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']}"/>
                           </a:commandLink>
                       </f:facet>
                       #{u.username}
  -                    <h:outputText rendered="#{!empty u.activationCode}">&#160;(Not Activated)</h:outputText>
  +                    <h:outputText rendered="#{!u.activated}" value="&#160;(#{messages['lacewiki.label.userList.NotActivated']})"/>
                   </h:column>
   
                   <h:column>
  @@ -143,7 +146,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']}"/>
                           </a:commandLink>
                       </f:facet>
                       #{u.firstname}
  @@ -157,7 +160,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']}"/>
                           </a:commandLink>
                       </f:facet>
                       #{u.lastname}
  @@ -171,7 +174,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']}"/>
                           </a:commandLink>
                       </f:facet>
                       #{u.email}
  @@ -180,7 +183,9 @@
                   <h:column>
                       <a:commandLink action="#{home.selectOwner(u.id)}"
                                      reRender="ownerDisplay" styleClass="buttonNonpersistent closeDialog"
  -                                   tabindex="20"><span class="buttonLabel">Select</span></a:commandLink>
  +                                   tabindex="20">
  +                        <h:outputText value="#{messages['lacewiki.button.ownerSelector.Select']}"/>
  +                    </a:commandLink>
                   </h:column>
   
               </h:dataTable>
  
  
  
  1.7       +1 -1      jboss-seam/examples/wiki/view/includes/wikiTextEditor.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: wikiTextEditor.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/wikiTextEditor.xhtml,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- wikiTextEditor.xhtml	24 Sep 2007 12:57:45 -0000	1.6
  +++ wikiTextEditor.xhtml	12 Oct 2007 16:31:26 -0000	1.7
  @@ -64,7 +64,7 @@
               <h:outputText value="#{label}:"/>
               <s:fragment rendered="#{not empty textPreviewId}">
                   <br/>
  -                <h:outputText value="(#{valueMaxLength - wiki:length(valueBinding)} characters left)"/>
  +                <h:outputText value="(#{valueMaxLength - wiki:length(valueBinding)} #{messages['lacewiki.label.wikiTextEditor.CharactersLeft']})"/>
               </s:fragment>
           </s:div>
   
  
  
  
  1.5       +2 -2      jboss-seam/examples/wiki/view/includes/accessLevelSelector.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: accessLevelSelector.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/accessLevelSelector.xhtml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- accessLevelSelector.xhtml	6 Jul 2007 14:38:36 -0000	1.4
  +++ accessLevelSelector.xhtml	12 Oct 2007 16:31:26 -0000	1.5
  @@ -8,7 +8,7 @@
        rendered="#{currentUser != guestUser}">
   
       <s:div styleClass="entry">
  -        <div class="label">Readable by:</div>
  +        <div class="label">#{messages['lacewiki.label.ReadableBy']}:</div>
           <div class="input">
               <h:selectOneMenu value="#{nodePermissions.readAccessLevel}" tabindex="1">
                   <s:selectItems value="#{assignableAccessLevelsList}"
  @@ -23,7 +23,7 @@
       </s:div>
   
       <s:div styleClass="entry">
  -        <div class="label">Writable by:</div>
  +        <div class="label">#{messages['lacewiki.label.WritableBy']}:</div>
           <div class="input">
               <h:selectOneMenu value="#{nodePermissions.writeAccessLevel}" tabindex="1">
                   <s:selectItems value="#{assignableAccessLevelsList}"
  
  
  
  1.15      +42 -15    jboss-seam/examples/wiki/view/includes/userControl.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: userControl.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/userControl.xhtml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- userControl.xhtml	24 Sep 2007 08:23:21 -0000	1.14
  +++ userControl.xhtml	12 Oct 2007 16:31:26 -0000	1.15
  @@ -10,18 +10,28 @@
   
           <h:panelGroup styleClass="userControlPanel">
   
  -            <h:outputLabel styleClass="userControlLabel" for="loginUsername" value="Username:"/>
  +            <h:outputLabel styleClass="userControlLabel" for="loginUsername" value="#{messages['lacewiki.label.userControl.Username']}:"/>
               <h:inputText styleClass="userControlInput" id="loginUsername" value="#{identity.username}" size="8" tabindex="50"/>
  -            <h:outputLabel styleClass="userControlLabel" for="loginPassword" value="Password:"/>
  +            <h:outputLabel styleClass="userControlLabel" for="loginPassword" value="#{messages['lacewiki.label.userControl.Password']}:"/>
               <h:inputSecret styleClass="userControlInput" id="loginPassword" value="#{identity.password}" size="8" tabindex="50"/>
  -            <h:commandLink styleClass="userControlLink" action="#{identity.login}" tabindex="50" accesskey="L"><u>L</u>ogin</h:commandLink>
  -
  -            <s:link styleClass="userControlLink" tabindex="50" accesskey="R" view="/userRegister_#{skin}.xhtml" propagation="none"
  -                    rendered="#{userManagementPreferences.properties['enableRegistration']}"><u>R</u>egister
  +            <h:commandLink styleClass="userControlLink" action="#{identity.login}" tabindex="50"
  +                           accesskey="#{messages['lacewiki.button.userControl.Login.accesskey']}">
  +                <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Login']}"/>
  +            </h:commandLink>
  +
  +            <s:link styleClass="userControlLink" tabindex="50"
  +                    accesskey="#{messages['lacewiki.button.userControl.Register.accesskey']}"
  +                    view="/userRegister_#{skin}.xhtml" propagation="none"
  +                    rendered="#{userManagementPreferences.properties['enableRegistration']}">
  +                <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Register']}"/>
               </s:link>
   
   
  -            <s:link styleClass="userControlLink" tabindex="50" accesskey="M" view="/userList_#{skin}.xhtml" propagation="none"><u>M</u>embers</s:link>
  +            <s:link styleClass="userControlLink" tabindex="50"
  +                    accesskey="#{messages['lacewiki.button.userControl.Members.accesskey']}" 
  +                    view="/userList_#{skin}.xhtml" propagation="none">
  +                <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Members']}"/>
  +            </s:link>
   
           </h:panelGroup>
   
  @@ -32,19 +42,36 @@
           <h:panelGroup styleClass="userControlPanel">
               <h:outputText styleClass="userControlLabel" value="(#{currentUser.fullname})"/>
   
  -            <s:link styleClass="userControlLink" action="#{authenticator.logout}" tabindex="70" accesskey="L"><u>L</u>ogout</s:link>
  -
  -            <h:outputLink styleClass="userControlLink" tabindex="70" accesskey="H" value="#{wiki:renderHomeURL(currentUser)}"
  -                    rendered="#{!empty currentUser.memberHome}"><u>H</u>ome</h:outputLink>
  +            <s:link styleClass="userControlLink" action="#{authenticator.logout}" tabindex="70"
  +                    accesskey="#{messages['lacewiki.button.userControl.Logout.accesskey']}">
  +                <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Logout']}"/>
  +            </s:link>
   
  -            <s:link styleClass="userControlLink" tabindex="70" accesskey="P" view="/userHome_#{skin}.xhtml" propagation="none"><u>P</u>rofile
  +            <h:outputLink styleClass="userControlLink" tabindex="70"
  +                          accesskey="#{messages['lacewiki.button.userControl.Home.accesskey']}" 
  +                          value="#{wiki:renderHomeURL(currentUser)}"
  +                    rendered="#{!empty currentUser.memberHome}">
  +                <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Home']}"/>
  +            </h:outputLink>
  +
  +            <s:link styleClass="userControlLink" tabindex="70"
  +                    accesskey="#{messages['lacewiki.button.userControl.Profile.accesskey']}"
  +                    view="/userHome_#{skin}.xhtml" propagation="none">
  +                <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Profile']}"/>
                   <f:param name="userId" value="#{currentUser.id}"/>
               </s:link>
   
  -            <s:link styleClass="userControlLink" tabindex="70" accesskey="M" view="/userList_#{skin}.xhtml" propagation="none"><u>M</u>embers</s:link>
  +            <s:link styleClass="userControlLink" tabindex="70"
  +                    accesskey="#{messages['lacewiki.button.userControl.Members.accesskey']}"
  +                    view="/userList_#{skin}.xhtml" propagation="none">
  +                <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Members']}"/>
  +            </s:link>
   
  -            <s:link styleClass="userControlLink" tabindex="70" accesskey="A" view="/adminHome_#{skin}.xhtml" propagation="none"
  -                    rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}"><u>A</u>dmin
  +            <s:link styleClass="userControlLink" tabindex="70"
  +                    accesskey="#{messages['lacewiki.button.userControl.Admin.accesskey']}"
  +                    view="/adminHome_#{skin}.xhtml" propagation="none"
  +                    rendered="#{s:hasPermission('User', 'isAdmin', currentUser)}">
  +                <h:outputText escape="false" value="#{messages['lacewiki.button.userControl.Admin']}"/>
               </s:link>
   
           </h:panelGroup>
  
  
  
  1.6       +5 -3      jboss-seam/examples/wiki/view/includes/popupDialog.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: popupDialog.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/popupDialog.xhtml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- popupDialog.xhtml	24 Sep 2007 08:23:21 -0000	1.5
  +++ popupDialog.xhtml	12 Oct 2007 16:31:26 -0000	1.6
  @@ -21,17 +21,19 @@
           });
       });</script>
   
  -    <div class="popupDialogHead" id="#{dialogId}Head"><ui:insert name="dialogTitle">Confirmation</ui:insert></div>
  +    <div class="popupDialogHead" id="#{dialogId}Head"><ui:insert name="dialogTitle">#{messages['lacewiki.label.Confirmation']}</ui:insert></div>
   
       <s:div styleClass="popupDialogContent" id="#{dialogId}Content">
  -        <ui:insert name="dialogContent"><p>Are you sure you want to execute this operation?</p></ui:insert>
  +        <ui:insert name="dialogContent"><p>#{messages['lacewiki.label.AreYouSureYouWantToExecute']}</p></ui:insert>
       </s:div>
   
       <s:div styleClass="popupDialogControls" id="#{dialogId}Controls">
           <h:panelGroup>
               <ui:insert name="dialogControls"/>
               <h:outputLink value="#" rendered="#{!hideCancelButton}"
  -                          styleClass="buttonNonpersistent closeDialog"><span class="buttonLabel"><u>C</u>ancel</span></h:outputLink>
  +                          styleClass="buttonNonpersistent closeDialog">
  +                <h:outputText styleClass="buttonLabel" escape="false" value="#{messages['lacewiki.button.Cancel']}"/>
  +            </h:outputLink>
           </h:panelGroup>
       </s:div>
   
  
  
  
  1.9       +6 -2      jboss-seam/examples/wiki/view/includes/searchControl.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: searchControl.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/searchControl.xhtml,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- searchControl.xhtml	31 Aug 2007 13:38:12 -0000	1.8
  +++ searchControl.xhtml	12 Oct 2007 16:31:26 -0000	1.9
  @@ -8,9 +8,13 @@
       <h:form id="searchControlForm">
           <h:panelGroup styleClass="searchControlTable">
               <h:inputText styleClass="searchControlInput" id="searchControlSearchString" value="#{wikiSearch.simpleQuery}"
  -                         onclick="clickClear(this, 'Search...')" onblur="clickRecall(this, 'Search...')"
  +                         onclick="clickClear(this, '#{messages['lacewiki.label.searchControl.Search']}')"
  +                         onblur="clickRecall(this, '#{messages['lacewiki.label.searchControl.Search']}')"
                            size="15" maxlength="1000" tabindex="60"/>
  -            <h:commandLink styleClass="searchControlLink" tabindex="61" accesskey="F" action="search"><u>F</u>ind
  +            <h:commandLink styleClass="searchControlLink" tabindex="61"
  +                           accesskey="#{messages['lacewiki.button.searchControl.Find.accesskey']}"
  +                           action="search">
  +                <h:outputText escape="false" value="#{messages['lacewiki.button.searchControl.Find']}"/>
                   <f:param name="conversationPropagation" value="none"/>
               </h:commandLink>
           </h:panelGroup>
  
  
  
  1.15      +23 -15    jboss-seam/examples/wiki/view/includes/commentForm.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: commentForm.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/commentForm.xhtml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- commentForm.xhtml	1 Oct 2007 19:08:09 -0000	1.14
  +++ commentForm.xhtml	12 Oct 2007 16:31:26 -0000	1.15
  @@ -15,11 +15,16 @@
   
               <div class="formHead bottomBorder">
   
  -                <h:outputLink tabindex="102" rendered="#{empty param.showCommentForm}" accesskey="T"
  +                <h:outputLink tabindex="102" rendered="#{empty param.showCommentForm}"
  +                              accesskey="#{messages['lacewiki.button.commentForm.PostComment.accesskey']}"
                                 styleClass="buttonNonpersistent"
  -                              value="#{wiki:renderURL(currentDocument)}?showCommentForm=true#commentForm"><span class="buttonLabel">Pos<u>t</u> Comment</span></h:outputLink>
  -
  -                <s:fragment rendered="#{not empty param.showCommentForm}">Post Comment</s:fragment>
  +                              value="#{wiki:renderURL(currentDocument)}?showCommentForm=true#commentForm">
  +                    <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.commentForm.PostComment']}"/>
  +                </h:outputLink>
  +
  +                <s:fragment rendered="#{not empty param.showCommentForm}">
  +                    <h:outputText value="#{messages['lacewiki.label.commentForm.PostComment']}"/>
  +                </s:fragment>
   
               </div>
   
  @@ -27,7 +32,7 @@
                      styleClass="hiddenCommentForm formFields formBorder wideLabels">
   
                   <s:decorate id="userNameDecorate" template="formFieldDecorate.xhtml">
  -                    <ui:define name="label">Name</ui:define>
  +                    <ui:define name="label">#{messages['lacewiki.label.commentForm.Name']}</ui:define>
                       <h:inputText tabindex="102" size="40" maxlength="100" required="true"
                                    id="userName" value="#{commentHome.comment.fromUserName}">
                           <a:support status="commentForm:status" event="onblur" reRender="userNameDecorate"/>
  @@ -35,21 +40,21 @@
                   </s:decorate>
   
                   <s:decorate id="userEmailDecorate" template="formFieldDecorate.xhtml">
  -                    <ui:define name="label">E-mail address (optional)</ui:define>
  +                    <ui:define name="label">#{messages['lacewiki.label.commentForm.Email']}</ui:define>
                       <h:inputText tabindex="102" size="40" maxlength="255" required="false"
                                    id="userEmail" value="#{commentHome.comment.fromUserEmail}">
                       </h:inputText>
                   </s:decorate>
   
                   <s:decorate id="userHomepageDecorate" template="formFieldDecorate.xhtml">
  -                    <ui:define name="label">Homepage URL (optional)</ui:define>
  +                    <ui:define name="label">#{messages['lacewiki.label.commentForm.Homepage']}</ui:define>
                       <h:inputText tabindex="102" size="40" maxlength="1000" required="false"
                                    id="userHomepage" value="#{commentHome.comment.fromUserHomepage}">
                       </h:inputText>
                   </s:decorate>
   
                   <s:decorate id="subjectDecorate" template="formFieldDecorate.xhtml">
  -                    <ui:define name="label">Subject</ui:define>
  +                    <ui:define name="label">#{messages['lacewiki.label.commentForm.Subject']}</ui:define>
                       <h:inputText tabindex="102" size="40" maxlength="255" required="true"
                                    id="subject" value="#{commentHome.comment.subject}">
                           <a:support status="commentForm:status" event="onblur" reRender="subjectDecorate"/>
  @@ -60,7 +65,7 @@
                       <ui:param name="textEditorId" value="comment"/>
                       <ui:param name="textPreviewId" value="commentPreview"/>
                       <ui:param name="namingContainer" value="commentForm"/>
  -                    <ui:param name="label" value="Comment"/>
  +                    <ui:param name="label" value="#{messages['lacewiki.label.commentForm.Comment']}"/>
                       <ui:param name="valueBinding" value="#{commentHome.comment.text}"/>
                       <ui:param name="valueMaxLength" value="8000"/>
                       <ui:param name="valueRequired" value="true"/>
  @@ -80,14 +85,14 @@
   
                   <s:div rendered="#{!identity.loggedIn}">
                       <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&#160;<h:outputText value="#{captcha.question}"/>?
  +                            #{messages['lacewiki.label.VerificationQuestionQuestion']}&#160;<h:outputText value="#{captcha.question}"/>?
                           </div>
                       </s:div>
   
                       <s:decorate id="verifyCaptchaDecorate" template="formFieldDecorate.xhtml">
  -                        <ui:define name="label">Enter response</ui:define>
  +                        <ui:define name="label">#{messages['lacewiki.label.VerificationEnterResponse']}</ui:define>
                           <h:inputSecret tabindex="102" size="5" maxlength="5" required="true"
                                          redisplay="true" id="verifyCaptcha" value="#{captcha.response}">
                           </h:inputSecret>
  @@ -101,10 +106,13 @@
                       <div class="label">&#160;</div>
                       <div class="input">
   
  -                        <a:commandLink action="#{commentHome.persist}" tabindex="102" reRender="commentDisplayForm" accesskey="S"
  +                        <a:commandLink action="#{commentHome.persist}" tabindex="102" reRender="commentDisplayForm"
  +                                       accesskey="#{messages['lacewiki.button.commentForm.Post.accesskey']}"
                                          status="commentForm:status" 
                                          oncomplete="jQuery('.hiddenCommentForm').show();jQuery('#commentForm\\:userNameDecorate\\:userName').focus(); wrapBoxes();"
  -                                       styleClass="button"><span class="buttonLabel">Po<u>s</u>t Comment</span></a:commandLink>
  +                                       styleClass="button">
  +                            <h:outputText escape="false" styleClass="buttonLabel" value="#{messages['lacewiki.button.commentForm.Post']}"/>
  +                        </a:commandLink>
   
                       </div>
                   </div>
  
  
  
  1.3       +9 -5      jboss-seam/examples/wiki/view/includes/helpPopup.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: helpPopup.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/helpPopup.xhtml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- helpPopup.xhtml	25 Sep 2007 06:24:05 -0000	1.2
  +++ helpPopup.xhtml	12 Oct 2007 16:31:26 -0000	1.3
  @@ -39,13 +39,13 @@
   
               };</script>
       </ui:define>
  -    <ui:define name="dialogTitle">Help</ui:define>
  +    <ui:define name="dialogTitle">#{messages['lacewiki.label.help.DialogTitle']}</ui:define>
       <ui:define name="dialogContent">
   
           <s:div id="helpSelector">
               <h:panelGrid columns="3" styleClass="fullWidth"
                            columnClasses="alignLeft fivePercentColumn, alignLeft defaultColumn, alignRight tenPercentColumn">
  -                <h:outputText value="Browse:"/>
  +                <h:outputText value="#{messages['lacewiki.label.help.Browse']}:"/>
                   <h:form id="helpSelectorForm">
                       <h:selectOneMenu
                               value="#{help.selectedNode}"
  @@ -63,11 +63,15 @@
                           <h:outputLink value="#{wiki:renderURL(help.selectedNode.wrappedNode)}"
                                         rendered="#{not empty help.selectedNode}"
                                         styleClass="buttonNonpersistent"
  -                                      tabindex="1"><span class="buttonLabel">Open Fullscreen</span></h:outputLink>
  +                                      tabindex="1">
  +                            <h:outputText styleClass="buttonLabel" value="#{messages['lacewiki.button.help.OpenFullscreen']}"/>
  +
  +                        </h:outputLink>
                       </s:span>
   
  -                    <h:outputLink value="#" styleClass="buttonNonpersistent closeDialog"
  -                                  tabindex="1"><span class="buttonLabel">Close <u>H</u>elp</span></h:outputLink>
  +                    <h:outputLink value="#" styleClass="buttonNonpersistent closeDialog" tabindex="1">
  +                        <h:outputText styleClass="buttonLabel" escape="false" value="#{messages['lacewiki.button.help.CloseHelp']}"/>
  +                    </h:outputLink>
                   </h:panelGroup>
               </h:panelGrid>
           </s:div>
  
  
  
  1.14      +1 -1      jboss-seam/examples/wiki/view/includes/attachmentDisplay.xhtml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: attachmentDisplay.xhtml
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/view/includes/attachmentDisplay.xhtml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- attachmentDisplay.xhtml	1 Sep 2007 08:42:48 -0000	1.13
  +++ attachmentDisplay.xhtml	12 Oct 2007 16:31:26 -0000	1.14
  @@ -15,7 +15,7 @@
            rowClasses="rowOdd,rowEven"
            cellpadding="0" cellspacing="0" border="0">
           <h:column>
  -            <f:facet name="header">Attachments:</f:facet>
  +            <f:facet name="header">#{messages['lacewiki.label.attachmentDisplay.Attachments']}:</f:facet>
               <h:panelGrid columns="3" columnClasses="onePercentColumn alignRight, onePercentColumn alignLeft, onePercentColumn alignRight">
                   <s:span><a name="attachment#{uiComponent['directoryEditForm:menuItemTable'].rowIndex + 1}"/></s:span>
                   <h:outputText value="#&#160;#{uiComponent['directoryEditForm:menuItemTable'].rowIndex + 1}"/>
  
  
  



More information about the jboss-cvs-commits mailing list