Fixed german umlauts and links + i18n strings

Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 356a8cfed3dbf8a908ac6c7444dec98d5cc5202d..273f402ddb64edf35df9b92fe8d2e288e9c64655 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -228,12 +228,10 @@ PAGE_TITLE_LOGIN_START_SHARING_ADDRESSBOOK=Das Adressbuch mit anderen Benutzern
 CONTENT_TITLE_LOGIN_START_SHARING_ADDRESSBOOK=Teilen Sie dieses Adressbuch mit anderen Benutzern:
 LOGIN_START_SHARING_TITLE=Teilen
 LOGIN_START_SHARING_BUTTON=Mit diesem Benutzer teilen
-#TODO: Please fix German umlaut!
-LOGIN_START_SHARING_BUTTON_TITLE=Teilen Sie Ihr ausgewaehltes Adressbuch mit diesem Benutzer.
-#TODO: Please fix German umlaut!
-TABLE_HEADER_CHOOSE_USER_FOR_SHARING=Waehlen Sie einen Benutzer zum Teilen Ihres Adressbuches aus.
+LOGIN_START_SHARING_BUTTON_TITLE=Teilen Sie Ihr ausgew\u00e4hltes Adressbuch mit diesem Benutzer.
+TABLE_HEADER_CHOOSE_USER_FOR_SHARING=W\u00e4hlen Sie einen Benutzer zum Teilen Ihres Adressbuches aus.
 LOGIN_START_SHARING_NOTICE1=Damit werden Ihr gesamtes Adressbuch fuer den ausgewaehlten Benutzer sichtbar.
-#TODO: Please fix German umlaut!
-LOGIN_START_SHARING_NOTICE2=Sie koennen dies jederzeit wiederrufen.
+LOGIN_START_SHARING_NOTICE2=Sie k\u00f6nnen dies jederzeit wiederrufen.
 LINK_USER_PROFILE=Zum Benutzerprofil
 LINK_USER_PROFILE_TITLE=Das Benutzerprofil in einem neuen Fenster aufrufen.
+LINK_LOGIN_START_SHARING_ADDRESSBOOKS_TITLE=Teilen Sie Ihre Adressb\u00fccher mit anderen Benutzern. Sie k\u00f6nnen den Schritt jederzeit zur\u00fccknehmen.

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index d32a5a828f774a190424d22abb503f89c3cb1487..263a5c4a5ff1b256805676b72e019fab85cf560d 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -234,3 +234,4 @@ LOGIN_START_SHARING_NOTICE1=With this your whole address book becomes visible to
 LOGIN_START_SHARING_NOTICE2=You can always revoke your choice.
 LINK_USER_PROFILE=To user profile
 LINK_USER_PROFILE_TITLE=Open the user profile in a new window.
+LINK_LOGIN_START_SHARING_ADDRESSBOOKS_TITLE=Start sharing your address books with other users. You can always revoke your decission.

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index af277878b4765a155b638680bef11af7ba812fb3..b41a48a2d1e318a541fde626df646cd6d7d25577 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -92,7 +92,7 @@
                        <to-view-id>/login/login_other_addressbooks.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>user_user_list</from-outcome>
+                       <from-outcome>user_list</from-outcome>
                        <to-view-id>/user/user_list.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>

diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/login_menu.tpl
index 281c18002f1d592f7605b249c541feec0fdb3782..c655637a5b5a9ba344c72352a81ce506619052ac 100644 (file)
--- a/web/WEB-INF/templates/login/login_menu.tpl
+++ b/web/WEB-INF/templates/login/login_menu.tpl
@@ -16,7 +16,7 @@
                                        <h:link title="#{msg.LINK_LOGIN_HOME_TITLE}" outcome="login_index" value="#{msg.LINK_LOGIN_HOME}" />
                                </li>
                                <li>
-                                       <h:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_user_list" value="#{msg.LINK_USER_LIST}" />
+                                       <h:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_list" value="#{msg.LINK_USER_LIST}" />
                                </li>
                        </ul>
 

diff --git a/web/login/login_shared_addressbooks.xhtml b/web/login/login_shared_addressbooks.xhtml
index 07bb72d78d9200d331f94c230169bd0d76fb4bc4..cb56073df0e76ec8285d7ff228c83a4361b38eed 100644 (file)
--- a/web/login/login_shared_addressbooks.xhtml
+++ b/web/login/login_shared_addressbooks.xhtml
@@ -25,7 +25,7 @@
                                <h:outputText class="notice" value="#{msg.LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS}" rendered="#{shareController.isSharingAddressbooks() == false}" />
 
                                <div class="table_footer">
-                                       <h:link id="shareAddressbook" outcome="user_user_list" title="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOKS_TITLE}" value="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOKS}" />
+                                       <h:link id="shareAddressbook" outcome="user_list" title="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOKS_TITLE}" value="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOKS}" />
                                </div>
                        </div>
                </ui:define>

diff --git a/web/login/login_show_addressbook.xhtml b/web/login/login_show_addressbook.xhtml
index 98ddba15236fe49f0c7700a4116bd40ab8c7f58a..e7821d8ebae4aab8c2c21b5eed7a8b2ae37f76f1 100644 (file)
--- a/web/login/login_show_addressbook.xhtml
+++ b/web/login/login_show_addressbook.xhtml
@@ -6,13 +6,6 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <f:metadata>
-               <f:viewParam id="addressbookId" name="addressbook_id" value="#{addressbookController.addressbookId}" required="true" requiredMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_MISSING}" converterMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_INVALID}" validatorMessage="#{msg.PARAMETER_ADDRESSBOOK_ID_NOT_FOUND}">
-                       <f:convertNumber for="addressbookId" type="number" minIntegerDigits="1" maxIntegerDigits="20" />
-                       <f:validator for="addressbookId" validatorId="AddressbookIdValidator" />
-               </f:viewParam>
-       </f:metadata>
-
        <ui:composition template="/WEB-INF/templates/#{loginController.templateType}/#{loginController.templateType}_base.tpl">
                <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_SHOW_ADDRESSBOOK}</ui:define>