From 3515be7c1f792955b6c4cf70cc799e53fe8f8c0f Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Sun, 10 Apr 2016 14:16:00 +0200
Subject: [PATCH] Continued a bit: - more language strings localized - renamed
 some language strings - some fixes

---
 .../localization/bundle_de_DE.properties         |  6 +++++-
 .../localization/bundle_en_US.properties         |  8 ++++++--
 web/WEB-INF/templates/basket/full_basket.tpl     |  2 +-
 web/admin/admin_product.xhtml                    | 16 ++++++++--------
 web/basket.xhtml                                 |  2 +-
 web/index.xhtml                                  |  2 +-
 6 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 4f9e2a02..8033ab54 100644
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -36,7 +36,7 @@ FOLLOWING_PRODUCTS_ARE_AVAILABLE=Folgende Produkte k\u00f6nnen bestellt werden:
 USER_ADD_ITEM_TO_BASKET=Hinzuf\u00fcgen
 LINK_TO_BASKET_TITLE=Weiter zum Warenkorb.
 LINK_CHANGE_IN_BASKET=Im Warenkorb \u00e4ndern
-SINGLE_ITEM_PRICE=Einzelpreis:
+SINGLE_PRODUCT_PRICE=Einzelpreis:
 CHANGE_ITEM_AMOUNT=Bestellmenge \u00e4ndern:
 TOTAL_ITEM_PRICE=Zwischensumme:
 TOTAL_ORDER_PRICE=Gesamtsumme:
@@ -229,3 +229,7 @@ PAGE_TITLE_ADMIN_ADD_USER=Neues Benutzeraccount hinzufuegen
 CONTENT_TITLE_ADMIN_ADD_USER=Neues Benutzeraccount hinzufuegen:
 TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, alle Benutzer auflisten
 ITEM_ORDER_AMOUNT=Bestellmenge:
+ADMIN_ENTER_PRODUCT_PRICE_EXAMPLE=(z.B. 50.0</em>
+ADMIN_TITLE_PRODUCT_NUMBER=Product number:
+ADMIN_TITLE_PRODUCT_TITLE=Produktbezeichnung:
+ADMIN_ENTER_SINGLE_PRODUCT_PRICE=Einzelpreis:
diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 15b087b8..b0c2cf07 100644
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -36,7 +36,7 @@ FOLLOWING_PRODUCTS_ARE_AVAILABLE=Following products can be ordered:
 USER_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:
+SINGLE_PRODUCT_PRICE=Single price:
 CHANGE_ITEM_AMOUNT=Change ordered amount:
 TOTAL_ITEM_PRICE=Sub total:
 TOTAL_ORDER_PRICE=Total:
@@ -63,7 +63,7 @@ CATEGORY=Category:
 PLEASE_FILL_ALL_FIELDS=Please fill out all fields:
 ADMIN_BUTTON_ADD_CATEGORY=Add category
 ADMIN_ENTER_PRODUCT_TITLE=Product title:
-ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE=(example: <em>Pizza Italia)
+ADMIN_ENTER_PRODUCT_TITLE_EXAMPLE=(example: Pizza Italia)
 IS_AVAILABLE=Available:
 ADMIN_BUTTON_ADD_PRODUCT=Add product
 ADMIN_ADD_PRODUCT_NOTICE_TITLE=Notices for adding new product:
@@ -220,3 +220,7 @@ PAGE_TITLE_ADMIN_ADD_USER=Add new user account
 CONTENT_TITLE_ADMIN_ADD_USER=Add new user account:
 TABLE_SUMMARY_ADMIN_LIST_USERS=Administration, list all users
 ITEM_ORDER_AMOUNT=Amount:
+ADMIN_ENTER_PRODUCT_PRICE_EXAMPLE=(example: 50.0)
+ADMIN_TITLE_PRODUCT_NUMBER=Produktnummer:
+ADMIN_TITLE_PRODUCT_TITLE=Product title:
+ADMIN_ENTER_SINGLE_PRODUCT_PRICE=Singple product price:
diff --git a/web/WEB-INF/templates/basket/full_basket.tpl b/web/WEB-INF/templates/basket/full_basket.tpl
index bd6714de..abcc3cd6 100644
--- a/web/WEB-INF/templates/basket/full_basket.tpl
+++ b/web/WEB-INF/templates/basket/full_basket.tpl
@@ -15,7 +15,7 @@
 		</h:column>
 
 		<h:column>
-			<f:facet name="header">#{msg.SINGLE_ITEM_PRICE}</f:facet>
+			<f:facet name="header">#{msg.SINGLE_PRODUCT_PRICE}</f:facet>
 
 			<div class="item_price">
 				<ui:fragment rendered="#{item.isProductType()}">
diff --git a/web/admin/admin_product.xhtml b/web/admin/admin_product.xhtml
index 1c1b3899..67d1b687 100644
--- a/web/admin/admin_product.xhtml
+++ b/web/admin/admin_product.xhtml
@@ -18,17 +18,17 @@
 				<h:form id="form">
 					<h:dataTable id="product_table" var="product" value="#{adminProductController.allProducts}" styleClass="table" summary="#{msg.TABLE_SUMMARY_ADMIN_PRODUCTS}">
 						<h:column>
-							<f:facet name="header">Produktnummer:</f:facet>
+							<f:facet name="header">#{msg.ADMIN_TITLE_PRODUCT_NUMBER}</f:facet>
 							#{product.productId}:<h:selectBooleanCheckbox class="input" value="true" />
 						</h:column>
 
 						<h:column>
-							<f:facet name="header">#{msg.ADMIN_ENTER_PRODUCT_TITLE}</f:facet>
+							<f:facet name="header">#{msg.ADMIN_TITLE_PRODUCT_TITLE}</f:facet>
 								#{product.productTitle}
 						</h:column>
 
 						<h:column>
-							<f:facet name="header">#{msg.SINGLE_ITEM_PRICE}</f:facet>
+							<f:facet name="header">#{msg.SINGLE_PRODUCT_PRICE}</f:facet>
 								#{product.productPrice}
 						</h:column>
 
@@ -52,7 +52,7 @@
 			</div>
 
 			<div class="para">
-				<h:form id="add_category">
+				<h:form id="add_product">
 					<div class="table">
 						<div class="table_header">
 							#{msg.ADMIN_ADD_PRODUCT_TITLE}
@@ -68,7 +68,7 @@
 								</div>
 
 								<div class="table_right">
-									<h:inputText class="input" id="guest_title" size="10" maxlength="255" required="true" value="#{adminProductController.productTitle}" />
+									<h:inputText class="input" id="product_title" size="10" maxlength="255" required="true" value="#{adminProductController.productTitle}" />
 								</div>
 
 								<div class="clear"></div>
@@ -76,12 +76,12 @@
 
 							<div class="table_row">
 								<div class="table_left">
-									#{msg.SINGLE_ITEM_PRICE}
-									<div class="tiny">(z.B. <em>50.0</em>)</div>
+									#{msg.ADMIN_ENTER_SINGLE_PRODUCT_PRICE}
+									<div class="tiny">#{msg.ADMIN_ENTER_PRODUCT_PRICE_EXAMPLE}</div>
 								</div>
 
 								<div class="table_right">
-									<h:inputText class="input" id="price" size="10" maxlength="255" required="true" value="#{adminProductController.productPrice}" />
+									<h:inputText class="input" id="product_price" size="10" maxlength="255" required="true" value="#{adminProductController.productPrice}" />
 								</div>
 
 								<div class="clear"></div>
diff --git a/web/basket.xhtml b/web/basket.xhtml
index 92e49ab8..529270d0 100644
--- a/web/basket.xhtml
+++ b/web/basket.xhtml
@@ -24,7 +24,7 @@
 				</h:column>
 
 				<h:column>
-					<f:facet name="header">#{msg.SINGLE_ITEM_PRICE}</f:facet>
+					<f:facet name="header">#{msg.SINGLE_PRODUCT_PRICE}</f:facet>
 
 					<div class="item_price">
 						<ui:fragment rendered="#{item.isProductType()}">
diff --git a/web/index.xhtml b/web/index.xhtml
index 35035d32..9b75d18a 100644
--- a/web/index.xhtml
+++ b/web/index.xhtml
@@ -65,7 +65,7 @@
 
 							<div class="table_right">
 								<div class="item_price">
-									#{msg.SINGLE_ITEM_PRICE}
+									#{msg.SINGLE_PRODUCT_PRICE}
 									<h:outputText class="price" value="#{product.productPrice}">
 										<f:convertNumber type="currency" minFractionDigits="2" maxFractionDigits="2" locale="de_DE" />
 									</h:outputText>
-- 
2.39.5