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 <roland@mxchange.org>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 449974508e61f02f8dea19e5106251a1f46ba3d4..14a4e5b3417ceb67dca6d99fe2c30a1e22175268 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
 # 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 47f5d3168da8fb8a90607c00999dac3af8f80e29..6b2f3059fb7aed00367b2f096107a934a1abc1aa 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
 # 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 994c10225f91e53e4109cafbaa49501df3786ace..2a478cf2e479aac95ae0ef26b072d1ae41890c91 100644 (file)
--- 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 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true">
+                                       <h:inputText styleClass="input" id="countryAbroadDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryAbroadDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_ABORAD_DIAL_PREFIX_REQUIRED}">
                                                <f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
                                        </h:inputText>
                                </div>
@@ -35,7 +35,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true">
+                                       <h:inputText styleClass="input" id="countryCode" size="2" maxlength="2" value="#{adminCountryController.countryCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_CODE_REQUIRED}">
                                                <f:validateRegex for="countryCode" pattern="[A-Z]{2}" />
                                        </h:inputText>
 
@@ -51,7 +51,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true">
+                                       <h:inputText styleClass="input" id="countryI18nKey" size="20" maxlength="100" value="#{adminCountryController.countryI18nKey}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_I18N_KEY_REQUIRED}">
                                                <f:validateRegex for="countryI18nKey" pattern="[A-Z_]{2,}" />
                                        </h:inputText>
                                </div>
@@ -80,7 +80,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true">
+                                       <h:inputText styleClass="input" id="countryExternalDialPrefix" size="2" maxlength="10" value="#{adminCountryController.countryExternalDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_EXTERNAL_DIAL_PREFIX_REQUIRED}">
                                                <f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
                                        </h:inputText>
                                </div>
@@ -94,7 +94,7 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true">
+                                       <h:inputText styleClass="input" id="countryPhoneCode" size="2" maxlength="6" value="#{adminCountryController.countryPhoneCode}" required="true" requiredMessage="#{msg.ADMIN_COUNTRY_PHONE_CODE_REQUIRED}">
                                                <f:validateLongRange for="countryAbroadDialPrefix" minimum="0" maximum="99" />
                                        </h:inputText>
 

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 860e960a6bd06b83be957abccb77af399b13a177..b53e1d909654169b8c342a171a31802f4d4b0dbd 100644 (file)
--- 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 @@
                                </div>
 
                                <div class="table_right_medium">
-                                       <h:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true">
+                                       <h:inputText styleClass="input" id="providerDialPrefix" size="5" maxlength="20" value="#{adminMobileProviderController.providerDialPrefix}" required="true" requiredMessage="#{msg.ADMIN_MOBILE_PROVIDER_DIAL_PREFIX_REQUIRED}">
                                                <f:validateLongRange for="providerDialPrefix" minimum="0" maximum="9999" />
                                        </h:inputText>
                                </div>