[jboss-cvs] jboss-seam/examples/wiki/src/etc/WEB-INF ...
Christian Bauer
christian at hibernate.org
Fri Oct 12 12:31:27 EDT 2007
User: cbauer
Date: 07/10/12 12:31:27
Modified: examples/wiki/src/etc/WEB-INF faces-config.xml
components.xml pages.xml
Log:
Internationalized almost all strings
Revision Changes Path
1.11 +8 -11 jboss-seam/examples/wiki/src/etc/WEB-INF/faces-config.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: faces-config.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/faces-config.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- faces-config.xml 24 Sep 2007 08:23:20 -0000 1.10
+++ faces-config.xml 12 Oct 2007 16:31:27 -0000 1.11
@@ -4,20 +4,17 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd">
- <!-- Why do I have to define this here again? It's already in wiki.taglib.xml! -->
+ <application>
+ <locale-config>
+ <default-locale>en</default-locale>
+ <supported-locale>de</supported-locale>
+ </locale-config>
+ </application>
+
+ <!-- Needed because WikiFormattedTextHandler instantiates these, asking the JSF infrastructure -->
<component>
<component-type>org.jboss.seam.wiki.core.ui.UIPlugin</component-type>
<component-class>org.jboss.seam.wiki.core.ui.UIPlugin</component-class>
</component>
- <component>
- <component-type>org.jboss.seam.wiki.core.ui.UIWikiFormattedText</component-type>
- <component-class>org.jboss.seam.wiki.core.ui.UIWikiFormattedText</component-class>
- </component>
-
- <validator>
- <validator-id>seamTextValidator</validator-id>
- <validator-class>org.jboss.seam.wiki.core.ui.SeamTextValidator</validator-class>
- </validator>
-
</faces-config>
1.28 +19 -12 jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: components.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/components.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- components.xml 1 Oct 2007 19:08:03 -0000 1.27
+++ components.xml 12 Oct 2007 16:31:27 -0000 1.28
@@ -20,7 +20,7 @@
<!-- ##### WIKI USER CONFIGURATION ##### -->
- <mail:mail-session host="localhost" port="25"/>
+ <mail:mail-session host="mail.bluewin.ch" port="25"/>
<web:multipart-filter create-temp-files="true" max-request-size="10000000" url-pattern="*.seam"/>
@@ -81,19 +81,26 @@
<!-- Login and security -->
- <!-- Rules is too broken
- <drools:rule-base name="securityRules">
- <drools:rule-files>
- <value>/security.drl</value>
- </drools:rule-files>
- </drools:rule-base>
-
<security:identity authenticate-method="#{authenticator.authenticate}"
- security-rules="#{securityRules}"
remember-me="false"/>
+
+ <!-- Plugin i18n resources
+ TODO: This could be made dynamic with a custom ResourceLoader?
-->
- <security:identity authenticate-method="#{authenticator.authenticate}"
- remember-me="false"/>
+
+ <core:resource-loader>
+ <core:bundle-names>
+ <value>messages</value>
+ <value>messages_blogDirectory</value>
+ <value>messages_blogArchive</value>
+ <value>messages_blogRecentEntries</value>
+ <value>messages_dirMenu</value>
+ <value>messages_feedTeasers</value>
+ <value>messages_lastModifiedDocuments</value>
+ <value>messages_tags</value>
+ <value>messages_userProfile</value>
+ </core:bundle-names>
+ </core:resource-loader>
<!-- Misc Settings -->
1.31 +45 -26 jboss-seam/examples/wiki/src/etc/WEB-INF/pages.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: pages.xml
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/examples/wiki/src/etc/WEB-INF/pages.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- pages.xml 1 Oct 2007 19:08:03 -0000 1.30
+++ pages.xml 12 Oct 2007 16:31:27 -0000 1.31
@@ -190,7 +190,9 @@
</rule>
<rule if-outcome="persisted">
<end-conversation before-redirect="true"/>
- <redirect view-id="/wiki.xhtml"/>
+ <redirect view-id="/wiki.xhtml">
+ <param name="message" value="lacewiki.msg.AccountCreatedConfirmationSent"/>
+ </redirect>
</rule>
</navigation>
</page>
@@ -203,7 +205,7 @@
<rule if-outcome="updatedCurrentCredentials">
<end-conversation before-redirect="true"/>
<redirect view-id="/wiki.xhtml">
- <param name="message" value="updatedCurrentCredentials"/>
+ <param name="message" value="lacewiki.msg.UpdatedCurrentCredentials"/>
</redirect>
</rule>
<rule if-outcome="removed">
@@ -222,12 +224,12 @@
<navigation>
<rule if-outcome="activated">
<redirect view-id="/wiki.xhtml">
- <param name="message" value="accountActivatedPleaseLogin"/>
+ <param name="message" value="lacewiki.msg.AccountActivatedPleaseLogin"/>
</redirect>
</rule>
<rule if-outcome="notFound">
<redirect view-id="/wiki.xhtml">
- <param name="message" value="invalidActivationCode"/>
+ <param name="message" value="lacewiki.msg.InvalidActivationCode"/>
</redirect>
</rule>
</navigation>
@@ -250,7 +252,7 @@
<rule if-outcome="error">
<redirect view-id="/message.xhtml">
- <message severity="ERROR">An unrecoverable error occured!</message>
+ <message severity="ERROR">#{messages['lacewiki.msg.FatalError']}</message>
</redirect>
</rule>
</navigation>
@@ -259,59 +261,76 @@
<!-- Page descriptions don't support wildcards -->
<page view-id="/docHistory_d.xhtml">
- <description>Document History</description>
+ <description>#{messages['lacewiki.label.docHistory.DocumentHistory']}</description>
</page>
<page view-id="/docEdit_d.xhtml">
- <description>#{documentHome.idDefined ? 'Edit Document' : 'Create Document'}</description>
+ <description>#{documentHome.idDefined
+ ? messages['lacewiki.label.docEdit.EditDocument']
+ : messages['lacewiki.label.docEdit.CreateDocument']}</description>
</page>
<page view-id="/dirEdit_d.xhtml">
- <description>#{directoryHome.idDefined ? 'Edit Directory' : 'Create Directory'}</description>
+ <description>#{directoryHome.idDefined
+ ? messages['lacewiki.label.dirEdit.EditDirectory']
+ : messages['lacewiki.label.dirEdit.CreateDirectory']}</description>
</page>
<page view-id="/fileEdit_d.xhtml">
- <description>#{fileHome.idDefined ? 'Edit File' : 'Create File'}</description>
+ <description>#{fileHome.idDefined
+ ? messages['lacewiki.label.fileEdit.EditFile']
+ : messages['lacewiki.label.fileEdit.UploadFile']}</description>
</page>
<page view-id="/search_d.xhtml">
- <description>Search (Results: #{wikiSearch.searchResult.size})</description>
+ <description>#{messages['lacewiki.label.search.Search']} (#{messages['lacewiki.label.search.Results']}: #{wikiSearch.searchResult.size})</description>
</page>
<page view-id="/adminHome_d.xhtml">
- <description>System Administration</description>
+ <description>#{messages['lacewiki.label.adminHome.Administration']}</description>
</page>
<page view-id="/userRegister_d.xhtml">
- <description>#{identity.loggedIn ? 'Create Account' : 'Registration'}</description>
+ <description>#{identity.loggedIn
+ ? messages['lacewiki.label.userRegister.CreateNewAccount']
+ : messages['lacewiki.label.userRegister.RegisterNewAccount']}</description>
</page>
<page view-id="/userHome_d.xhtml">
- <description>Managing Account: #{userHome.instance.username}</description>
+ <description>#{messages['lacewiki.label.userHome.EditUser']}: #{userHome.instance.username}</description>
</page>
<page view-id="/userList_d.xhtml">
- <description>Member Search (Results: #{userSearch.rowCount})</description>
+ <description>#{messages['lacewiki.label.userList.MemberList']} (#{messages['lacewiki.label.userList.Results']}: #{userSearch.rowCount})</description>
</page>
+
<page view-id="/docHistory_m.xhtml">
- <description>Document History</description>
+ <description>#{messages['lacewiki.label.docHistory.DocumentHistory']}</description>
</page>
<page view-id="/docEdit_m.xhtml">
- <description>#{documentHome.idDefined ? 'Edit Document' : 'Create Document'}</description>
+ <description>#{documentHome.idDefined
+ ? messages['lacewiki.label.docEdit.EditDocument']
+ : messages['lacewiki.label.docEdit.CreateDocument']}</description>
</page>
<page view-id="/dirEdit_m.xhtml">
- <description>#{directoryHome.idDefined ? 'Edit Directory' : 'Create Directory'}</description>
+ <description>#{directoryHome.idDefined
+ ? messages['lacewiki.label.dirEdit.EditDirectory']
+ : messages['lacewiki.label.dirEdit.CreateDirectory']}</description>
</page>
<page view-id="/fileEdit_m.xhtml">
- <description>#{fileHome.idDefined ? 'Edit File' : 'Create File'}</description>
+ <description>#{fileHome.idDefined
+ ? messages['lacewiki.label.fileEdit.EditFile']
+ : messages['lacewiki.label.fileEdit.UploadFile']}</description>
</page>
<page view-id="/search_m.xhtml">
- <description>Search (Results: #{wikiSearch.searchResult.size})</description>
+ <description>#{messages['lacewiki.label.search.Search']} (#{messages['lacewiki.label.search.Results']}: #{wikiSearch.searchResult.size})</description>
</page>
<page view-id="/adminHome_m.xhtml">
- <description>System Administration</description>
+ <description>#{messages['lacewiki.label.adminHome.Administration']}</description>
</page>
<page view-id="/userRegister_m.xhtml">
- <description>#{identity.loggedIn ? 'Create Account' : 'Registration'}</description>
+ <description>#{identity.loggedIn
+ ? messages['lacewiki.label.userRegister.CreateNewAccount']
+ : messages['lacewiki.label.userRegister.RegisterNewAccount']}</description>
</page>
<page view-id="/userHome_m.xhtml">
- <description>Managing Account: #{userHome.instance.username}</description>
+ <description>#{messages['lacewiki.label.userHome.EditUser']}: #{userHome.instance.username}</description>
</page>
<page view-id="/userList_m.xhtml">
- <description>Member Search (Results: #{userSearch.rowCount})</description>
+ <description>#{messages['lacewiki.label.userList.MemberList']} (#{messages['lacewiki.label.userList.Results']}: #{userSearch.rowCount})</description>
</page>
@@ -323,14 +342,14 @@
<exception class="org.jboss.seam.security.AuthorizationException">
<end-conversation/>
<redirect view-id="/message.xhtml">
- <message severity="WARN">Access Denied: #{org.jboss.seam.handledException.message}</message>
+ <message severity="WARN">#{messages['lacewiki.msg.AccessDenied']}: #{org.jboss.seam.handledException.message}</message>
</redirect>
</exception>
<exception class="javax.persistence.OptimisticLockException">
<end-conversation/>
<redirect view-id="/message.xhtml">
- <message severity="ERROR">Someone modified the same record while you were editing it. Please restart your workspace.</message>
+ <message severity="ERROR">#{messages['lacewiki.msg.OptimisticLockError']}</message>
</redirect>
</exception>
More information about the jboss-cvs-commits
mailing list