From a694da8a0aaf46d1c836f3c2fd3c5ef87aa1773f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 12 Mar 2019 14:13:52 +0100 Subject: [PATCH] Product-only: - renamed ADMIN_ASSIGNED_ITEM_PRODUCT to ADMIN_PRODUCT_HEADER - renamed ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER to ADMIN_ASSIGNED_PRODUCT_CATEGORY_LABEL - renamed ADMIN_ASSIGNED_PARENT_CATEGORY_HEADER to ADMIN_PARENT_PRODUCT_CATEGORY_HEADER - added more missing i18n strings - removed some obsolete MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/product_de_DE.properties | 22 +++++---- .../localization/product_en_US.properties | 23 +++++---- web/WEB-INF/product-links.jsf.taglib.xml | 2 +- .../admin_generic_product_links.tpl | 6 +-- .../admin_form_category_data.tpl | 22 ++++----- .../admin_generic_product_list.xhtml | 37 +++++++++++---- .../admin_product_category_list.xhtml | 47 ++++++++++++++++--- 7 files changed, 107 insertions(+), 52 deletions(-) diff --git a/src/java/org/mxchange/localization/product_de_DE.properties b/src/java/org/mxchange/localization/product_de_DE.properties index 53261d5a..56e219bd 100644 --- a/src/java/org/mxchange/localization/product_de_DE.properties +++ b/src/java/org/mxchange/localization/product_de_DE.properties @@ -24,7 +24,7 @@ ADMIN_ENTER_GENERIC_PRODUCT_PRICE=Preis des Produktes eingeben: ENTER_NET_PRICE=Nettopreis: ENTER_TAX_RATE=Steuersatz: ENTER_GROSS_PRICE=Bruttopreis: -ADMIN_ASSIGNED_ITEM_PRODUCT=Zugewiesenes Produkt: +ADMIN_PRODUCT_HEADER=Produkt: LABEL_PRODUCTS=Produkte #@TODO Please fix German umlauts! ADMIN_PRODUCT_REQUIRED=Bitte waehlen Sie ein Produkt aus. @@ -43,17 +43,17 @@ ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE=Zeigt Daten des Produktes an. ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE=Aendert Daten des Produktes ab. #@TODO Please fix German umlauts! ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE=Loescht das Produkt aus der Datenbank. -ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER=Zugewiesene Produktkategorie: +ADMIN_ASSIGNED_PRODUCT_CATEGORY_LABEL=Zugewiesene Produktkategorie: +ADMIN_PRODUCT_CATEGORY_HEADER=Produktkategorie: LABEL_PRODUCT_CATEGORIES=Produktkategorien FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Liste durch Auswahl von ein oder mehr Produktkategorien filtern. +FILTER_BY_MULTIPLE_GENERIC_PRODUCTS_TITLE=Liste durch Auswahl von ein oder mehr Prdukten filtern. ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE=Zeigt Daten der Produktkategorie an. #@TODO Please fix German umlauts! ADMIN_LINK_EDIT_GENERIC_PRODUCT_CATEGORY_TITLE=Aendert Daten der Produktkategorie ab. #@TODO Please fix German umlauts! ADMIN_LINK_DELETE_GENERIC_PRODUCT_CATEGORY_TITLE=Loescht die Produktkategorie aus der Datenbank. #@TODO Please fix German umlauts! -PRODUCT_AVAILABILITY_HEADER=Produkt verfuegbar: -#@TODO Please fix German umlauts! ADMIN_ADD_GENERIC_PRODUCT_TITLE=Neues Produkt hinzufuegen #@TODO Please fix German umlauts! ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA=Bitte waehlen Sie eine Produktkategorie aus und geben Sie Produkttitel, sowie Stueckzahl (meistens 1), Einheit, Bruttopreis und Waehrungscode (EUR z.B.) ein. @@ -86,7 +86,7 @@ PAGE_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=Produktkategorien auflisten CONTENT_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=Produktkategorien auflisten: TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES=Diese Tabelle listet alle eingetragenen Produktkategorien auf. ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES=Es befinden sich keine Produktkategorien in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen. -ADMIN_ASSIGNED_PARENT_CATEGORY_HEADER=Zugewiesene Elternkategorie: +ADMIN_PARENT_PRODUCT_CATEGORY_HEADER=Elternkategorie: ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE=Zeigt Daten der Produktkategorie an. ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE=Elternkategorie zuweisen. #@TODO Please fix German umlauts! @@ -96,8 +96,8 @@ ADMIN_ADD_PRODUCT_CATEGORY_MINIMUM_DATA=Bitte geben Sie den Titel fuer die Kateg #@TODO Please fix German umlauts! BUTTON_ADMIN_ADD_PRODUCT_CATEGORY=Produktkategorie hinzufuegen ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Daten zur Produktkategorie: -ADMIN_ASSIGN_PARENT_CATEGORY=Elternkategorie zuweisen: -ADMIN_ASSIGN_PARENT_CATEGORY_TITLE=Weisen Sie eine andere Produktkategorie als Elternkategorie zu dieser neuen zu. +ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY=Elternkategorie zuweisen: +ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY_TITLE=Weisen Sie eine andere Produktkategorie als Elternkategorie zu dieser neuen zu. #@TODO Please fix German umlauts! ADMIN_ENTER_CATEGORY_I18N_KEY=I18N-Schluessel fuer Kategorie eingeben: #@TODO Please fix German umlauts! @@ -126,7 +126,6 @@ ADMIN_PRODUCT_CURRENCY_CODE_REQUIRED=Bitte geben Sie den Waehrungscode fuer das ADMIN_PRODUCT_UNIT_AMOUNT_REQUIRED=Bitte geben Sie die Stueckanzahl des Produktes ein. Beispiel: 500 fuer 500g #@TODO Please fix German umlauts! ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED=Bitte geben Sie den Uebersetzungschluessel zur Stueckzahl ein. Beispiel: UNIT_TYPE_GRAMS fuer Gramm -ADMIN_PRODUCT_MANUFACTURER_NAME_HEADER=Produktehersteller: ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE=Es ist kein Hersteller dem Produkt zugewiesen. ADMIN_ENTER_GENERIC_PRODUCT_NUMBER=Geben Sie die Produktnummer ein: ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE=Geben Sie die Nummer des Produktes ein. @@ -172,7 +171,6 @@ PRODUCT_UNIT_I18N_KEY_HEADER=Internationalisierungsschluessel fuer Einheit: #@TODO Please fix German umlauts! PRODUCT_UNIT_I18N_KEY_TITLE=Internationalisierungsschluessel fuer Einheit PRODUCT_HAS_NO_MANUFACTURER_ASSIGNED=Produkt hat keinen Hersteller zugewiesen. -ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_HEADER=Zugewiesener Hersteller: ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE=Diesem Produkt zugewiesner Hersteller. #@TODO Please fix German umlauts! ADMIN_PRODUCT_ENTRY_CREATED_TITLE=Wann dieses Produkt der Datenbank hinzugefuegt wurde. @@ -200,7 +198,6 @@ ERROR_PARAMETER_PRODUCT_ID_NOT_SET=Fehler: Produkt-Id nicht gesetzt (Parameter: #@TODO Please fix German umlauts! PARAMETER_PRODUCT_ID_INVALID=Parameter "productId" ist ungueltig. PRODUCT_I18N_KEY_HEADER=Internationalisierungsschluessel des Produktes: -ADMIN_ASSIGNED_MANUFACTURER_HEADER=Zugewiesener Hersteller: GROSS_PRICE_HEADER=Bruttopreis: NET_PRICE_HEADER=Nettopreis: TAX_RATE_HEADER=Steuersatz: @@ -219,3 +216,8 @@ ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER=Geben Sie die Balkencodenummer des Pr BARCODE_NUMBER_HEADER=Barcode-Nummer: PRODUCT_NO_BARCODE_NUMBER_ASSIGNED=Das Produkt hat keine Barcode-Nummer zugewiesen. PRODUCT_BARCODE_NUMBER_TITLE=Barcode Nummer des Produktes. +ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Daten zur Produktkategorie: +ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY=Elternkategorie zuweisen: +ENTER_BRAND_NAME=Markenzeichen eingeben: +ENTER_BRAND_NAME_TITLE=Geben Sie das Markenzeichen zum Produkt ein. +ADMIN_PRODUCT_MANUFACTURER_HEADER=Hersteller des Produktes: diff --git a/src/java/org/mxchange/localization/product_en_US.properties b/src/java/org/mxchange/localization/product_en_US.properties index 1a5d8d85..ed337e6f 100644 --- a/src/java/org/mxchange/localization/product_en_US.properties +++ b/src/java/org/mxchange/localization/product_en_US.properties @@ -21,7 +21,7 @@ ADMIN_ENTER_GENERIC_PRODUCT_PRICE=Enter product's price: ENTER_NET_PRICE=Net price: ENTER_TAX_RATE=Tax rate: ENTER_GROSS_PRICE=Gross price: -ADMIN_ASSIGNED_ITEM_PRODUCT=Assigned product: +ADMIN_PRODUCT_HEADER=Product: LABEL_PRODUCTS=Products ADMIN_PRODUCT_REQUIRED=Please choose a product. ADMIN_MENU_PRODUCTS_CATEGORIES_TITLE=Products & Categories @@ -36,13 +36,14 @@ ADMIN_EMPTY_LIST_GENERIC_PRODUCTS=There are no products in database. Or your sea ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE=Shows product data. ADMIN_LINK_EDIT_GENERIC_PRODUCT_TITLE=Edits product data. ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE=Deletes product data. -ADMIN_ASSIGNED_PRODUCT_CATEGORY_HEADER=Assigned product category: +ADMIN_ASSIGNED_PRODUCT_CATEGORY_LABEL=Assigned product category: +ADMIN_PRODUCT_CATEGORY_HEADER=Product category: LABEL_PRODUCT_CATEGORIES=Product categories FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Filter list by selecting one or more product categories. +FILTER_BY_MULTIPLE_GENERIC_PRODUCTS_TITLE=Filter list bny selecting one or more products. ADMIN_LINK_SHOW_GENERIC_PRODUCT_CATEGORY_TITLE=Shows product category data. ADMIN_LINK_EDIT_GENERIC_PRODUCT_CATEGORY_TITLE=Edits product category data. ADMIN_LINK_DELETE_GENERIC_PRODUCT_CATEGORY_TITLE=Deletes product category data. -PRODUCT_AVAILABILITY_HEADER=Product available: ADMIN_ADD_GENERIC_PRODUCT_TITLE=Add new product ADMIN_ADD_GENERIC_PRODUCT_MINIMUM_DATA=Please choose a product category and enter product title, unit amount and type, gross price and currency code (e.g. USD). ADMIN_GENERIC_PRODUCT_DATA_LEGEND=Product data: @@ -63,15 +64,15 @@ PAGE_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=List product categories CONTENT_TITLE_ADMIN_LIST_PRODUCT_CATEGORY=List product categories: TABLE_SUMMARY_ADMIN_LIST_PRODUCT_CATEGORIES=This table lists all product categories. ADMIN_EMPTY_LIST_PRODUCT_CATEGORIES=There are no product categories in database. Or your search criteria doesn't match anything. -ADMIN_ASSIGNED_PARENT_CATEGORY_HEADER=Assigned parent category: +ADMIN_PARENT_PRODUCT_CATEGORY_HEADER=Parent category: ADMIN_LINK_SHOW_PRODUCT_CATEGORY_TITLE=Shows product category data. ADMIN_LINK_ASSIGN_PARENT_CATEGORY_TITLE=Assign parent cateogory. ADMIN_ADD_PRODUCT_CATEGORY_TITLE=Add new product category ADMIN_ADD_PRODUCT_CATEGORY_MINIMUM_DATA=Please enter a title for adding new category. You can optionally choose a parent category of the new one. BUTTON_ADMIN_ADD_PRODUCT_CATEGORY=Add product category ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Data of product category: -ADMIN_ASSIGN_PARENT_CATEGORY=Assign parent category: -ADMIN_ASSIGN_PARENT_CATEGORY_TITLE=Assign an other product category as parent category for the new one. +ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY=Assign parent category: +ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY_TITLE=Assign an other product category as parent category for the new one. ADMIN_ENTER_CATEGORY_I18N_KEY=Enter category i18n key: ADMIN_ENTER_CATEGORY_I18N_KEY_TITLE=Enter i18n key for this new product category (example: CATEGORY_CONSUMABLES). ADMIN_CATEGORY_I18N_KEY_REQUIRED=Please enter i18n key of product category. @@ -90,7 +91,6 @@ ENTER_RAND_NAME_TITLE=Enter the item's brand name found on receipt. ADMIN_PRODUCT_CURRENCY_CODE_REQUIRED=Please enter current code for product. Example: EUR, USD, PHP ADMIN_PRODUCT_UNIT_AMOUNT_REQUIRED=Please enter a unit amount. Example 500 for 500 grams. ADMIN_PRODUCT_UNIT_I18N_KEY_REQUIRED=Please enter unit's i18n key. Example: UNIT_TYPE_GRAMS for grams -ADMIN_PRODUCT_MANUFACTURER_NAME_HEADER=Product manufacturer: ADMIN_NO_PRODUCT_MANUFACTURER_ASSIGNED_TITLE=No manufacturer is assigned with this product. ADMIN_ENTER_GENERIC_PRODUCT_NUMBER=Enter product number: ADMIN_ENTER_GENERIC_PRODUCT_NUMBER_TITLE=Enter number of product. @@ -126,8 +126,7 @@ PRODUCT_UNIT_AMOUNT_TITLE=Amount of product PRODUCT_UNIT_I18N_KEY_HEADER=Internationalization key for unit: PRODUCT_UNIT_I18N_KEY_TITLE=Internationalization key for unit PRODUCT_HAS_NO_MANUFACTURER_ASSIGNED=Product has no manufacturer assigned. -ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_HEADER=Assigned manufacturer: -ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE=This product assigned manufacturer. +ADMIN_ASSIGNED_PRODUCT_MANUFACTURER_TITLE=This product has a manufacturer assigned. ADMIN_PRODUCT_ENTRY_CREATED_TITLE=When this product has been created in database. ADMIN_CATEGORY_ENTRY_CREATED_TITLE=When this category has been created in database. ADMIN_SINGLE_CATEGORY_DETAILS_HEADER=Details of a single category @@ -148,7 +147,6 @@ CONTENT_TITLE_ADMIN_GENERIC_PRODUCT_DELETE=Delete product: ERROR_PARAMETER_PRODUCT_ID_NOT_SET=Error: Product Id is not set (parameter: productId). PARAMETER_PRODUCT_ID_INVALID=Parameter "productId" is invalid. PRODUCT_I18N_KEY_HEADER=Product's internationalization key: -ADMIN_ASSIGNED_MANUFACTURER_HEADER=Assigned manufacturer: GROSS_PRICE_HEADER=Gross price: NET_PRICE_HEADER=Net price: TAX_RATE_HEADER=Tax rate: @@ -164,3 +162,8 @@ ADMIN_ENTER_GENERIC_PRODUCT_BARCODE_NUMBER=Enter product's barcode number: BARCODE_NUMBER_HEADER=Barcode number: PRODUCT_NO_BARCODE_NUMBER_ASSIGNED=Product has no bar-code number assigned. PRODUCT_BARCODE_NUMBER_TITLE=Bar-code number of product. +ADMIN_PRODUCT_CATEGORY_DATA_LEGEND=Data of product category: +ADMIN_ASSIGN_PARENT_PRODUCT_CATEGORY=Assign parent category: +ENTER_BRAND_NAME=Enter brand name: +ENTER_BRAND_NAME_TITLE=Enter brand name of product. +ADMIN_PRODUCT_MANUFACTURER_HEADER=Manufacturer of product: diff --git a/web/WEB-INF/product-links.jsf.taglib.xml b/web/WEB-INF/product-links.jsf.taglib.xml index ac75f54e..d49aad89 100644 --- a/web/WEB-INF/product-links.jsf.taglib.xml +++ b/web/WEB-INF/product-links.jsf.taglib.xml @@ -50,7 +50,7 @@ along with this program. If not, see . This tag renders an administrative drop-down menu for given product instance. resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl - product + genericProduct The generic product instance that provides the data for this tag. true org.mxchange.jproduct.model.product.Product diff --git a/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl b/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl index fea04954..7b1ede12 100644 --- a/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl +++ b/web/WEB-INF/resources/tags/admin/dropdown/generic_product/admin_generic_product_links.tpl @@ -14,7 +14,7 @@ title="#{product.ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE}" rendered="#{empty renderShowLink or renderShowLink}" > - + - + @@ -31,7 +31,7 @@ value="#{msg.ADMIN_LINK_DELETE_SHORT}" title="#{product.ADMIN_LINK_DELETE_GENERIC_PRODUCT_TITLE}" /> - + diff --git a/web/WEB-INF/templates/admin/product_category/admin_form_category_data.tpl b/web/WEB-INF/templates/admin/product_category/admin_form_category_data.tpl index e1966c5b..7b525bfb 100644 --- a/web/WEB-INF/templates/admin/product_category/admin_form_category_data.tpl +++ b/web/WEB-INF/templates/admin/product_category/admin_form_category_data.tpl @@ -1,6 +1,6 @@ - + - + @@ -37,26 +37,26 @@ /> - + - + diff --git a/web/admin/generic_product/admin_generic_product_list.xhtml b/web/admin/generic_product/admin_generic_product_list.xhtml index 266355e9..3f472749 100644 --- a/web/admin/generic_product/admin_generic_product_list.xhtml +++ b/web/admin/generic_product/admin_generic_product_list.xhtml @@ -114,7 +114,7 @@ - + - + - - + + @@ -256,7 +269,7 @@ - + @@ -295,12 +308,16 @@ - - + + - + - + - + - + - + - + - + @@ -164,7 +192,12 @@ - + -- 2.39.5