From: Roland Häder Date: Fri, 22 Jul 2016 10:25:21 +0000 (+0200) Subject: Continued a bit: (please cherry-pick this) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=25e47a41ca500a23ecbb951813c4728b5b49216b;p=jfinancials-war.git Continued a bit: (please cherry-pick this) - added custom required messages for country/mobile provider form fields - added missing i18n keys Signed-off-by: Roland Häder --- diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 44997450..14a4e5b3 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -14,7 +14,6 @@ # along with this program. If not, see . # Unknown gender -GENDER_UNKNOWN=Unbekannt GENDER_MALE=Herr GENDER_FEMALE=Frau CHOICE_YES=Ja @@ -597,11 +596,6 @@ LINK_GUEST_USER_NO_ACCOUNT_YET_TITLE=Als Benutzer anmelden LINK_GUEST_USER_NO_ACCOUNT_YET=Einfach hier anmelden. ERROR_GUEST_REGISTRATION_DISABLED=Fehler: Die Anmeldung ist administrativ deaktiviert worden. ERROR_LOGIN_USER_EDIT_DATA_DISABLED=Fehler: Editieren von Benutzerdaten wurde administrativ deaktiviert. -<<<<<<< HEAD -======= -PAGE_TITLE_USER_LOGIN_REPORTS=Berichte -SUB_TITLE_USER_LOGIN_REPORTS=Berichte: ->>>>>>> 82bcdaf... Closed internal TODO: (please cherry-pick this) LINK_USER_LOGOUT=Ausloggen LINK_USER_LOGOUT_TITLE=Aus dem Mitgliedsbereich ausloggen. ERROR_GUEST_USER_RESEND_LINK_DEACTIVATED=Fehler: Erneutes Aussenden des Best\u00e4tigungslink wurde administrativ deaktiviert. @@ -613,7 +607,10 @@ BUTTON_USER_LOGOUT=Ausloggen ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION=Hausnummererweiterung: ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Hausnummererweiterung: PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Anhang: -<<<<<<< HEAD ERROR_PARAMETER_FILE_TYPE_NOT_SET=Fehler: Parameter 'fileType' nicht gesetzt. -======= ->>>>>>> 82bcdaf... Closed internal TODO: (please cherry-pick this) +ADMIN_COUNTRY_PHONE_CODE_REQUIRED=Bitte geben Sie die Vorwahl dieses Landes ein (z.B. 49 f\u00fcr Deutschland). +ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl f\u00fcr Gespr\u00e4che ausserhalb des Ortes ein (meistens 0). +ADMIN_COUNTRY_I18N_KEY_REQUIRED=Bitte geben Sie den Schl\u00fcssel f\u00fcr das Sprachpaket ein (z.B. COUNTRY_GERMANY f\u00fcr Deutschland). +ADMIN_COUNTRY_CODE_REQUIRED=Bitte geben Sie den L\u00e4ndercode ein (z.B. DE f\u00fcr Deutschland). +ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl f\u00fcr Auslandsgespr\u00e4che ein (z.B. + oder 00). +ADMIN_MOBILE_PROVIDER_DIAL_PREFIX_REQUIRED=Bitte geben Sie die Vorwahl ohne f\u00fchrende Null f\u00fcr den Mobilfunkanbieter ein (z.B. 177 f\u00fcr E+). diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 47f5d316..6b2f3059 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -14,7 +14,6 @@ # along with this program. If not, see . # Unknown gender -GENDER_UNKNOWN=Unknown GENDER_MALE=Mr. GENDER_FEMALE=Mrs. CHOICE_YES=Yes @@ -606,7 +605,10 @@ BUTTON_USER_LOGOUT=Logout ADMIN_CONTACT_HOUSE_NUMBER_EXTENSION=House number extension: ADMIN_PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=House number extension: PERSONAL_DATA_HOUSE_NUMBER_EXTENSION=Extension: -<<<<<<< HEAD ERROR_PARAMETER_FILE_TYPE_NOT_SET=Error: Parameter 'fileType' is not set. -======= ->>>>>>> 82bcdaf... Closed internal TODO: (please cherry-pick this) +ADMIN_COUNTRY_PHONE_CODE_REQUIRED=Please enter dial prefix for this country (e.g. 1 for U.S.A.). +ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED=Please enter dial prefix for calls outside the current city. +ADMIN_COUNTRY_I18N_KEY_REQUIRED=Please enter the key for the language package (e.g. COUNTRY_USA for U.S.A.). +ADMIN_COUNTRY_CODE_REQUIRED=Please enter country code (e.g. US for U.S.A.). +ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED=Please enter dial prefix for abroad calls (e.g. + or 00). +ADMIN_MOBILE_PROVIDER_DIAL_PREFIX_REQUIRED=Please enter dial prefix for mobile provider. diff --git a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl index 994c1022..2a478cf2 100644 --- a/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl +++ b/web/WEB-INF/templates/admin/country/admin_form_country_data.tpl @@ -21,7 +21,7 @@
- +
@@ -35,7 +35,7 @@
- + @@ -51,7 +51,7 @@
- +
@@ -80,7 +80,7 @@
- +
@@ -94,7 +94,7 @@
- + diff --git a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl index 860e960a..b53e1d90 100644 --- a/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl +++ b/web/WEB-INF/templates/admin/mobile_provider/admin_form_mobile_provider.tpl @@ -21,7 +21,7 @@
- +