some fixes + added missing language 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 e5ffb45e9772fe35ade799854dfca7f94971f89b..69d1da9b7c317e14f985471ee723385f4803f0cd 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -104,3 +104,6 @@ LINK_GUEST_IMPRINT_TITLE=Impressum
 LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen
 LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen
 MENU_USER_TITLE=Benutzer
+ENTER_USER_NAME=Benutzernamen:
+BUTTON_USER_LOGIN=Einloggen
+BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index ce6c596584e3acf643973875fafe3f99f533e839..2d4e31f429c34823ff46534d2d72b6921f12a4f8 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -104,3 +104,6 @@ LINK_GUEST_IMPRINT_TITLE=Impressum
 LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen
 LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen
 MENU_USER_TITLE=User
+ENTER_USER_NAME=User name:
+BUTTON_USER_LOGIN=Login
+BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2

diff --git a/web/WEB-INF/templates/guest/guest_login_form.tpl b/web/WEB-INF/templates/guest/guest_login_form.tpl
index 4cdd1caa724d80d7aac276ed73ac42ffdbd805a4..0e810499b182aa1d301a4369bd474a845fd84505 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_login_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_login_form.tpl
@@ -16,11 +16,11 @@
 
                                        <div class="table_row">
                                                <div class="table_left">
-                                                       <h:outputLabel for="id" value="#{msg.ENTER_USER_NUMBER}" />
+                                                       <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
                                                </div>
 
                                                <div class="table_right">
-                                                       <h:inputText class="input" id="id" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NUMBER_MESSAGE}" />
+                                                       <h:inputText class="input" id="id" size="10" maxlength="20" required="true" requiredMessage="#{msg.LOGIN_NO_USER_NAME_MESSAGE}" />
                                                </div>
                                        </div>
 

diff --git a/web/WEB-INF/templates/guest/guest_registration_form.tpl b/web/WEB-INF/templates/guest/guest_registration_form.tpl
index 7c33d24e9d2da7e451389aadc9a905209f34af03..4b6f9e3d0d63ffea14d6155b35ddf01f7ddec02c 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_registration_form.tpl
+++ b/web/WEB-INF/templates/guest/guest_registration_form.tpl
@@ -69,7 +69,7 @@
                                        </div>
 
                                        <div class="para notice">
-                                               #{msg.GUEST_REGISTRATION_USER_NUMBER_NOTICE}
+                                               #{msg.GUEST_REGISTRATION_USER_NAME_NOTICE}
                                        </div>
                                </fieldset>
                        </div>

diff --git a/web/user/login.xhtml b/web/user/login.xhtml
index c044f109c2341ae332697c272e3067b1080522f8..fada53c00f350439b14e1bdec2cb175366a2568d 100644 (file)
--- a/web/user/login.xhtml
+++ b/web/user/login.xhtml
@@ -7,21 +7,21 @@
          xmlns:f="http://xmlns.jcp.org/jsf/core"
          >
 
-       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="customer_login">
-               <ui:define name="title">#{msg.PAGE_TITLE_CUSTOMER_LOGIN}</ui:define>
+       <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl" id="user_login">
+               <ui:define name="title">#{msg.PAGE_TITLE_USER_LOGIN}</ui:define>
 
                <ui:define name="menu">
                        <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
                </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_CUSTOMER_LOGIN}
+                       #{msg.SUB_TITLE_USER_LOGIN}
                </ui:define>
 
                <ui:define name="content">
                        <div class="para">
                                <!-- TODO Internatialize this somehow //-->
-                               Noch kein Kunde? Einfach beim Bestellen anmelden oder <h:link id="customer_register" outcome="customer_register" title="Als Kunde anmelden">hier</h:link> anmelden.
+                               Noch kein Kunde? Einfach beim Bestellen anmelden oder <h:link id="user_register" outcome="user_register" title="Als Kunde anmelden">hier</h:link> anmelden.
                        </div>
 
                        <div class="para">
@@ -29,7 +29,7 @@
                        </div>
 
                        <div class="para">
-                               <h:link id="customer_lost_password" outcome="customer_lost_passwd" title="Passwort wiederherstellen" value="Passwort vergessen?" />
+                               <h:link id="user_lost_password" outcome="user_lost_passwd" title="Passwort wiederherstellen" value="Passwort vergessen?" />
                        </div>
                </ui:define>
 

diff --git a/web/user/lost_passwd.xhtml b/web/user/lost_passwd.xhtml
index 25f95e22b519a15be60170bae326beb3a5eee309..f7bf52b2809a82f2e141fa3db60bedf5182f2519 100644 (file)
--- a/web/user/lost_passwd.xhtml
+++ b/web/user/lost_passwd.xhtml
@@ -8,18 +8,18 @@
          >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="title">#{msg.PAGE_TITLE_CUSTOMER_LOST_PASSWORD}</ui:define>
+               <ui:define name="title">#{msg.PAGE_TITLE_USER_LOST_PASSWORD}</ui:define>
 
                <ui:define name="menu">
                        <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
                </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_CUSTOMER_LOST_PASSWORD}
+                       #{msg.SUB_TITLE_USER_LOST_PASSWORD}
                </ui:define>
 
                <ui:define name="content">
-                       <div class="para" id="customer_lost_password_content">
+                       <div class="para" id="user_lost_password_content">
                                <h:form acceptcharset="utf-8" id="lost_password_form">
                                        <div class="table">
                                                <div class="table_header">
@@ -31,7 +31,7 @@
 
                                                        <div class="table_row">
                                                                <div class="table_left">
-                                                                       <h:outputLabel for="id" value="#{msg.ENTER_CUSTOMER_NUMBER}" />
+                                                                       <h:outputLabel for="id" value="#{msg.ENTER_USER_NAME}" />
                                                                </div>
 
                                                                <div class="table_right">

diff --git a/web/user/register.xhtml b/web/user/register.xhtml
index 2d91ead42c11b66cab5c3b0ab63aec607af0b39f..efaa35b9c960611e20e6e21d506bc0d0e3dc9d77 100644 (file)
--- a/web/user/register.xhtml
+++ b/web/user/register.xhtml
@@ -8,19 +8,19 @@
          >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="title">#{msg.PAGE_TITLE_CUSTOMER_REGISTER}</ui:define>
+               <ui:define name="title">#{msg.PAGE_TITLE_USER_REGISTER}</ui:define>
 
                <ui:define name="menu">
                        <ui:include id="menu" class="guest_menu" src="/WEB-INF/templates/guest/guest_menu.tpl" />
                </ui:define>
 
                <ui:define name="content_header">
-                       #{msg.SUB_TITLE_CUSTOMER_REGISTER}
+                       #{msg.SUB_TITLE_USER_REGISTER}
                </ui:define>
 
                <ui:define name="content">
                        <div class="para">
-                               Sie sind bereits Kunde? Dann <h:link outcome="customer_login" value="hier" /> einloggen.
+                               Sie sind bereits Kunde? Dann <h:link outcome="user_login" value="hier" /> einloggen.
                        </div>
 
                        <div class="registration_form">