Please cherry-pick:

- used other regex for email address validation as it didn't work even with mine
- *2 is no longer the case

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
index 128225f0c02999e5257e3b33b83ac48bf86939a4..aa4a968b6161a2242fb897084edf1bba3d296767 100644 (file)
--- a/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
+++ b/src/java/org/mxchange/addressbook/validator/emailaddress/AddressbookEmailAddressValidator.java
@@ -52,7 +52,7 @@ public class AddressbookEmailAddressValidator extends BaseStringValidator implem
        /**
         * Email pattern
         */
-       private static final String EMAIL_REGEX = "([^.@]+)(\\\\.[^.@]+)*@([^.@]+\\\\.)+([^.@]+)"; //NOI18N
+       private static final String EMAIL_REGEX = "^([a-zA-Z0-9_\\-\\.]+)@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.)|(([a-zA-Z0-9\\-]+\\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\\]?)$"; //NOI18N
 
        /**
         * Serial number

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index 5c7e5b030f68414ff5fa69d1ddd63344110665c4..1f621640ab990a26c64d9124679ee58e2d5c6b8d 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -314,7 +314,7 @@ ADMIN_PERSONAL_DATA_ENTER_USER_NAME=Benutzername (*1):
 ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS=Email-Adresse (*2):
 ADMIN_USER_DATA_USER_NAME_NOTICE=*1: Der Benutzername darf nur einmal vorhanden sein, das System pr\u00fcft dies f\u00fcr Sie.
 ADMIN_USER_DATA_PASSWORD_ADD_NOTICE=Lassen Sie beide Passwortfelder leer und es wird ein Passwort per Zufall generiert. Das Passwort wird dem Benutzer nach Erstellung des Zugangs an die Email-Adresse gesendet.
-ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE=*2: Die Email-Adresse darf nur einmal vorhanden sein.
+ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE=Die Email-Adresse darf nur einmal vorhanden sein.
 BUTTON_ADMIN_ADD_USER=Neues Benutzeraccount hinzuf\u00fcgen
 ADMIN_MENU_COUNTRY_TITLE=L\u00e4nderdaten
 LINK_ADMIN_LIST_COUNTRIES=L\u00e4nder auflisten

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index bb65ef7f3b8c72d0b6c9410785cbe3b68712c833..cebeef444a4ef3930daa1b3dc346bf601e146fe9 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -296,7 +296,7 @@ ADMIN_PERSONAL_DATA_ENTER_USER_NAME=User name (*1):
 ADMIN_PERSONAL_DATA_ENTER_EMAIL_ADDRESS=Email address (*2):
 ADMIN_USER_DATA_USER_NAME_NOTICE=*1: The user name must be unique which is checked by the system for you.
 ADMIN_USER_DATA_PASSWORD_ADD_NOTICE=Keep both password fields empty to create a random password. The password is being sent to the user's email address after creation of the account.
-ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE=*2: The email address must be unique.
+ADMIN_CONTACT_DATA_EMAIL_ADDRESS_NOTICE=The email address must be unique.
 BUTTON_ADMIN_ADD_USER=Add new user account
 ADMIN_MENU_COUNTRY_TITLE=Country data
 LINK_ADMIN_LIST_COUNTRIES=List countries