Continued:

- updated jars
- internationalized more templates
Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 4c3d68de8dd147c6cea847cc09d39662582273f6..c276670dfb4bd7478148b7a5dcc1654e7aab729c 100644 (file)
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 76275bc5286545639ba166899a74720d7a23b45e..feab2261b3447aeb4614e90bfd8ca72d832c9bb9 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -77,19 +77,19 @@ GUEST_ENTER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben:
 ENTER_CUSTOMER_NUMBER=Kundennummer:
 ENTER_PASSWORD=Passwort:
 BUTTON_CUSTOMER_LOGIN=Zum Kundenbereich einloggen
-LINK_HOME_TITLE=Eingangsseite
-LINK_HOME=Home
+LINK_GUEST_HOME_TITLE=Eingangsseite
+LINK_GUEST_HOME=Home
 LINK_BASKET=Warenkorb
 LINK_CLOSE_SESSION_TITLE=Sitzung beennden
 LINK_CLOSE_SESSION=Sitzung beenden
 MENU_HOME_TITLE=Shop
 MENU_CUSTOMER_TITLE=Kundenbereich
-LINK_CUSTOMER_LOGIN_TITLE=Login f\u00fcr bestehende Kunden
-LINK_CUSTOMER_LOGIN=Einloggen
-LINK_CUSTOMER_REGISTER_TITLE=Anmeldung als neuer Kunde
-LINK_CUSTOMER_REGISTER=Neuer Kunde
-LINK_CUSTOMER_PASSWORD_TITLE=Neues Passwort erstellen
-LINK_CUSTOMER_PASSWORD=Passwort vergessen?
+LINK_GUEST_LOGIN_TITLE=Login f\u00fcr bestehende Kunden
+LINK_GUEST_LOGIN=Einloggen
+LINK_GUEST_REGISTER_TITLE=Anmeldung als neuer Kunde
+LINK_GUEST_REGISTER=Neuer Kunde
+LINK_GUEST_PASSWORD_TITLE=Neues Passwort erstellen
+LINK_GUEST_PASSWORD=Passwort vergessen?
 LINK_TO_BASKET=Zum Warenkorb
 LINK_CONTINUE_SHOPPING=Weiter einkaufen
 LINK_CONTINUE_SHOPPING_TITLE=Klicken zum Fortfahren mit dem Einkauf.
@@ -163,6 +163,22 @@ SUB_TITLE_CUSTOMER_CHECKOUT_DONE=Der Bestellvorgang ist abgeschlossen:
 PAGE_TITLE_CUSTOMER_EMPTY_BASKET=Leerer Warenkorb!
 SUB_TITLE_CUSTOMER_EMPTY_BASKET=Sie haben keine Artikel zum Warenkorb hinzugef\u00fcgt:
 LINK_OPEN_RECEIPT=Rechnung ansehen
-
 ERROR_AMOUNT_IS_NULL=Die Bestellmenge ist nicht gesetzt.
 ERROR_AMOUNT_IS_NOT_LONG=Die eingegebene Menge ist keine Zahl.
+LINK_ADMIN_INDEX_TITLE=Zur Willkommensseite
+LINK_ADMIN_CATEGORY_TITLE=Kategorie
+LINK_ADMIN_PRODUCT_TITLE=Produkte
+LINK_ADMIN_LOGOUT_TITLE=Ausloggen
+LINK_ADMIN_TO_WEBPAGE_TITLE=Zur Webseite, aber eingeloggt bleiben
+LINK_ADMIN_INDEX=Home
+LINK_ADMIN_CATEGORY=Kategorie
+LINK_ADMIN_PRODUCT=Produkte
+LINK_ADMIN_LOGOUT=Ausloggen
+LINK_ADMIN_TO_WEBPAGE=Webseite aufrufen
+LINK_ADMIN_FOOTER_TO_WEBPAGE=Zur Webseite
+LINK_GUEST_IMPRINT=Impressum
+LINK_GUEST_TERMS=AGBs
+LINK_GUEST_PRIVACY=Datenschutz
+LINK_GUEST_IMPRINT_TITLE=Impressum
+LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen
+LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index ff99bb847089cf61e61005956e556f6ace6d66b8..8514d8515ed76c94bf3fcfafe8b211c0bd274486 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -77,19 +77,19 @@ GUEST_ENTER_LOGIN_DATA_LEGEND=Please enter your login data:
 ENTER_CUSTOMER_NUMBER=Customer number:
 ENTER_PASSWORD=Password:
 BUTTON_CUSTOMER_LOGIN=Login to customer area
-LINK_HOME_TITLE=Home page
-LINK_HOME=Home
+LINK_GUEST_HOME_TITLE=Home page
+LINK_GUEST_HOME=Home
 LINK_BASKET=Basket
 LINK_CLOSE_SESSION_TITLE=Close session
 LINK_CLOSE_SESSION=Close session
 MENU_HOME_TITLE=Shop
 MENU_CUSTOMER_TITLE=Customer area
-LINK_CUSTOMER_LOGIN_TITLE=Login for existing customers
-LINK_CUSTOMER_LOGIN=Login
-LINK_CUSTOMER_REGISTER_TITLE=Registration for new customer
-LINK_CUSTOMER_REGISTER=Registration
-LINK_CUSTOMER_PASSWORD_TITLE=Create new password
-LINK_CUSTOMER_PASSWORD=Lost password?
+LINK_GUEST_LOGIN_TITLE=Login for existing customers
+LINK_GUEST_LOGIN=Login
+LINK_GUEST_REGISTER_TITLE=Registration for new customer
+LINK_GUEST_REGISTER=Registration
+LINK_GUEST_PASSWORD_TITLE=Create new password
+LINK_GUEST_PASSWORD=Lost password?
 LINK_TO_BASKET=To basket
 LINK_CONTINUE_SHOPPING=Continue shopping
 LINK_CONTINUE_SHOPPING_TITLE=Click to continue shopping.
@@ -163,6 +163,22 @@ SUB_TITLE_CUSTOMER_CHECKOUT_DONE=The checkout is completed:
 PAGE_TITLE_CUSTOMER_EMPTY_BASKET=Empty basket!
 SUB_TITLE_CUSTOMER_EMPTY_BASKET=You have no products added to basket:
 LINK_OPEN_RECEIPT=View receipt
-
 ERROR_AMOUNT_IS_NULL=Order amount is not set.
 ERROR_AMOUNT_IS_NOT_LONG=The entered amount is not a number.
+LINK_ADMIN_INDEX_TITLE=To welcome page
+LINK_ADMIN_CATEGORY_TITLE=Categories
+LINK_ADMIN_PRODUCT_TITLE=Products
+LINK_ADMIN_LOGOUT_TITLE=Ausloggen
+LINK_ADMIN_TO_WEBPAGE_TITLE=Zur Webseite, aber eingeloggt bleiben
+LINK_ADMIN_INDEX=Home
+LINK_ADMIN_CATEGORY=Kategorie
+LINK_ADMIN_PRODUCT=Produkte
+LINK_ADMIN_LOGOUT=Ausloggen
+LINK_ADMIN_TO_WEBPAGE=Webseite aufrufen
+LINK_ADMIN_FOOTER_TO_WEBPAGE=Zur Webseite
+LINK_GUEST_IMPRINT=Impressum
+LINK_GUEST_TERMS=AGBs
+LINK_GUEST_PRIVACY=Datenschutz
+LINK_GUEST_IMPRINT_TITLE=Impressum
+LINK_GUEST_TERMS_TITLE=Allgemeine Gesch\u00e4ftsbedingungen
+LINK_GUEST_PRIVACY_TITLE=Datenschutzbestimmungen

diff --git a/web/WEB-INF/templates/admin/admin_footer.tpl b/web/WEB-INF/templates/admin/admin_footer.tpl
index ecdae42ab06cccba47c0b28949796c3313dc074b..2a8e7433dec3e3bd47ebdb79d57aa92c4fa436d8 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_footer.tpl
+++ b/web/WEB-INF/templates/admin/admin_footer.tpl
@@ -5,7 +5,7 @@
        xmlns:ui="http://java.sun.com/jsf/facelets">
        <div class="footer">
                <ul class="footer_nav">
-                       <li><h:link outcome="index" value="Zur Webseite" /></li>
+                       <li><h:link outcome="index" value="#{msg.LINK_ADMIN_FOOTER_TO_WEBPAGE}" /></li>
                </ul>
        </div>
 

diff --git a/web/WEB-INF/templates/admin/admin_menu.tpl b/web/WEB-INF/templates/admin/admin_menu.tpl
index 0af3c6a327fd1000bed5ff99a12c9ab92fd08875..6a561724ffb7a46f662ddd305bcbff8485fc20c3 100644 (file)
--- a/web/WEB-INF/templates/admin/admin_menu.tpl
+++ b/web/WEB-INF/templates/admin/admin_menu.tpl
@@ -11,9 +11,9 @@
                        </div>
 
                        <ul>
-                               <li><h:link title="Zur Willkommensseite" outcome="admin_index" value="Home" /></li>
-                               <li><h:link title="Kategorie" outcome="admin_category" value="Kategorie" /></li>
-                               <li><h:link title="Produkt" outcome="admin_product" value="Produkte" /></li>
+                               <li><h:link title="#{msg.LINK_ADMIN_INDEX_TITLE}" outcome="admin_index" value="#{msg.LINK_ADMIN_INDEX}" /></li>
+                               <li><h:link title="#{msg.LINK_ADMIN_CATEGORY_TITLE}" outcome="admin_category" value="#{msg.LINK_ADMIN_CATEGORY}" /></li>
+                               <li><h:link title="#{msg.LINK_ADMIN_PRODUCT_TITLE}" outcome="admin_product" value="#{msg.LINK_ADMIN_PRODUCT}" /></li>
                        </ul>
 
                        <div class="menu_header">
@@ -21,8 +21,8 @@
                        </div>
 
                        <ul>
-                               <li><h:link title="Ausloggen" outcome="admin_logout" value="Ausloggen" /></li>
-                               <li><h:link title="Zur Webseite, aber eingeloggt bleiben" outcome="index" value="Webseite aufrufen" /></li>
+                               <li><h:link title="#{msg.LINK_ADMIN_LOGOUT_TITLE}" outcome="admin_logout" value="#{msg.LINK_ADMIN_LOGOUT}" /></li>
+                               <li><h:link title="#{msg.LINK_ADMIN_TO_WEBPAGE_TITLE}" outcome="index" value="#{msg.LINK_ADMIN_TO_WEBPAGE}" /></li>
                        </ul>
                </div>
        </div>

diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl
index 8c22599bc3f03c8072a5495a3ec65de1635054d4..e327def56a801c208dbf956c2d4b2fce5be5eb8e 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_footer.tpl
+++ b/web/WEB-INF/templates/guest/guest_footer.tpl
@@ -6,10 +6,10 @@
        xmlns:ui="http://java.sun.com/jsf/facelets">
        <div class="footer">
                <ul class="footer_nav">
-                       <li class="footer_link"><h:link outcome="index" value="Home" /></li>
-                       <li class="footer_link"><h:link outcome="imprint" value="Impressum" /></li>
-                       <li class="footer_link"><h:link outcome="terms" value="AGBs" /></li>
-                       <li class="footer_link"><h:link outcome="privacy" value="Datenschutz" /></li>
+                       <li class="footer_link"><h:link outcome="index" title="#{msg.LINK_GUEST_HOME_TITLE}" value="#{msg.LINK_GUEST_HOME}" /></li>
+                       <li class="footer_link"><h:link outcome="imprint" title="#{msg.LINK_GUEST_IMPRINT_TITLE}" value="#{msg.LINK_GUEST_IMPRINT}" /></li>
+                       <li class="footer_link"><h:link outcome="terms" title="#{msg.LINK_GUEST_TERMS_TITLE}" value="#{msg.LINK_GUEST_TERMS}" /></li>
+                       <li class="footer_link"><h:link outcome="privacy" title="#{msg.LINK_GUEST_PRIVACY_TITLE}" value="#{msg.LINK_GUEST_PRIVACY}" /></li>
                        <li class="footer_copyright">Copyright (c) 2015 by Roland Häder</li>
                </ul>
        </div>

diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl
index d880f9fee6733aa1e78a74dc5c42a436761cff98..467165b5c808d64b5f372af57520a346c38dd2f4 100644 (file)
--- a/web/WEB-INF/templates/guest/guest_menu.tpl
+++ b/web/WEB-INF/templates/guest/guest_menu.tpl
@@ -12,7 +12,7 @@
                        </div>
 
                        <ul>
-                               <li><h:link title="#{msg.LINK_HOME_TITLE}" outcome="index" value="#{msg.LINK_HOME}" /></li>
+                               <li><h:link title="#{msg.LINK_GUEST_HOME_TITLE}" outcome="index" value="#{msg.LINK_GUEST_HOME}" /></li>
                                <li><h:link title="#{msg.LINK_TO_BASKET_TITLE}" outcome="basket" value="#{msg.LINK_BASKET}" /></li>
                                <li><h:link title="#{msg.LINK_CLOSE_SESSION_TITLE}" outcome="logout" value="#{msg.LINK_CLOSE_SESSION}" /></li>
                        </ul>
@@ -22,9 +22,9 @@
                        </div>
 
                        <ul>
-                               <li><h:link title="#{msg.LINK_CUSTOMER_LOGIN_TITLE}" outcome="customer_login" value="#{msg.LINK_CUSTOMER_LOGIN}" /></li>
-                               <li><h:link title="#{msg.LINK_CUSTOMER_REGISTER_TITLE}" outcome="customer_register" value="#{msg.LINK_CUSTOMER_REGISTER}" /></li>
-                               <li><h:link title="#{msg.LINK_CUSTOMER_PASSWORD_TITLE}" outcome="customer_lost_passwd" value="#{msg.LINK_CUSTOMER_PASSWORD}" /></li>
+                               <li><h:link title="#{msg.LINK_GUEST_LOGIN_TITLE}" outcome="customer_login" value="#{msg.LINK_GUEST_LOGIN}" /></li>
+                               <li><h:link title="#{msg.LINK_GUEST_REGISTER_TITLE}" outcome="customer_register" value="#{msg.LINK_GUEST_REGISTER}" /></li>
+                               <li><h:link title="#{msg.LINK_GUEST_PASSWORD_TITLE}" outcome="customer_lost_passwd" value="#{msg.LINK_GUEST_PASSWORD}" /></li>
                        </ul>
                </div>
        </div>