From: Roland Haeder Date: Mon, 14 Sep 2015 13:29:42 +0000 (+0200) Subject: Translation update: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=aa28744e82d61281f979586e59dada747825f891;p=pizzaservice-war.git Translation update: - 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 --- diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 6dc1198c..fdb786d8 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -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. Pizzen +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. Pizza Italia) +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? diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index aeb36b2d..f8e18cc2 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -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. pizza +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. Pizza Italia +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? diff --git a/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java index a0781c69..8b7deb7f 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/controller/ShopWebBean.java @@ -111,7 +111,7 @@ public class ShopWebBean extends BaseFrameworkBean implements ShopWebController Deque 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); diff --git a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl index 040e4e7f..6841d027 100644 --- a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl +++ b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl index 7faf2c46..9d87117a 100644 --- a/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl +++ b/web/WEB-INF/templates/admin/admin_parent_category_selection_box.tpl @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets"> - + diff --git a/web/WEB-INF/templates/guest/guest_footer.tpl b/web/WEB-INF/templates/guest/guest_footer.tpl index b2853eac..34e6c7a6 100644 --- a/web/WEB-INF/templates/guest/guest_footer.tpl +++ b/web/WEB-INF/templates/guest/guest_footer.tpl @@ -9,7 +9,7 @@
    • -
  • Copyright (c) 2015 by Roland Haeder
    • +
  • Copyright (c) 2015 by Roland Häder
    • diff --git a/web/WEB-INF/templates/guest/guest_login_form.tpl b/web/WEB-INF/templates/guest/guest_login_form.tpl index 0f3a6f60..2815b072 100644 --- a/web/WEB-INF/templates/guest/guest_login_form.tpl +++ b/web/WEB-INF/templates/guest/guest_login_form.tpl @@ -7,15 +7,15 @@
    - Bitte geben Sie Ihre Kundennummer und Passwort ein: + #{msg.GUEST_ENTER_LOGIN_DATA_TITLE}
    - Bitte Daten eingeben: + #{msg.GUEST_ENTER_LOGIN_DATA_LEGEND}
    - +
    @@ -27,7 +27,7 @@
    - +
    @@ -39,8 +39,8 @@
    - - + +
    diff --git a/web/WEB-INF/templates/guest/guest_menu.tpl b/web/WEB-INF/templates/guest/guest_menu.tpl index 76a0a275..297e82f6 100644 --- a/web/WEB-INF/templates/guest/guest_menu.tpl +++ b/web/WEB-INF/templates/guest/guest_menu.tpl @@ -5,23 +5,23 @@ xmlns:ui="http://java.sun.com/jsf/facelets">
    - Home + #{msg.MENU_HOME_TITLE}
      -
      • -
      • -
      • +
      • +
      • +
    - Kundenlogin + #{msg.MENU_CUSTOMER_TITLE}
      -
      • -
      • -
      • +
      • +
      • +
    diff --git a/web/admin/admin_logout.xhtml b/web/admin/admin_logout.xhtml index 708bd900..c7514e59 100644 --- a/web/admin/admin_logout.xhtml +++ b/web/admin/admin_logout.xhtml @@ -6,14 +6,14 @@ > - Ausloggen + #{msg.PAGE_TITLE_ADMIN_LOGOUT} - Aus dem Adminbereich ausloggen + #{msg.SUB_TITLE_ADMIN_LOGOUT} diff --git a/web/admin/category.xhtml b/web/admin/category.xhtml index b965c810..a32d8fe3 100644 --- a/web/admin/category.xhtml +++ b/web/admin/category.xhtml @@ -6,14 +6,14 @@ > - Kategorien + #{msg.PAGE_TITLE_ADMIN_CATEGORIES} - Kategorien administrieren + #{msg.SUB_TITLE_ADMIN_CATEGORIES} @@ -21,26 +21,26 @@ - Auswählen: + #{msg.SELECT_ENTRY} #{cat.id}: - Bezeichnung: + #{msg.ADMIN_ENTER_CATEGORY_TITLE} #{cat.title} - Elternkategorie: + #{msg.ADMIN_PARENT_CATEGORY} #{cat.parentId}
    - - - + + +
    @@ -49,16 +49,16 @@
    - Neue Kategorie hinzufügen: + #{msg.ADMIN_ADD_CATEGORY_TITLE}
    - Bitte alle Felder ausfüllen: + #{msg.PLEASE_FILL_ALL_FIELDS}
    - Bezeichnung: -
    (z.B. Pizzen)
    + #{msg.ADMIN_ENTER_CATEGORY_TITLE} +
    (#{msg.ADMIN_ENTER_CATEGORY_TITLE_EXAMPLE})
    @@ -70,7 +70,7 @@
    - Elternkategorie: + #{msg.ADMIN_PARENT_CATEGORY}
    @@ -82,8 +82,8 @@
    - - + +
    diff --git a/web/admin/index.xhtml b/web/admin/index.xhtml index 8dc2e51b..5a7b1e44 100644 --- a/web/admin/index.xhtml +++ b/web/admin/index.xhtml @@ -6,17 +6,20 @@ > - Willkommen + #{msg.PAGE_TITLE_ADMIN_WELCOME} - Willkommen zur Administration + #{msg.SUB_TITLE_ADMIN_WELCOME} + Einiges kann hier eingestellt werden. diff --git a/web/admin/product.xhtml b/web/admin/product.xhtml index e02c2784..2d1cb934 100644 --- a/web/admin/product.xhtml +++ b/web/admin/product.xhtml @@ -6,14 +6,14 @@ > - Produkte + #{msg.PAGE_TITLE_ADMIN_PRODUCTS} - Diese Produkte sind erstellt worden: + #{msg.SUB_TITLE_ADMIN_PRODUCTS} @@ -26,7 +26,7 @@ - Produktbezeichnung: + #{msg.ADMIN_ENTER_PRODUCT_TITLE} #{product.title} @@ -36,20 +36,20 @@ - Kategorie: + #{msg.CATEGORY} #{product.categoryId} - Verfügbar: + #{msg.IS_AVAILABLE} #{product.available}
    - - - + + +
    @@ -58,16 +58,16 @@
    - Neues Produkt hinzufügen: + #{msg.ADMIN_ADD_PRODUCT_TITLE}
    - Bitte alle Felder ausfüllen: + #{msg.PLEASE_FILL_ALL_FIELDS}
    - Produktbezeichnung: -
    (z.B. Pizza Italia)
    + #{msg.ADMIN_ENTER_PRODUCT_TITLE} +
    (#{msg.ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE})
    @@ -92,7 +92,7 @@
    - Kategorie: + #{msg.CATEGORY}
    @@ -104,7 +104,7 @@
    - Verfügbar: + #{msg.IS_AVAILABLE}
    @@ -119,19 +119,19 @@
    - - + +
    - Hinweise zum Hinzufügen von Produkten: + #{msg.ADMIN_ADD_PRODUCT_NOTICE_TITLE}
      -
    • Beim Preis keine Währungszeichen (wie EUR usw.) eingeben.
      • -
    • Kommastellen mit Punkt, nicht mit Komma abtrennen.
      • -
    • Keine Tausendertrenner verwenden, auch keine Leerschritte.
      • +
    • #{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE1}
      • +
    • #{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE2}
      • +
    • #{msg.ADMIN_ADD_PRODUCT_NOTICE_LINE3}
     diff --git a/web/customer/lost_passwd.xhtml b/web/customer/lost_passwd.xhtml index 0535296c..c853bc2a 100644 --- a/web/customer/lost_passwd.xhtml +++ b/web/customer/lost_passwd.xhtml @@ -30,7 +30,7 @@
    - +
    @@ -59,7 +59,7 @@
    - +
    diff --git a/web/customer/register.xhtml b/web/customer/register.xhtml index 3be507e3..aa97b0e3 100644 --- a/web/customer/register.xhtml +++ b/web/customer/register.xhtml @@ -277,7 +277,7 @@
    - +
    diff --git a/web/index.xhtml b/web/index.xhtml index 14b879e5..da8136e8 100644 --- a/web/index.xhtml +++ b/web/index.xhtml @@ -40,7 +40,7 @@
    - +