From ce3dfa21e185b8630911c604afa13cb6e4498338 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 24 Mar 2018 22:58:23 +0100 Subject: [PATCH] Please cherry-pick: - added more i18n strings - used own validator:emailAddressValidator as this allows empty values to be ignored MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../localization/generic_de_DE.properties | 19 ++++++++++++++++++- .../localization/generic_en_US.properties | 18 ++++++++++++++++-- .../templates/contact/form_contact_data.tpl | 4 +++- .../guest_email_address_repeat_fields.tpl | 3 ++- ...ser_change_email_address_repeat_fields.tpl | 4 ++-- 5 files changed, 41 insertions(+), 7 deletions(-) diff --git a/src/java/org/mxchange/localization/generic_de_DE.properties b/src/java/org/mxchange/localization/generic_de_DE.properties index 58bcca9c..532e1845 100644 --- a/src/java/org/mxchange/localization/generic_de_DE.properties +++ b/src/java/org/mxchange/localization/generic_de_DE.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2016, 2017 Roland H\u00e4der +# Copyright (C) 2016 - 2018 Free Software Foundation # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -1141,3 +1141,20 @@ ADMIN_ADD_HEADQUARTER_OPENING_TIME_TITLE=Oeffnungszeit zur Hauptstelle hinzufueg BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME=Oeffnungszeit zur Hauptstelle hinzufuegen ADMIN_LINK_ASSIGN_EMPLOYEE_BRANCH_OFFICE_TITLE=Diesem Mitarbeiter eine Abteilung zuweisen. ADMIN_LINK_ASSIGN_EMPLOYEES_OWNER_USER_TITLE=Diesem Mitarbeiter einen besitzenden Benutzer zuweisen. +PAYMENT_TYPE=Bezahlungsmethode: +ADMIN_DATA_LAST_HOUSE_NUMBER=Letzte Hausnummer: +NUMBER=Nummer: +#@TODO Please fix German umlauts! +ADMIN_EMPLOYEE_ALREADY_CREATED=Ein Mitarbeiter mit den selben Daten wurde bereits hinzugefuegt. +#@TODO Please fix German umlauts! +ADMIN_HEADQUARTER_ALREADY_CREATED=Eine Hauptstelle mit den selben Daten wurde bereits hinzugefuegt. +ADMIN_CONTACT_DATA_FIRST_NAME_REQUIRED=Bitte geben Sie den Vornamen ein. Falls nicht bekannt, geben Sie X einfach ein. +ADMIN_CONTACT_DATA_FAMILY_NAME_REQUIRED=Bitte geben Sie den Familiennamen ein. Falls nicht bekannt, geben Sie X einfach ein. +ADMIN_HEADQUARTER_COMPANY_NAME=Firmenname der Hauptstelle: +ADMIN_HEADQUARTER_COMPANY_NAME_REQUIRED=Bitte geben Sie den Firmennamen der Hauptstelle ein. +#@TODO Please fix German umlauts! +ADMIN_SELECT_CONTACT_COUNTRY_REQUIRED=Bitte waehlen Sie das Land fuer diesen Kontakt aus. +COUNTRY_ITALIA=Italien +ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE=Bitte geben Sie das Geburtsdatum des Kontaktes ein. +ADMIN_SELECT_USER_PROFILE_MODE=Profilmodus ausw\u00e4hlen: +ADMIN_ASSIGN_BRANCH_OFFICE_OWNER=Filialbesitzer/-leiter diff --git a/src/java/org/mxchange/localization/generic_en_US.properties b/src/java/org/mxchange/localization/generic_en_US.properties index ae3da0a6..6b51d5c7 100644 --- a/src/java/org/mxchange/localization/generic_en_US.properties +++ b/src/java/org/mxchange/localization/generic_en_US.properties @@ -1,4 +1,4 @@ -# Copyright (C) 2016, 2017 Roland H\u00e4der +# Copyright (C) 2016 - 2018 Free Software Foundation # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -942,7 +942,7 @@ ADMIN_EMPTY_LIST_DEPARTMENTS=There are no departments in database. Or your searc ADMIN_LINK_SHOW_DEPARTMENT_TITLE=Shpws details of a department. ADMIN_LINK_EDIT_DEPARTMENT_TITLE=Edit of a department ADMIN_LINK_DELETE_DEPARTMENT_TITLE=Deletes a department. -ADMIN_DEPARTMENT_ALREADY_CREATED=The department already exists in selected company. +ADMIN_DEPARTMENT_ALREADY_CREATED=A department already exists in selected company. ADMIN_LIST_DEPARTMENTS_HEADER=List all departments ADMIN_HEADER_I18N_KEY=I18n key: ADMIN_ENTER_DEPARTMENT_I18N_KEY=I18n key for department: @@ -1032,3 +1032,17 @@ ADMIN_ADD_HEADQUARTER_OPENING_TIME_TITLE=Add opening time to headquarter BUTTON_ADMIN_ADD_HEADQUARTER_OPENING_TIME=Add opening time to headquarter ADMIN_LINK_ASSIGN_EMPLOYEE_BRANCH_OFFICE_TITLE=Assign a branch office to this employee. ADMIN_LINK_ASSIGN_EMPLOYEES_OWNER_USER_TITLE=Assign an owning user to this employee. +PAYMENT_TYPE=Payment type: +ADMIN_DATA_LAST_HOUSE_NUMBER=Last house number: +NUMBER=Number: +ADMIN_EMPLOYEE_ALREADY_CREATED=An employee with same data has already been added. +ADMIN_HEADQUARTER_ALREADY_CREATED=A headquarter with same data has already been added. +ADMIN_CONTACT_DATA_FIRST_NAME_REQUIRED=Please enter first name. If unknown, just enter X. +ADMIN_CONTACT_DATA_FAMILY_NAME_REQUIRED=Please enter family name. If unknown, just enter X. +ADMIN_HEADQUARTER_COMPANY_NAME=Headquarter's company name: +ADMIN_HEADQUARTER_COMPANY_NAME_REQUIRED=Please enter headquarter's company name. +ADMIN_SELECT_CONTACT_COUNTRY_REQUIRED=Please select a country for this contact. +COUNTRY_ITALIA=Italia +ADMIN_PERSONAL_DATA_BIRTHDAY_TITLE=Please enter birthday of contact. +ADMIN_SELECT_USER_PROFILE_MODE=Select profile mode: +ADMIN_ASSIGN_BRANCH_OFFICE_OWNER=Branch office owner/leader diff --git a/web/WEB-INF/templates/contact/form_contact_data.tpl b/web/WEB-INF/templates/contact/form_contact_data.tpl index 34dbce39..f0b6dced 100644 --- a/web/WEB-INF/templates/contact/form_contact_data.tpl +++ b/web/WEB-INF/templates/contact/form_contact_data.tpl @@ -138,6 +138,8 @@ @@ -219,7 +221,7 @@ - +
diff --git a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl index 15d23776..733c9191 100644 --- a/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl +++ b/web/WEB-INF/templates/guest/guest_email_address_repeat_fields.tpl @@ -2,6 +2,7 @@ @@ -13,7 +14,7 @@
- +
diff --git a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl index 1ba2c6ea..071dca02 100644 --- a/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl +++ b/web/WEB-INF/templates/login/user/user_change_email_address_repeat_fields.tpl @@ -2,9 +2,9 @@ @@ -14,7 +14,7 @@
- +
-- 2.39.5