]> git.mxchange.org Git - pizzaservice-war.git/commitdiff
Translation update:
authorRoland Haeder <roland@mxchange.org>
Mon, 14 Sep 2015 13:29:42 +0000 (15:29 +0200)
committerRoland Haeder <roland@mxchange.org>
Mon, 14 Sep 2015 13:29:58 +0000 (15:29 +0200)
- internationalized a lot more strings + translated them to English
- prefixed some messages with ADMIN_ as they only occur in admin area (please find and fix all)
Signed-off-by:Roland Häder <roland@mxchange.org>

15 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/controller/ShopWebBean.java
web/WEB-INF/templates/admin/admin_category_selection_box.tpl
web/WEB-INF/templates/admin/admin_parent_category_selection_box.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/customer/lost_passwd.xhtml
web/customer/register.xhtml
web/index.xhtml

index 6dc1198c3898f69a7c99d2721a9dc2bf6124eb96..fdb786d828b999d2cd82e0f35a90339a560c5f05 100644 (file)
@@ -23,11 +23,11 @@ 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
-CATEGORY_HAS_NO_PARENT=Keine Elternkategorie
+ADMIN_CATEGORY_HAS_NO_PARENT=Keine Elternkategorie
 YES=Ja
 NO=Nein
-PARENT_CATEGORY_CANNOT_BE_NULL=Elternkategorie darf nicht leer sein.
-CATEGORY_MUST_BE_SELECTED=Es muss eine Kategorie ausgewaehlt werden.
+ADMIN_PARENT_CATEGORY_CANNOT_BE_NULL=Elternkategorie darf nicht leer sein.
+ADMIN_CATEGORY_MUST_BE_SELECTED=Es muss eine Kategorie ausgewaehlt 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.
@@ -36,9 +36,9 @@ NO_PASSWORD_ENTERED=Sie haben kein Passwort eingegeben.
 ERROR_AMOUNT_IS_NOT_LONG=Die eingegebene Menge ist keine Zahl.
 PAGE_TITLE_INDEX_WELCOME=Willkommen!
 SUB_TITLE_INDEX_WELCOME=Willkommen zum Pizza-Service
-FOLLOWING_PRODUCT_ARE_AVAILABLE=Folgende Produkte k\u00f6nnen bestellt werden:
-SUBMIT_ADD_ITEM_TO_BASKET=Hinzuf\u00fcgen
-LINK_TITLE_TO_BASKET=Weiter zum Warenkorb.
+FOLLOWING_PRODUCTS_ARE_AVAILABLE=Folgende Produkte k\u00f6nnen bestellt werden:
+ADMIN_ADD_ITEM_TO_BASKET=Hinzuf\u00fcgen
+LINK_TO_BASKET_TITLE=Weiter zum Warenkorb.
 LINK_CHANGE_IN_BASKET=Im Warenkorb \u00e4ndern
 SINGLE_ITEM_PRICE=Einzelpreis:
 CHANGE_ITEM_AMOUNT=Bestellmenge \u00e4ndern:
@@ -46,3 +46,50 @@ TOTAL_ITEM_PRICE=Zwischensumme:
 TOTAL_ORDER_PRICE=Gesamtsumme:
 NO_ITEMS_ADDED_TO_BASKET=Es befinden sich derzeit keine Artikel im Warenkorb.
 ITEM_NOT_ORDERED=Nicht bestellt.
+PAGE_TITLE_ADMIN_WELCOME=Willkommen zum Administrationsbereich
+SUB_TITLE_ADMIN_WELCOME=Willkommen zur Administration
+PAGE_TITLE_ADMIN_LOGOUT=Ausloggen
+SUB_TITLE_ADMIN_LOGOUT=Aus dem Adminbereich ausloggen
+PAGE_TITLE_ADMIN_CATEGORY=Kategorien
+SUB_TITLE_ADMIN_CATEGORIES=Kategorien administrieren
+SELECT_ENTRY=Ausw\u00e4hlen:
+ADMIN_ENTER_CATEGORY_TITLE=Bezeichnung:
+ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE=z.B. <em>Pizzen</em>
+ADMIN_PARENT_CATEGORY=Elternkategorie:
+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
+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
+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
+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.
+ADMIN_ADD_PRODUCT_NOTICE_LINE3=Keine Tausendertrenner verwenden, auch keine Leerschritte.
+GUEST_ENTER_LOGIN_DATA_TITLE=Bitte geben Sie Ihre Kundennummer und Passwort ein:
+GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Bitte geben Sie die Ihnen vergebene Kundennummer und das dazugeh\u00f6rige Passwort ein.
+GUEST_ENTER_LOGIN_DATA_LEGEND=Bitte Zugangsdaten eingeben:
+CUSTOMER_NUMBER=Kundennummer:
+PASSWORD=Passwort:
+BUTTON_CUSTOMER_LOGIN=Zum Kundenbereich einloggen
+LINK_HOME_TITLE=Eingangsseite
+LINK_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?
index aeb36b2da5b977a2338ee8f352334a051b9bc5b3..f8e18cc20548c7b9196d7fb1d34bf89303e5ef9e 100644 (file)
@@ -21,11 +21,11 @@ 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
-CATEGORY_HAS_NO_PARENT=No parent category
+ADMIN_CATEGORY_HAS_NO_PARENT=No parent category
 YES=Yes
 NO=No
-PARENT_CATEGORY_CANNOT_BE_NULL=Parent category cannot be empty.
-CATEGORY_MUST_BE_SELECTED=You have to select a category.
+ADMIN_PARENT_CATEGORY_CANNOT_BE_NULL=Parent category cannot be empty.
+ADMIN_CATEGORY_MUST_BE_SELECTED=You have to select a category.
 ERROR_AMOUNT_IS_NULL=Order amount is not set.
 BUTTON_TITLE_ADD_ITEM_TO_BASKET=Adds the product to the basket.
 INPUT_TITLE_ENTER_ITEM_AMOUNT=Enter order amount here.
@@ -34,9 +34,9 @@ NO_PASSWORD_ENTERED=You have entered no password.
 ERROR_AMOUNT_IS_NOT_LONG=The entered amount is not a number.
 PAGE_TITLE_INDEX_WELCOME=Welcome!
 SUB_TITLE_INDEX_WELCOME=Welcome to Pizza-Service
-FOLLOWING_PRODUCT_ARE_AVAILABLE=Following products can be ordered:
-SUBMIT_ADD_ITEM_TO_BASKET=Add
-LINK_TITLE_TO_BASKET=Continued to basket page.
+FOLLOWING_PRODUCTS_ARE_AVAILABLE=Following products can be ordered:
+ADMIN_ADD_ITEM_TO_BASKET=Add to basket
+LINK_TO_BASKET_TITLE=Continued to basket page.
 LINK_CHANGE_IN_BASKET=Change in basket
 SINGLE_ITEM_PRICE=Single price:
 CHANGE_ITEM_AMOUNT=Change ordered amount:
@@ -44,3 +44,50 @@ TOTAL_ITEM_PRICE=Sub total:
 TOTAL_ORDER_PRICE=Gesamtsumme:
 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
+SUB_TITLE_ADMIN_WELCOME=Welcome to website administration
+PAGE_TITLE_ADMIN_LOGOUT=Logout
+SUB_TITLE_ADMIN_LOGOUT=Logout from administration area
+PAGE_TITLE_ADMIN_CATEGORY=Categories
+SUB_TITLE_ADMIN_CATEGORIES=Administrate categories
+SELECT_ENTRY=Select:
+ADMIN_ENTER_CATEGORY_TITLE=Title:
+ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE=e.g. <em>pizza</em>
+ADMIN_PARENT_CATEGORY=Parent category:
+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
+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
+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
+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).
+ADMIN_ADD_PRODUCT_NOTICE_LINE3=Don't use thousand separators, including spaces.
+GUEST_ENTER_LOGIN_DATA_TITLE=Please enter your customer number and password:
+GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE=Please enter your assigned customer number and password.
+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=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?
index a0781c691ebb74d0d6d2dad1afb3db4332b910f2..8b7deb7f6b16237ff6d5dbb7a9d11722f55c9e65 100644 (file)
@@ -111,7 +111,7 @@ public class ShopWebBean extends BaseFrameworkBean implements ShopWebController
                Deque<Category> deque = this.getAllCategories();
 
                // Create fake entry
-               Category fake = new ProductCategory(0L, this.getMessage("CATEGORY_HAS_NO_PARENT"), 0L); //NOI18N
+               Category fake = new ProductCategory(0L, this.getMessage("ADMIN_CATEGORY_HAS_NO_PARENT"), 0L); //NOI18N
 
                // Add it
                deque.addFirst(fake);
index 040e4e7f6fc9770e27b8ca4ebf0e65e4c4a3d1c6..6841d02775bb612035c7ea03a075662bf3a25af2 100644 (file)
@@ -4,7 +4,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://java.sun.com/jsf/facelets">
 
-       <h:selectOneMenu class="select" id="parentId" value="#{admin_product.id}" required="true" requiredMessage="#{msg.CATEGORY_MUST_BE_SELECTED}">
+       <h:selectOneMenu class="select" id="parentId" value="#{admin_product.id}" required="true" requiredMessage="#{msg.ADMIN_CATEGORY_MUST_BE_SELECTED}">
                <f:selectItems value="#{controller.allCategories}" var="cat" itemValue="#{cat.id}" itemLabel="#{cat.title}" />
                <f:validateLongRange for="parentId" minimum="0" maximum="1000" />
        </h:selectOneMenu>
index 7faf2c46730a874b16c76c89e8fee4b023216874..9d87117a67c4aa8616120bce9ab13c2dbe766e98 100644 (file)
@@ -4,7 +4,7 @@
        xmlns:h="http://java.sun.com/jsf/html"
        xmlns:ui="http://java.sun.com/jsf/facelets">
 
-       <h:selectOneMenu class="select" id="parentId" value="#{admin_category.parentId}" required="true" requiredMessage="#{msg.PARENT_CATEGORY_CANNOT_BE_NULL}">
+       <h:selectOneMenu class="select" id="parentId" value="#{admin_category.parentId}" required="true" requiredMessage="#{msg.ADMIN_PARENT_CATEGORY_CANNOT_BE_NULL}">
                <f:selectItems value="#{controller.allCategoriesParent}" var="parent_category" itemValue="#{parent_category.id}" itemLabel="#{parent_category.title}" />
        </h:selectOneMenu>
 </ui:composition>
index b2853eac9e7dd95037f916177bdb5befae21a969..34e6c7a6a038ad76ff3308924966b34e58e7ca55 100644 (file)
@@ -9,7 +9,7 @@
                        <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_copyright">Copyright (c) 2015 by Roland Haeder</li>
+                       <li class="footer_copyright">Copyright (c) 2015 by Roland Häder</li>
                </ul>
        </div>
 
index 0f3a6f6065ad9f8a81d379e109ee301116a2aac4..2815b072550f4d22c509f8aff7e23661171497a3 100644 (file)
@@ -7,15 +7,15 @@
                <h:form acceptcharset="utf-8" id="login_form">
                        <div class="table">
                                <div class="table_header">
-                                       Bitte geben Sie Ihre Kundennummer und Passwort ein:
+                                       #{msg.GUEST_ENTER_LOGIN_DATA_TITLE}
                                </div>
 
                                <fieldset id="login_data">
-                                       <legend title="Bitte geben Sie die bei der Anmeldung verwendete EMail-Adresse und das dazugehörige Passwort ein.">Bitte Daten eingeben:</legend>
+                                       <legend title="#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND_TITLE}">#{msg.GUEST_ENTER_LOGIN_DATA_LEGEND}</legend>
 
                                        <div class="table_row">
                                                <div class="table_left">
-                                                       <h:outputLabel for="id" value="Email-Adresse:" />
+                                                       <h:outputLabel for="id" value="#{msg.CUSTOMER_NUMBER}" />
                                                </div>
 
                                                <div class="table_right">
@@ -27,7 +27,7 @@
 
                                        <div class="table_row">
                                                <div class="table_left">
-                                                       <h:outputLabel for="password" value="Passwort:" />
+                                                       <h:outputLabel for="password" value="#{msg.PASSWORD}" />
                                                </div>
 
                                                <div class="table_right">
@@ -39,8 +39,8 @@
                                </fieldset>
 
                                <div class="table_footer">
-                                       <h:commandButton class="reset" type="reset" value="Formular zurücksetzen" />
-                                       <h:commandButton class="submit" type="submit" action="#{controller.doLogin()}" value="Einloggen" />
+                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
+                                       <h:commandButton class="submit" type="submit" action="#{controller.doLogin()}" value="#{msg.BUTTON_CUSTOMER_LOGIN}" />
                                </div>
                        </div>
                </h:form>
index 76a0a2756c13bead6f16e068b59f0537148d96a8..297e82f667193b3723e7005a1eb3cc462da35a82 100644 (file)
@@ -5,23 +5,23 @@
        xmlns:ui="http://java.sun.com/jsf/facelets">
        <div class="menu">
                <div class="menu_header">
-                       Home
+                       #{msg.MENU_HOME_TITLE}
                </div>
 
                <ul>
-                       <li><h:link title="Eingangsseite" outcome="index" value="Home" /></li>
-                       <li><h:link title="Zum Warenkorb" outcome="basket" value="Zum Warenkorb" /></li>
-                       <li><h:link title="Sitzung beennden" outcome="logout" value="Sitzung beenden" /></li>
+                       <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">
-                       Kundenlogin
+                       #{msg.MENU_CUSTOMER_TITLE}
                </div>
 
                <ul>
-                       <li><h:link title="Login für bestehende Kunden" outcome="customer_login" value="Einloggen" /></li>
-                       <li><h:link title="Anmeldung als neuer Kunde" outcome="customer_register" value="Neuer Kunde" /></li>
-                       <li><h:link title="Neues Passwort erstellen" outcome="customer_lost_passwd" value="Passwort vergessen?" /></li>
+                       <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>
 </ui:composition>
index 708bd900db964f975dd3547fc17e6cdeb58287d9..c7514e593c9d687e6ed8a1b6253381f580be7b99 100644 (file)
@@ -6,14 +6,14 @@
          >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">Ausloggen</ui:define>
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_LOGOUT}</ui:define>
 
                <ui:define name="menu">
                        <ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
                </ui:define>
 
                <ui:define name="content_header">
-                       Aus dem Adminbereich ausloggen
+                       #{msg.SUB_TITLE_ADMIN_LOGOUT}
                </ui:define>
 
                <ui:define name="content">
index b965c8102ed81171f3f87eadf5cab771d0e975b1..a32d8fe3f00c70c8fab51b0d0c8352c11fefc569 100644 (file)
@@ -6,14 +6,14 @@
          >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">Kategorien</ui:define>
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_CATEGORIES}</ui:define>
 
                <ui:define name="menu">
                        <ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
                </ui:define>
 
                <ui:define name="content_header">
-                       Kategorien administrieren
+                       #{msg.SUB_TITLE_ADMIN_CATEGORIES}
                </ui:define>
 
                <ui:define name="content">
                                <h:form acceptcharset="utf-8" id="form">
                                        <h:dataTable headerClass="table_header_column" rowClasses="table_row" styleClass="table" id="categories" value="#{controller.allCategories}" var="cat">
                                                <h:column>
-                                                       <f:facet name="header">Auswählen:</f:facet>
+                                                       <f:facet name="header">#{msg.SELECT_ENTRY}</f:facet>
                                                        #{cat.id}:
                                                        <h:selectBooleanCheckbox class="input" value="true" />
                                                </h:column>
 
                                                <h:column>
-                                                       <f:facet name="header">Bezeichnung:</f:facet>
+                                                       <f:facet name="header">#{msg.ADMIN_ENTER_CATEGORY_TITLE}</f:facet>
                                                        #{cat.title}
                                                </h:column>
 
                                                <h:column>
-                                                       <f:facet name="header">Elternkategorie:</f:facet>
+                                                       <f:facet name="header">#{msg.ADMIN_PARENT_CATEGORY}</f:facet>
                                                        #{cat.parentId}
                                                </h:column>
                                        </h:dataTable>
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="Formular zurücksetzen" />
-                                               <h:commandButton class="submit" type="submit" id="edit" action="#{admin_category.editCategory(category)}" value="Ändern" />
-                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteCategory(category)}" value="Löschen" />
+                                               <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}" />
                                        </div>
                                </h:form>
                        </div>
                                <h:form acceptcharset="utf-8" id="add_category">
                                <div class="table">
                                        <div class="table_header">
-                                               Neue Kategorie hinzufügen:
+                                               #{msg.ADMIN_ADD_CATEGORY_TITLE}
                                        </div>
 
                                        <fieldset id="product_data">
-                                               <legend>Bitte alle Felder ausfüllen:</legend>
+                                               <legend>#{msg.PLEASE_FILL_ALL_FIELDS}</legend>
 
                                                <div class="table_row">
                                                        <div class="table_left">
-                                                               Bezeichnung:
-                                                               <div class="tiny">(z.B. <em>Pizzen</em>)</div>
+                                                               #{msg.ADMIN_ENTER_CATEGORY_TITLE}
+                                                               <div class="tiny">(#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE})</div>
                                                        </div>
 
                                                        <div class="table_right">
@@ -70,7 +70,7 @@
 
                                                <div class="table_row">
                                                        <div class="table_left">
-                                                               Elternkategorie:
+                                                               #{msg.ADMIN_PARENT_CATEGORY}
                                                        </div>
 
                                                        <div class="table_right">
@@ -82,8 +82,8 @@
                                        </fieldset>
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="Formular zurücksetzen" />
-                                               <h:commandButton class="submit" type="submit" action="#{admin_category.addCategory()}" value="Hinzufügen" />
+                                               <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}" />
                                        </div>
                                </div>
                                </h:form>
index 8dc2e51bc75a0672e3ba3e593764a932ae30e293..5a7b1e445294bec12d4f6d278c7c960429f3b8d7 100644 (file)
@@ -6,17 +6,20 @@
          >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">Willkommen</ui:define>
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_WELCOME}</ui:define>
 
                <ui:define name="menu">
                        <ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
                </ui:define>
 
                <ui:define name="content_header">
-                       Willkommen zur Administration
+                       #{msg.SUB_TITLE_ADMIN_WELCOME}
                </ui:define>
 
                <ui:define name="content">
+                       <!--
+                       TODO: Replace this dummy
+                       //-->
                        Einiges kann hier eingestellt werden.
                </ui:define>
 
index e02c27847315b9bac1d119f071742cd35723b594..2d1cb934d1f5ec8034c9b14bee6ca7024471cda3 100644 (file)
@@ -6,14 +6,14 @@
          >
 
        <ui:composition template="/WEB-INF/templates/admin/admin_base.tpl">
-               <ui:define name="admin_title">Produkte</ui:define>
+               <ui:define name="admin_title">#{msg.PAGE_TITLE_ADMIN_PRODUCTS}</ui:define>
 
                <ui:define name="menu">
                        <ui:include id="menu" class="admin_menu" src="/WEB-INF/templates/admin/admin_menu.tpl" />
                </ui:define>
 
                <ui:define name="content_header">
-                       Diese Produkte sind erstellt worden:
+                       #{msg.SUB_TITLE_ADMIN_PRODUCTS}
                </ui:define>
 
                <ui:define name="content">
@@ -26,7 +26,7 @@
                                                </h:column>
 
                                                <h:column>
-                                                       <f:facet name="header">Produktbezeichnung:</f:facet>
+                                                       <f:facet name="header">#{msg.ADMIN_ENTER_PRODUCT_TITLE}</f:facet>
                                                        #{product.title}
                                                </h:column>
 
                                                </h:column>
 
                                                <h:column>
-                                                       <f:facet name="header">Kategorie:</f:facet>
+                                                       <f:facet name="header">#{msg.CATEGORY}</f:facet>
                                                        #{product.categoryId}
                                                </h:column>
 
                                                <h:column>
-                                                       <f:facet name="header">Verfügbar:</f:facet>
+                                                       <f:facet name="header">#{msg.IS_AVAILABLE}</f:facet>
                                                        #{product.available}
                                                </h:column>
                                        </h:dataTable>
 
                                        <div  class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="Formular zurücksetzen" />
-                                               <h:commandButton class="submit" type="submit" id="edit" action="#{admin_product.editProduct(product)}" value="Ändern" />
-                                               <h:commandButton class="delete" type="submit" id="delete" action="#{admin_category.deleteProduct(product)}" value="Löschen" />
+                                               <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}" />
                                        </div>
                                </h:form>
                        </div>
                                <h:form acceptcharset="utf-8" id="add_category">
                                <div class="table">
                                        <div class="table_header">
-                                               Neues Produkt hinzufügen:
+                                               #{msg.ADMIN_ADD_PRODUCT_TITLE}
                                        </div>
 
                                        <fieldset id="product_data">
-                                               <legend>Bitte alle Felder ausfüllen:</legend>
+                                               <legend>#{msg.PLEASE_FILL_ALL_FIELDS}</legend>
 
                                                <div class="table_row">
                                                        <div class="table_left">
-                                                               Produktbezeichnung:
-                                                               <div class="tiny">(z.B. <em>Pizza Italia</em>)</div>
+                                                               #{msg.ADMIN_ENTER_PRODUCT_TITLE}
+                                                               <div class="tiny">(#{msg.ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE})</div>
                                                        </div>
 
                                                        <div class="table_right">
@@ -92,7 +92,7 @@
 
                                                <div class="table_row">
                                                        <div class="table_left">
-                                                               Kategorie:
+                                                               #{msg.CATEGORY}
                                                        </div>
 
                                                        <div class="table_right">
 
                                                <div class="table_row">
                                                        <div class="table_left">
-                                                               Verfügbar:
+                                                               #{msg.IS_AVAILABLE}
                                                        </div>
 
                                                        <div class="table_right">
                                        </fieldset>
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="Formular zurücksetzen" />
-                                               <h:commandButton class="submit" type="submit" id="add" action="#{admin_product.addProduct()}" value="Hinzufügen" />
+                                               <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}" />
                                        </div>
                                </div>
                                </h:form>
                        </div>
 
                        <div class="para">
-                               Hinweise zum Hinzufügen von Produkten:
+                               #{msg.ADMIN_ADD_PRODUCT_NOTICE_TITLE}
                                <ul>
-                                       <li>Beim Preis keine Währungszeichen (wie EUR usw.) eingeben.</li>
-                                       <li>Kommastellen mit Punkt, nicht mit Komma abtrennen.</li>
-                                       <li>Keine Tausendertrenner verwenden, auch keine Leerschritte.</li>
+                                       <li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE1}</li>
+                                       <li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE2}</li>
+                                       <li>#{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE3}</li>
                                </ul>
                        </div>
                </ui:define>
index 0535296ca335f20dd6a6f7e67fe91a5f50326d0e..c853bc2a8c7f50a5d639839c5cd665d4a93f14a0 100644 (file)
@@ -30,7 +30,7 @@
 
                                                        <div class="table_row">
                                                                <div class="table_left">
-                                                                       <h:outputLabel for="id" value="Kundennummer:" />
+                                                                       <h:outputLabel for="id" value="#{msg.CUSTOMER_NUMBER}" />
                                                                </div>
 
                                                                <div class="table_right">
@@ -59,7 +59,7 @@
                                                </fieldset>
 
                                                <div class="table_footer">
-                                                       <h:commandButton class="reset" type="reset" value="Formular zurücksetzen" />
+                                                       <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                        <h:commandButton class="submit" type="submit" value="Weiter zu Schritt 2" action="#{controller.doLostPasswordStep2()}" />
                                                </div>
                                        </div>
index 3be507e3467845e72915c91dd0544d65c7c1b155..aa97b0e3b4f4fd41a64b49a1e6c1efb4a270e9e6 100644 (file)
                                        </div>
 
                                        <div class="table_footer">
-                                               <h:commandButton class="reset" type="reset" value="Formular zurücksetzen" />
+                                               <h:commandButton class="reset" type="reset" value="#{msg.BUTTON_RESET_FORM}" />
                                                <h:commandButton class="submit" type="submit" id="register" value="Anmelden" action="#{controller.doRegister()}" />
                                        </div>
                                </div>
index 14b879e503a7d4fc103c3eb1f76e19b712570666..da8136e84e489250830474a62c70c36a07c42fe4 100644 (file)
@@ -40,7 +40,7 @@
                                                                <div class="item_actions">
                                                                        <ui:fragment rendered="#{!basketController.isProductAdded(product)}">
                                                                                <h:form acceptcharset="utf-8" id="add_item">
-                                                                                       <h:commandButton class="submit" id="add" value="#{msg.SUBMIT_ADD_ITEM_TO_BASKET}" action="#{basketController.addItem(product)}" title="#{msg.BUTTON_TITLE_ADD_ITEM_TO_BASKET}" />
+                                                                                       <h:commandButton class="submit" id="add" value="#{msg.ADMIN_ADD_ITEM_TO_BASKET}" action="#{basketController.addItem(product)}" title="#{msg.BUTTON_TITLE_ADD_ITEM_TO_BASKET}" />
 
                                                                                        <h:inputText class="input" id="amount" size="3" maxlength="20" value="#{basketController.amount}" title="#{msg.INPUT_TITLE_ENTER_ITEM_AMOUNT}">
                                                                                                <!--
@@ -58,7 +58,7 @@
                                                                                </div>
 
                                                                                <div class="item_basket_link">
-                                                                                       <h:link outcome="basket" title="#{msg.LINK_TITLE_TO_BASKET}" value="#{msg.LINK_CHANGE_IN_BASKET}" />
+                                                                                       <h:link outcome="basket" title="#{msg.LINK_TO_BASKET_TITLE}" value="#{msg.LINK_CHANGE_IN_BASKET}" />
                                                                                </div>
 
                                                                                <div class="clear"></div>