Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1141-optional-additional-2fa-auth

2018-04-22 07:14:05 +02:00
parent 156260c7a9 baec034909
commit de0e588cf3
56 changed files with 605 additions and 123 deletions
@@ -167,12 +167,18 @@ public enum MessageKey {
    /** Email address successfully added to your account! */
    EMAIL_ADDED_SUCCESS("email.added"),

+    /** Adding email was not allowed */
+    EMAIL_ADD_NOT_ALLOWED("email.add_not_allowed"),
+
    /** Please confirm your email address! */
    CONFIRM_EMAIL_MESSAGE("email.request_confirmation"),

    /** Email address changed correctly! */
    EMAIL_CHANGED_SUCCESS("email.changed"),

+    /** Changing email was not allowed */
+    EMAIL_CHANGE_NOT_ALLOWED("email.change_not_allowed"),
+
    /** Your current email address is: %email */
    EMAIL_SHOW("email.email_show", "%email"),