From cfef23b3f69bfeef0b9dbfc7a6c8daa309509109 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 31 Mar 2018 02:24:10 +0200 Subject: [PATCH] Product-only: - if for example an employee is assigned to a company (basic_data) then always link the "show basic data" view and not the company's website URL - fixed wrong bundle, have to be "project", "msg" is generic - added missing i18n strings MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../mxchange/localization/project_de_DE.properties | 10 +++++++++- .../mxchange/localization/project_en_US.properties | 6 +++++- .../generic_product/admin_generic_product_links.tpl | 6 +++--- .../admin_product_category_links.tpl | 6 +++--- .../generic_product/admin_generic_product_list.xhtml | 12 ++---------- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/java/org/mxchange/localization/project_de_DE.properties b/src/java/org/mxchange/localization/project_de_DE.properties index dcbd7304..6c915c0c 100644 --- a/src/java/org/mxchange/localization/project_de_DE.properties +++ b/src/java/org/mxchange/localization/project_de_DE.properties @@ -123,10 +123,18 @@ TABLE_SUMMARY_ADMIN_LIST_GENERIC_PRODUCTS=Diese Tabelle listet alle eingetragene #@TODO Please fix German umlauts! ADMIN_EMPTY_LIST_GENERIC_PRODUCTS=Es befinden sich keine Produkte in der Datenbank. Oder Ihre Suche ergab keine Uebereinstimmungen. ADMIN_LINK_SHOW_GENERIC_PRODUCT_TITLE=Zeigt Daten des Produktes an. +#@TODO Please fix German umlauts! +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: LABEL_PRODUCT_CATEGORIES=Produktkategorien FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Liste durch Auswahl von ein oder mehr Produktkategorien 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. ADMIN_PRODUCT_GROSS_PRICE_HEADER=Bruttopreis: #@TODO Please fix German umlauts! PRODUCT_AVAILABILITY_HEADER=Produkt verfuegbar: @@ -272,7 +280,7 @@ PRODUCT_TAX_RATE_TITLE=Steuersatz des Produktes PRODUCT_NUMBER_HEADER=Produktnummer: PRODUCT_NUMBER_TITLE=Nummer des Produktes #@TODO Please fix German umlauts! -PRODUCT_SIZE_HEADER=Produktgroesse +PRODUCT_SIZE_HEADER=Produktgroesse: PRODUCT_UNIT_AMOUNT_HEADER=Produktmenge: PRODUCT_UNIT_AMOUNT_TITLE=Mengenangabe des Produktes #@TODO Please fix German umlauts! diff --git a/src/java/org/mxchange/localization/project_en_US.properties b/src/java/org/mxchange/localization/project_en_US.properties index 23510455..6c749589 100644 --- a/src/java/org/mxchange/localization/project_en_US.properties +++ b/src/java/org/mxchange/localization/project_en_US.properties @@ -93,10 +93,14 @@ CONTENT_TITLE_ADMIN_LIST_GENERIC_PRODUCT=List products: TABLE_SUMMARY_ADMIN_LIST_GENERIC_PRODUCTS=This table lists all products. ADMIN_EMPTY_LIST_GENERIC_PRODUCTS=There are no products in database. Or your search criteria doesn't match anything. 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: LABEL_PRODUCT_CATEGORIES=Product categories FILTER_BY_MULTIPLE_PRODUCT_CATEGORIES_TITLE=Filter list by selecting one or more product categories. 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. ADMIN_PRODUCT_GROSS_PRICE_HEADER=Gross price: PRODUCT_AVAILABILITY_HEADER=Product available: ADMIN_ADD_GENERIC_PRODUCT_TITLE=Add new product @@ -199,7 +203,7 @@ PRODUCT_TAX_RATE_HEADER=Tax rate: PRODUCT_TAX_RATE_TITLE=Tax rate of product PRODUCT_NUMBER_HEADER=Product number: PRODUCT_NUMBER_TITLE=Number of product -PRODUCT_SIZE_HEADER=Product size +PRODUCT_SIZE_HEADER=Product size: PRODUCT_UNIT_AMOUNT_HEADER=Product amount: PRODUCT_UNIT_AMOUNT_TITLE=Amount of product PRODUCT_UNIT_I18N_KEY_HEADER=Internationalization key for unit: diff --git a/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl b/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl index 4ac5d9f7..82c82599 100644 --- a/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl +++ b/web/WEB-INF/resources/tags/admin/links/mini/generic_product/admin_generic_product_links.tpl @@ -10,21 +10,21 @@