From 5185304f93c09535148687393fc774d0f4f0d4b6 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 16 Oct 2015 10:13:52 +0200
Subject: [PATCH] =?utf8?q?Fixed=20german=20umlauts=20and=20links=20+=20i18?=
 =?utf8?q?n=20strings=20Signed-off-by:Roland=20H=C3=A4der=20<roland@mxchan?=
 =?utf8?q?ge.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../org/mxchange/localization/bundle_de_DE.properties  | 10 ++++------
 .../org/mxchange/localization/bundle_en_US.properties  |  1 +
 web/WEB-INF/faces-config.xml                           |  2 +-
 web/WEB-INF/templates/login/login_menu.tpl             |  2 +-
 web/login/login_shared_addressbooks.xhtml              |  2 +-
 web/login/login_show_addressbook.xhtml                 |  7 -------
 6 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 356a8cfe..273f402d 100644
--- 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 d32a5a82..263a5c4a 100644
--- 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 af277878..b41a48a2 100644
--- 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 281c1800..c655637a 100644
--- 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 07bb72d7..cb56073d 100644
--- 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 98ddba15..e7821d8e 100644
--- 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>
 
-- 
2.39.5