]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Translation update:
authorRoland Haeder <roland@mxchange.org>
Tue, 15 Sep 2015 07:58:46 +0000 (09:58 +0200)
committerRoland Haeder <roland@mxchange.org>
Tue, 15 Sep 2015 07:58:46 +0000 (09:58 +0200)
- internationalized a lot more strings + translated them to English
- added doctype in output pages (not templates)
- added XML definition in all pages where absent
Signed-off-by:Roland Häder <roland@mxchange.org>

28 files changed:
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java
src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java
web/WEB-INF/templates.dist/admin_page.xhtml
web/WEB-INF/templates.dist/guest_page.xhtml
web/WEB-INF/templates/base.tpl
web/WEB-INF/templates/basket/mini_basket.tpl
web/WEB-INF/templates/basket/mini_basket_empty.tpl
web/WEB-INF/templates/generic/gender_selection_box.tpl
web/WEB-INF/templates/guest/guest_base.tpl
web/WEB-INF/templates/guest/guest_footer.tpl
web/WEB-INF/templates/guest/guest_login_form.tpl
web/WEB-INF/templates/guest/guest_menu.tpl
web/admin/admin_logout.xhtml
web/admin/category.xhtml
web/admin/index.xhtml
web/admin/product.xhtml
web/basket.xhtml
web/bye.xhtml
web/customer/login.xhtml
web/customer/lost_passwd.xhtml
web/customer/register.xhtml
web/imprint.xhtml
web/index.xhtml
web/item_added.xhtml
web/privacy.xhtml
web/terms.xhtml

index fdb786d828b999d2cd82e0f35a90339a560c5f05..d5721ad2fb8b1ec6b54fb38c44982f93f6430024 100644 (file)
@@ -18,16 +18,15 @@ GENDER_UNKNOWN=Unbekannt
 GENDER_MALE=Herr
 GENDER_FEMALE=Frau
 GENDER_COMPANY=Firma
-MiniBasketTag.basket_is_empty=Der Warenkorb ist leer.
-MiniBasketTag.last_item=Zuletzt hinzugefuegt: {0}
-MiniBasketTag.additional_items=Es befinden sich noch {0} weitere Produkte im Warenkorb.
-MiniBasketTag.to_basket=Zum Warenkorb
-MiniBasketTag.header=Warenkorb
+MINI_BASKET_IS_EMPTY=Der Warenkorb ist leer.
+MINI_BASKET_LAST_ITEM=Zuletzt hinzugefuegt: {0}
+MINI_BASKET_ADDITIONAL_ITEMS=Es befinden sich noch {0} weitere Produkte im Warenkorb.
+MINI_BASKET_TITLE=Warenkorb
 ADMIN_CATEGORY_HAS_NO_PARENT=Keine Elternkategorie
 YES=Ja
 NO=Nein
 ADMIN_PARENT_CATEGORY_CANNOT_BE_NULL=Elternkategorie darf nicht leer sein.
-ADMIN_CATEGORY_MUST_BE_SELECTED=Es muss eine Kategorie ausgewaehlt werden.
+ADMIN_CATEGORY_MUST_BE_SELECTED=Es muss eine Kategorie ausgew\u00e4hlt werden.
 ERROR_AMOUNT_IS_NULL=Die Bestellmenge ist nicht gesetzt.
 BUTTON_TITLE_ADD_ITEM_TO_BASKET=F\u00fcgt das Produkt dem Warenkorb hinzu.
 INPUT_TITLE_ENTER_ITEM_AMOUNT=Geben Sie hier die Bestellmenge ein.
@@ -60,16 +59,16 @@ SUB_TITLE_ADMIN_PRODUCTS=Diese Produkte sind erstellt worden:
 PAGE_TITLE_ADMIN_PRODUCTS=Produkte
 BUTTON_RESET_FORM=Formular zur\u00fccksetzen
 BUTTON_EDIT_ENTRIES=\u00c4ndern
-BUTTON_DELETE_ENTRIES=L\u00f6schen
+BUTTON_ADMIN_DELETE_ENTRIES=L\u00f6schen
 ADMIN_ADD_PRODUCT_TITLE=Neues Produkt hinzuf\u00fcgen:
 ADMIN_ADD_CATEGORY_TITLE=Neue Kategorie hinzuf\u00fcgen:
 CATEGORY=Kategorie:
 PLEASE_FILL_ALL_FIELDS=Bitte alle Felder ausf\u00fcllen:
-BUTTON_ADD_CATEGORY=Kategorie hinzuf\u00fcgen
+BUTTON_ADMIN_ADD_CATEGORY=Kategorie hinzuf\u00fcgen
 ADMIN_ENTER_PRODUCT_TITLE=Produktbezeichnung:
 ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE=(z.B. <em>Pizza Italia</em>)
 IS_AVAILABLE=Verf\u00fcgbar:
-BUTTON_ADD_PRODUCT=Produkt hinzuf\u00fcgen
+BUTTON_ADMIN_ADD_PRODUCT=Produkt hinzuf\u00fcgen
 ADMIN_ADD_PRODUCT_NOTICE_TITLE=Hinweise zum Hinzuf\u00fcgen von Produkten:
 ADMIN_ADD_PRODUCT_NOTICE_LINE1=Beim Preis keine W\u00e4hrungszeichen (wie \u20ac usw.) eingeben.
 ADMIN_ADD_PRODUCT_NOTICE_LINE2=Kommastellen mit Punkt, nicht mit Komma abtrennen.
@@ -93,3 +92,15 @@ 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_TO_BASKET=Zum Warenkorb
+LINK_CONTINUE_SHOPPING=Weiter einkaufen
+LINK_CONTINUE_SHOPPING_TITLE=Klicken zum Fortfahren mit dem Einkauf.
+PAGE_TITLE_INDEX_SHOW_BASKET=Warenkorb anzeigen
+SUB_TITLE_INDEX_SHOW_BASKET=Alle im Warenkorb befindlichen Artikel:
+GUEST_ITEM_TITLE=Artikel:
+BUTTON_CHANGE_ITEM_AMOUNT=\u00c4ndern
+PAGE_TITLE_INDEX_IMPRINT=Impressum
+SUB_TITLE_INDEX_IMPRINT=Impressum
+PAGE_TITLE_INDEX_ITEM_ADDED=Produkt zum Warenkorb hinzugef\u00fcgt
+SUB_TITLE_INDEX_ITEM_ADDED=Produkt zum Warenkorb hinzugef\u00fcgt
+GUEST_ITEM_ADDED_TO_BASKET=Der Artikel {0} wurde zum Warenkorb hinzugef\u00fcgt.
index f8e18cc20548c7b9196d7fb1d34bf89303e5ef9e..530f47c32e7a4846e67ab9d57b7b06d48f08b0bc 100644 (file)
@@ -16,11 +16,10 @@ GENDER_UNKNOWN=Unknown
 GENDER_MALE=Mr.
 GENDER_FEMALE=Mrs.
 GENDER_COMPANY=Company
-MiniBasketTag.basket_is_empty=The basket is empty.
-MiniBasketTag.last_item=Last added item: {0}
-MiniBasketTag.additional_items=There are {0} items in the basketController.
-MiniBasketTag.to_basket=To basket
-MiniBasketTag.header=Basket
+MINI_BASKET_IS_EMPTY=The basket is empty.
+MINI_BASKET_LAST_ITEM=Last added item: {0}
+MINI_BASKET_ADDITIONAL_ITEMS=There are {0} items in the basketController.
+MINI_BASKET_TITLE=Basket
 ADMIN_CATEGORY_HAS_NO_PARENT=No parent category
 YES=Yes
 NO=No
@@ -41,7 +40,7 @@ LINK_CHANGE_IN_BASKET=Change in basket
 SINGLE_ITEM_PRICE=Single price:
 CHANGE_ITEM_AMOUNT=Change ordered amount:
 TOTAL_ITEM_PRICE=Sub total:
-TOTAL_ORDER_PRICE=Gesamtsumme:
+TOTAL_ORDER_PRICE=Total:
 NO_ITEMS_ADDED_TO_BASKET=There are no items in the basket.
 ITEM_NOT_ORDERED=Not ordered.
 PAGE_TITLE_ADMIN_WELCOME=Welcome to administration area
@@ -58,16 +57,16 @@ SUB_TITLE_ADMIN_PRODUCTS=These products has been created:
 PAGE_TITLE_ADMIN_PRODUCTS=Products
 BUTTON_RESET_FORM=Reset form
 BUTTON_EDIT_ENTRIES=Edit
-BUTTON_DELETE_ENTRIES=Delete
+BUTTON_ADMIN_DELETE_ENTRIES=Delete
 ADMIN_ADD_PRODUCT_TITLE=Add a new product:
 ADMIN_ADD_CATEGORY_TITLE=Add a new category:
 CATEGORY=Category:
 PLEASE_FILL_ALL_FIELDS=Please fill out all fields:
-BUTTON_ADD_CATEGORY=Add category
+BUTTON_ADMIN_ADD_CATEGORY=Add category
 ADMIN_ENTER_PRODUCT_TITLE=Product title:
 ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE=e.g. <em>Pizza Italia</em>
 IS_AVAILABLE=Available:
-BUTTON_ADD_PRODUCT=Add product
+BUTTON_ADMIN_ADD_PRODUCT=Add product
 ADMIN_ADD_PRODUCT_NOTICE_TITLE=Notices for adding new product:
 ADMIN_ADD_PRODUCT_NOTICE_LINE1=Please don't use currency symbol, such as \u20ac.
 ADMIN_ADD_PRODUCT_NOTICE_LINE2=Separte with dot, not with comma (usual in Germany).
@@ -78,7 +77,7 @@ GUEST_ENTER_LOGIN_DATA_LEGEND=Please enter your login data:
 CUSTOMER_NUMBER=Customer number:
 PASSWORD=Password:
 BUTTON_CUSTOMER_LOGIN=Login to customer area
-LINK_HOME_TITLE=Eingangsseite
+LINK_HOME_TITLE=Home page
 LINK_HOME=Home
 LINK_BASKET=Basket
 LINK_CLOSE_SESSION_TITLE=Close session
@@ -91,3 +90,15 @@ 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_TO_BASKET=To basket
+LINK_CONTINUE_SHOPPING=Continue shopping
+LINK_CONTINUE_SHOPPING_TITLE=Click to continue shopping.
+PAGE_TITLE_INDEX_SHOW_BASKET=Show basket
+SUB_TITLE_INDEX_SHOW_BASKET=Following items are in basket:
+GUEST_ITEM_TITLE=Item:
+BUTTON_CHANGE_ITEM_AMOUNT=Change
+PAGE_TITLE_INDEX_IMPRINT=Imprint
+SUB_TITLE_INDEX_IMPRINT=Imprint:
+PAGE_TITLE_INDEX_ITEM_ADDED=Item has been added to basket
+SUB_TITLE_INDEX_ITEM_ADDED=Item has been added to basket:
+GUEST_ITEM_ADDED_TO_BASKET=The item {0} has been added to the basket.
index 51befd64a552d2288c890da8a187bfe1b0282a6f..09f4e10c3d3ac1c0794def5d795488ea6dfbc402 100644 (file)
@@ -16,6 +16,7 @@
  */
 package org.mxchange.pizzaapplication.beans.basket;
 
+import java.text.MessageFormat;
 import java.util.List;
 import javax.annotation.PostConstruct;
 import javax.enterprise.context.SessionScoped;
@@ -87,26 +88,26 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl
        public String addItem (final Product product) {
                // Generate item instance
                AddableBasketItem item = new BasketItem(product, this.getAmount());
-               
+
                // Is amount set?
                if (this.getAmount() == null) {
                        // No amount specified?!
                        return null;
                }
-               
+
                try {
                        // item should not be null
                        if (null == item) {
                                // Abort here
                                throw new NullPointerException("item is null"); //NOI18N
                        }
-                       
+
                        // Deligate to model
                        this.basket.addItem(item);
-                       
+
                        // Remove amount
                        this.setAmount(null);
-                       
+
                        // Added
                        return "item_added"; //NOI18N
                } catch (final BasketItemAlreadyAddedException ex) {
@@ -290,6 +291,34 @@ public class BasketWebBean extends BaseFrameworkBean implements BasketWebControl
                return isAdded;
        }
 
+       @Override
+       public String outputLastAddedItem () {
+               // Default message
+               String lastItem = ""; //NOI18N
+
+               // Get instance
+               AddableBasketItem item = this.getLast();
+
+               // Is it set?
+               if (item instanceof AddableBasketItem) {
+                       // Get type
+                       switch (item.getItemType()) {
+                               case "product": // Sellable product //NOI18N
+                                       assert(item.getProduct() instanceof Product) : MessageFormat.format("item {0} has no product instance set.", item); //NOI18N
+
+                                       // Get title
+                                       lastItem = item.getProduct().getTitle();
+                                       break;
+
+                               default: // Not supported
+                                       throw new FacesException(MessageFormat.format("item type {0} is not supported.", item.getItemType())); //NOI18N
+                       }
+               }
+
+               // Return it
+               return lastItem;
+       }
+
        /**
         * Getter for basket bean instance
         *
index 677c3c96533b7e12a36ad4dafb3cfc195d3663a3..46d5b40c92177bff99ffdaa034491be8d4371687 100644 (file)
@@ -150,4 +150,11 @@ public interface BasketWebController extends Serializable {
         * @return Page redirection
         */
        public String changeItem (final AddableBasketItem item);
+
+       /**
+        * Outputs last added item in the basket.
+        * 
+        * @return Last added item
+        */
+       public String outputLastAddedItem();
 }
index c83abe253428d686115fb94eeae4c08df4be499e..23940e06c1031b63fe8746a0f4e7c3e63100cd83 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
index 0622bd442bc454cacbebbf91b608b249496fd601..9dcb5701f4aa32275e14b54f2da9bb4fc70114d4 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
index a70734cda7a757a3ca1a59d9b440abbd64ed95f0..f5d426eb059e190e96e7c28e01b933084d09ce94 100644 (file)
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<?xml version="1.0" encoding="UTF-8" ?>
 <html
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:h="http://java.sun.com/jsf/html"
                        </div>
                </div>
 
+               <!--
+               Mini basket on left side
+               //-->
+               <div id="mini_basket">
+                       <ui:insert name="basket" />
+               </div>
+
                <div id="menu_content">
                        <div id="left">
                                <ui:insert name="menu">Default menu</ui:insert>
@@ -34,6 +41,7 @@
                                <div id="content_header">
                                        <ui:insert name="content_header">Default content header</ui:insert>
                                </div>
+
                                <div id="content">
                                        <ui:insert name="content">Default content</ui:insert>
                                </div>
index 409b30562c2eb543aff2127a96457d8a58e4d787..9b5a09acc61f4aceb4865f6dc1533d8c1e3e549c 100644 (file)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
@@ -6,19 +7,23 @@
 
        <div class="mini_basket_box">
                <div class="mini_basket_header">
-                       #{msg.mini_basketController.header}
+                       #{msg.MINI_BASKET_TITLE}
                </div>
 
                <div class="mini_basket_last">
-                       #{msg.mini_basketController.last_item}
+                       <h:outputFormat value="#{msg.MINI_BASKET_LAST_ITEM}">
+                               <f:param value="#{basketController.outputLastAddedItem()}" />
+                       </h:outputFormat>
                </div>
 
                <div class="mini_basket_more">
-                       #{msg.mini_basketController.additional_items}
+                       <h:outputFormat value="#{msg.MINI_BASKET_ADDITIONAL_ITEMS}">
+                               <f:param value="#{basketController.lastNumRows}" />
+                       </h:outputFormat>
                </div>
 
                <div class="mini_basket_link">
-                       <h:link id="to_basket" outcome="basket" title="#{msg.mini_basketController.to_basket}" value="#{msg.mini_basketController.to_basket}" />
+                       <h:link id="to_basket" outcome="basket" title="#{msg.LINK_TO_BASKET_TITLE}" value="#{msg.LINK_TO_BASKET}" />
                </div>
        </div>
 </ui:composition>
index a4339b7d03fc70590bb9d9a0db989eecedb174b4..002d33a47d95a26ba8ca2f435df7dfe3524d9650 100644 (file)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
@@ -5,6 +6,16 @@
        xmlns:ui="http://java.sun.com/jsf/facelets">
 
        <div class="mini_basket_box">
-               #{MiniBasketTag.basket_is_empty}
+               <div class="mini_basket_header">
+                       #{msg.MINI_BASKET_TITLE}
+               </div>
+
+               <div class="mini_basket_last">
+                       #{msg.MINI_BASKET_IS_EMPTY}
+               </div>
+
+               <div class="mini_basket_link">
+                       <h:link id="to_index" outcome="index" title="#{msg.LINK_CONTINUE_SHOPPING_TITLE}" value="#{msg.LINK_CONTINUE_SHOPPING}" />
+               </div>
        </div>
 </ui:composition>
index 940d90e2de7dbf2ce2682dc8909671ab2e18403e..84d66b9a208d86671acaebe8942e1c092241c002 100644 (file)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
index ec48401064af064e1b5581f527364d29aaa83afb..7b8ebca624048398825684bed34cf5a07d0cf0fc 100644 (file)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        template="/WEB-INF/templates/base.tpl"
        xmlns="http://www.w3.org/1999/xhtml"
@@ -6,12 +7,17 @@
        <ui:define name="title"><ui:insert name="guest_title" class="guest_title" /></ui:define>
 
        <!--
-       Show basket if it contains items, else show an empty basketController.
+       Show basket if it contains items, else show an empty basket.
        //-->
-       <ui:fragment rendered="#{basketController.isEmpty()}">
-               <ui:include src="/WEB-INF/templates/basket/mini_basket_empty.tpl" />
-       </ui:fragment>
-       <ui:fragment rendered="#{basketController.hasItems()}">
-               <ui:include src="/WEB-INF/templates/basket/mini_basketController.tpl" />
-       </ui:fragment>
+       <ui:define name="basket">
+               <ui:fragment rendered="#{basketController.isEmpty()}">
+                       <!-- Empty basket //-->
+                       <ui:include src="/WEB-INF/templates/basket/mini_basket_empty.tpl" />
+               </ui:fragment>
+
+               <ui:fragment rendered="#{basketController.hasItems()}">
+                       <!-- At least one item is there //-->
+                       <ui:include src="/WEB-INF/templates/basket/mini_basket.tpl" />
+               </ui:fragment>
+       </ui:define>
 </ui:composition>
index 34e6c7a6a038ad76ff3308924966b34e58e7ca55..8c22599bc3f03c8072a5495a3ec65de1635054d4 100644 (file)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
index 2815b072550f4d22c509f8aff7e23661171497a3..93eeb4c30a6ec0cb8bf05af9a40d12e1fc7dc013 100644 (file)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
index 297e82f667193b3723e7005a1eb3cc462da35a82..b36a3a387a71f21f9a1e21eddfbc7c4da3d9ed43 100644 (file)
@@ -1,27 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <ui:composition
        xmlns="http://www.w3.org/1999/xhtml"
        xmlns:f="http://java.sun.com/jsf/core"
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://java.sun.com/jsf/facelets">
-       <div class="menu">
-               <div class="menu_header">
-                       #{msg.MENU_HOME_TITLE}
-               </div>
+       <div class="menu_outer">
+               <div class="menu">
+                       <div class="menu_header">
+                               #{msg.MENU_HOME_TITLE}
+                       </div>
 
-               <ul>
-                       <li><h:link title="#{msg.LINK_HOME_TITLE}" outcome="index" value="#{msg.LINK_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>
+                       <ul>
+                               <li><h:link title="#{msg.LINK_HOME_TITLE}" outcome="index" value="#{msg.LINK_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>
 
-               <div class="menu_header">
-                       #{msg.MENU_CUSTOMER_TITLE}
-               </div>
+                       <div class="menu_header">
+                               #{msg.MENU_CUSTOMER_TITLE}
+                       </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>
-               </ul>
+                       <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>
+                       </ul>
+               </div>
        </div>
 </ui:composition>
index c7514e593c9d687e6ed8a1b6253381f580be7b99..dac346def3131ec8ef2908a8bdb2e641d0ea355e 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
index a32d8fe3f00c70c8fab51b0d0c8352c11fefc569..1bc8004d8aa269d0d02a6d48162593781c77cf93 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -40,7 +41,7 @@
                                        <div class="table_footer">
                                                <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                <h:commandButton class="submit" type="submit" id="edit" action="#{admin_category.editCategory(cat)}" value="#{msg.BUTTON_EDIT_ENTRIES}" />
-                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteCategory(cat)}" value="#{msg.BUTTON_DELETE_ENTRIES}" />
+                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteCategory(cat)}" value="#{msg.BUTTON_ADMIN_DELETE_ENTRIES}" />
                                        </div>
                                </h:form>
                        </div>
@@ -83,7 +84,7 @@
 
                                        <div class="table_footer">
                                                <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" action="#{admin_category.addCategory()}" value="#{msg.BUTTON_ADD_CATEGORY}" />
+                                               <h:commandButton class="submit" type="submit" action="#{admin_category.addCategory()}" value="#{msg.BUTTON_ADMIN_ADD_CATEGORY}" />
                                        </div>
                                </div>
                                </h:form>
index 5a7b1e445294bec12d4f6d278c7c960429f3b8d7..d1f2e75fc4a7dd14616e6afa3825a60f2133a7ab 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
index 2d1cb934d1f5ec8034c9b14bee6ca7024471cda3..5d38fdb667237d21d13d7060f369fb52d9319747 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -49,7 +50,7 @@
                                        <div  class="table_footer">
                                                <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                <h:commandButton class="submit" type="submit" id="edit" action="#{admin_product.editProduct(product)}" value="#{msg.BUTTON_EDIT_ENTRIES}" />
-                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteProduct(product)}" value="#{msg.BUTTON_DELETE_ENTRIES}" />
+                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteProduct(product)}" value="#{msg.BUTTON_ADMIN_DELETE_ENTRIES}" />
                                        </div>
                                </h:form>
                        </div>
 
                                        <div class="table_footer">
                                                <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
-                                               <h:commandButton class="submit" type="submit" id="add" action="#{admin_product.addProduct()}" value="#{msg.BUTTON_ADD_PRODUCT}" />
+                                               <h:commandButton class="submit" type="submit" id="add" action="#{admin_product.addProduct()}" value="#{msg.BUTTON_ADMIN_ADD_PRODUCT}" />
                                        </div>
                                </div>
                                </h:form>
index d8860243a52f651da1ef04378620d1ee2eba2929..a878d5634fa871d2151630c0ff95a2c3c27567ff 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -6,20 +7,20 @@
          >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">Warenkorb anzeigen</ui:define>
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_SHOW_BASKET}</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">
-                       Alle im Warenkorb befindlichen Artikel:
+                       #{msg.SUB_TITLE_INDEX_SHOW_BASKET}
                </ui:define>
 
                <ui:define name="content">
                        <h:dataTable var="item" value="#{basketController.allItems()}" headerClass="table_header_column" class="table" rendered="#{basketController.hasItems()}">
                                <h:column>
-                                       <f:facet name="header">Artikel:</f:facet>
+                                       <f:facet name="header">#{msg.GUEST_ITEM_TITLE}</f:facet>
 
                                        <ui:fragment rendered="#{item.isProductType()}">
                                                #{item.product.title}
@@ -42,7 +43,7 @@
                                        <f:facet name="header">#{msg.CHANGE_ITEM_AMOUNT}</f:facet>
 
                                        <h:form acceptcharset="utf-8" id="add_item">
-                                               <h:commandButton class="submit" id="add" value="Ändern" action="#{basketController.changeItem(item)}" title="#{msg.BUTTON_TITLE_CHANGE_ITEM_AMOUNT}" />
+                                               <h:commandButton class="submit" id="add" value="#{msg.BUTTON_CHANGE_ITEM_AMOUNT}" action="#{basketController.changeItem(item)}" title="#{msg.BUTTON_TITLE_CHANGE_ITEM_AMOUNT}" />
 
                                                <h:inputText class="input" id="amount" size="3" maxlength="20" value="#{item.amount}" title="#{msg.INPUT_TITLE_ENTER_ITEM_AMOUNT}">
                                                        <!--
index b293326beee901dfc283aca5fd8dd776948ebc6a..82e2362e3b23eaf913d53d8bf844cb09635d1d24 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
index bc320508aa85910d6ffc3eebd86406541855af58..142b36f8871fbc081ad3d0a8c4e6748f94e70219 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
index c853bc2a8c7f50a5d639839c5cd665d4a93f14a0..9b47c621f511ba05579fbba5eb47706e7954e917 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
index aa97b0e3b4f4fd41a64b49a1e6c1efb4a270e9e6..7a00202754f20d38c72a12dbe15027955cfe0a02 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
index db28ca046db3baa4ad09676577221fd6fe9e7dd8..1a47978873b990e420cfc3d944c8ac12f5bf6b56 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -6,18 +8,18 @@
          >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="title">Impressum</ui:define>
+               <ui:define name="title">#{msg.PAGE_TITLE_INDEX_IMPRINT}</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">
-                       Impressum
+                       #{msg.SUB_TITLE_INDEX_IMPRINT}
                </ui:define>
 
                <ui:define name="content">
-                       Hier kommt das Impressum hin!
+                       TODO: Hier kommt das Impressum hin!
                </ui:define>
 
                <ui:define name="footer">
index da8136e84e489250830474a62c70c36a07c42fe4..225b9c29c07d8fba1a081384172527fc014cb3d2 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
index 216b4be2655cf83e2877dd814528d3941db111c2..4ec9835e29b264c5bd871fbda010e246f2b2a878 100644 (file)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
@@ -6,18 +7,20 @@
          >
 
        <ui:composition template="/WEB-INF/templates/guest/guest_base.tpl">
-               <ui:define name="guest_title">Produkt zum Warenkorb hinzugefügt</ui:define>
+               <ui:define name="guest_title">#{msg.PAGE_TITLE_INDEX_ITEM_ADDED}</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">
-                       Produkt zum Warenkorb hinzugefügt
+                       #{msg.SUB_TITLE_INDEX_ITEM_ADDED}
                </ui:define>
 
                <ui:define name="content">
-                       Das Produkt wurde zum Warenkorb hinzugefügt.
+                       <h:outputFormat value="#{msg.GUEST_ITEM_ADDED_TO_BASKET}">
+                               <f:param value="#{basketController.outputLastAddedItem()}" />
+                       </h:outputFormat>
                </ui:define>
 
                <ui:define name="footer">
index c78c75e7efd52458a53b22bdb2b6935c4a91ae21..f3a5ecf4c373c89429e61c4323db3b8438d51851 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"
index 46708d589f38bf09d1b8c844fa5ea9ee64266574..1dfff7794e1ad1eb027a21d02f6e2d13cd4d0869 100644 (file)
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
          xmlns:ui="http://java.sun.com/jsf/facelets"
          xmlns:h="http://xmlns.jcp.org/jsf/html"