From 7419a84b39c3f6dbc3992c7ae079969cf5303458 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 25 Jul 2017 21:11:05 +0200 Subject: [PATCH] Please cherry-pick: - fixed id, should be form-specific - added more missing i18n strings - legal status can be now optional for supporting single-person companies (how do you call this in English?) --- .../mxchange/localization/bundle_de_DE.properties | 12 +++++++++++- .../mxchange/localization/bundle_en_US.properties | 8 ++++++++ .../admin_form_contact_business_data.tpl | 4 ++-- .../admin_contact_business_list.xhtml | 2 +- 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 3c7516a0..3c50b232 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -846,6 +846,16 @@ ADMIN_BUSINESS_DATA_PHONE_NUMBER=Haupttelefonnummer: ADMIN_BUSINESS_DATA_FAX_NUMBER=Hauptfaxnummer: #@TODO Please fix German umlauts! ADMIN_ADD_CONTACT_BUSINESS_TITLE=Neuen geschaeftlichen Kontakt hinzufuegen -ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Bitte mindestens Firmennamen mit Rechtsstand ein. +ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Bitte mindestens Firmennamen mit Rechtsform ein. #@TODO Please fix German umlauts! ENTERED_EMAIL_ADDRESS_IS_INVALID=Die eingegebene Email-Addresse entspricht nicht dem gueltigen Format. +#@TODO Please fix German umlauts! +ADMIN_CONTACT_BUSINESS_DATA_LEGEND=Basisdaten fuer geschaeftlichen Kontakt: +#@TODO Please fix German umlauts! +ADMIN_CONTACT_BUSINESS_DATA_LEGEND_TITLE=Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein. +ADMIN_BUSINESS_DATA_COMPANY_NAME=Firmenname: +ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED=Bitte geben Sie den Firmennamen ohne Rechtsform ein. +ADMIN_BUSINESS_DATA_COMPANY_LEGAL_STATUS=Rechtsform (z.B. GmbH): +ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS=Haupt-Email-Adresse: +#@TODO Please fix German umlauts! +BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON=Basisdaten hinzufuegen diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index af487eca..5835c252 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -830,3 +830,11 @@ ADMIN_BUSINESS_DATA_FAX_NUMBER=Main fax number: ADMIN_ADD_CONTACT_BUSINESS_TITLE=Add new business contact ADMIN_ADD_CONTACT_BUSINESS_MINIMUM_DATA=Please enter at least company name and legal status. ENTERED_EMAIL_ADDRESS_IS_INVALID=Your entered email address is not valid. +ADMIN_CONTACT_BUSINESS_DATA_LEGEND=Basic data for business contact: +#Geben Sie die Basisdaten fuer einen geschaeftlichen Kontakt ein. +ADMIN_CONTACT_BUSINESS_DATA_LEGEND_TITLE=Enter basic data for a business contact. +ADMIN_BUSINESS_DATA_COMPANY_NAME=Company name: +ADMIN_BUSINESS_DATA_COMPANY_NAME_REQUIRED=Please enter the company's name without legal status. +ADMIN_BUSINESS_DATA_COMPANY_LEGAL_STATUS=Legal status (e.g. Inc.): +ADMIN_BUSINESS_DATA_COMPANY_EMAIL_ADDRESS=Main email address: +BUTTON_ADMIN_CONTINUE_BUSINESS_CONTACT_PERSON=Add basic data diff --git a/web/WEB-INF/templates/admin/contact_business/admin_form_contact_business_data.tpl b/web/WEB-INF/templates/admin/contact_business/admin_form_contact_business_data.tpl index 86937027..f4111648 100644 --- a/web/WEB-INF/templates/admin/contact_business/admin_form_contact_business_data.tpl +++ b/web/WEB-INF/templates/admin/contact_business/admin_form_contact_business_data.tpl @@ -33,7 +33,7 @@
- +
@@ -76,7 +76,7 @@
- +
diff --git a/web/admin/contact_business/admin_contact_business_list.xhtml b/web/admin/contact_business/admin_contact_business_list.xhtml index 8bfc600b..7619af60 100644 --- a/web/admin/contact_business/admin_contact_business_list.xhtml +++ b/web/admin/contact_business/admin_contact_business_list.xhtml @@ -88,7 +88,7 @@
- +
-- 2.39.5