Cleanup and simplify i18n code

There's no need for I18N_NOTIFICATION_DATA and I18N_NOTIFICATION_MAP
Also bugfix: NEW_PASSWORD_FORBIDDENT => NEW_PASSWORD_FORBIDDEN
This commit is contained in:
djmaze 2021-01-04 12:08:41 +01:00
parent 950579c7f5
commit 0d13484cdc
20 changed files with 45 additions and 142 deletions

View file

@ -9,9 +9,6 @@ class Notifications
const AccessError = 103;
const ConnectionError = 104;
const CaptchaError = 105;
const SocialFacebookLoginAccessDisable = 106;
const SocialTwitterLoginAccessDisable = 107;
const SocialGoogleLoginAccessDisable = 108;
const DomainNotAllowed = 109;
const AccountNotAllowed = 110;
@ -84,9 +81,6 @@ class Notifications
self::AccessError => 'AccessError',
self::ConnectionError => 'ConnectionError',
self::CaptchaError => 'CaptchaError',
self::SocialFacebookLoginAccessDisable => 'SocialFacebookLoginAccessDisable',
self::SocialTwitterLoginAccessDisable => 'SocialTwitterLoginAccessDisable',
self::SocialGoogleLoginAccessDisable => 'SocialGoogleLoginAccessDisable',
self::DomainNotAllowed => 'DomainNotAllowed',
self::AccountNotAllowed => 'AccountNotAllowed',
self::AccountTwoFactorAuthRequired => 'AccountTwoFactorAuthRequired',

View file

@ -175,7 +175,7 @@ en:
CURRENT_PASSWORD_INCORRECT: "Current password incorrect"
NEW_PASSWORD_SHORT: "Password is too short"
NEW_PASSWORD_WEAK: "Password is too easy"
NEW_PASSWORD_FORBIDDENT: "Password contains forbidden characters"
NEW_PASSWORD_FORBIDDEN: "Password contains forbidden characters"
CONTACTS_SYNC_ERROR: "Contacts synchronization error"
CANT_GET_MESSAGE_LIST: "Can't get message list"
CANT_GET_MESSAGE: "Can't get message"

View file

@ -173,7 +173,7 @@ de_DE:
CURRENT_PASSWORD_INCORRECT: "Aktuelles Passwort falsch"
NEW_PASSWORD_SHORT: "Passwort ist zu kurz"
NEW_PASSWORD_WEAK: "Passwort ist zu einfach"
NEW_PASSWORD_FORBIDDENT: "Passwort enthält unzulässige Zeichen"
NEW_PASSWORD_FORBIDDEN: "Passwort enthält unzulässige Zeichen"
CONTACTS_SYNC_ERROR: "Fehler bei Kontakte-Synchronisierung"
CANT_GET_MESSAGE_LIST: "Die Nachrichtenliste ist nicht verfügbar"
CANT_GET_MESSAGE: "Diese Nachricht ist nicht verfügbar"

View file

@ -174,7 +174,7 @@ en_US:
CURRENT_PASSWORD_INCORRECT: "Current password incorrect"
NEW_PASSWORD_SHORT: "Password is too short"
NEW_PASSWORD_WEAK: "Password is too easy"
NEW_PASSWORD_FORBIDDENT: "Password contains forbidden characters"
NEW_PASSWORD_FORBIDDEN: "Password contains forbidden characters"
CONTACTS_SYNC_ERROR: "Contacts synchronization error"
CANT_GET_MESSAGE_LIST: "Can't get message list"
CANT_GET_MESSAGE: "Can't get message"

View file

@ -174,7 +174,7 @@ es_ES:
CURRENT_PASSWORD_INCORRECT: "La contraseña actual es incorrecta"
NEW_PASSWORD_SHORT: "La contraseña es muy corta"
NEW_PASSWORD_WEAK: "La contraseña es muy fácil"
NEW_PASSWORD_FORBIDDENT: "La contraseña contiene caracteres prohibidos"
NEW_PASSWORD_FORBIDDEN: "La contraseña contiene caracteres prohibidos"
CONTACTS_SYNC_ERROR: "Error de sincronización de Contactos"
CANT_GET_MESSAGE_LIST: "No se puede obtener la lista de mensajes"
CANT_GET_MESSAGE: "No se puede obtener el mensaje"

View file

@ -174,7 +174,7 @@ fr_FR:
CURRENT_PASSWORD_INCORRECT: "Le mot de passe actuel est incorrect"
NEW_PASSWORD_SHORT: "Le mot de passe est trop court"
NEW_PASSWORD_WEAK: "Le mot de passe n'est pas assez fort"
NEW_PASSWORD_FORBIDDENT: "Le mot de passe contient des caractères invalides"
NEW_PASSWORD_FORBIDDEN: "Le mot de passe contient des caractères invalides"
CONTACTS_SYNC_ERROR: "Erreur de synchronisation des contacts"
CANT_GET_MESSAGE_LIST: "Impossible d'obtenir la liste des messages"
CANT_GET_MESSAGE: "Impossible d'obtenir le message"

View file

@ -173,7 +173,7 @@ nl_NL:
CURRENT_PASSWORD_INCORRECT: "Huidig wachtwoord is onjuist"
NEW_PASSWORD_SHORT: "Wachtwoord is te kort"
NEW_PASSWORD_WEAK: "Wachtwoord is te gemakkelijk"
NEW_PASSWORD_FORBIDDENT: "Wachtwoord bevat verboden karakters"
NEW_PASSWORD_FORBIDDEN: "Wachtwoord bevat verboden karakters"
CONTACTS_SYNC_ERROR: "Contactpersonen synchronisatie fout"
CANT_GET_MESSAGE_LIST: "Kan berichtenlijst niet ophalen"
CANT_GET_MESSAGE: "Kan bericht niet ophalen"

View file

@ -174,7 +174,7 @@ zh_CN:
CURRENT_PASSWORD_INCORRECT: "当前密码不正确"
NEW_PASSWORD_SHORT: "密码太短"
NEW_PASSWORD_WEAK: "密码过于简单"
NEW_PASSWORD_FORBIDDENT: "密码包含禁止使用的字符"
NEW_PASSWORD_FORBIDDEN: "密码包含禁止使用的字符"
CONTACTS_SYNC_ERROR: "联系人同步错误"
CANT_GET_MESSAGE_LIST: "无法获取邮件列表"
CANT_GET_MESSAGE: "无法获取邮件"
@ -221,4 +221,4 @@ zh_CN:
BAD_BROWSER_TITLE: "您的浏览器过时了。"
BAD_BROWSER_DESC: |
为了使用所有特性,
下载并安装其中一款浏览器:
下载并安装其中一款浏览器:

View file

@ -425,7 +425,6 @@ en:
LABEL_FILTERS_NAME: "Filters"
LABEL_TEMPLATES_NAME: "Templates"
LABEL_SECURITY_NAME: "Security"
LABEL_SOCIAL_NAME: "Social"
LABEL_THEMES_NAME: "Themes"
LABEL_CHANGE_PASSWORD_NAME: "Password"
LABEL_OPEN_PGP_NAME: "OpenPGP"
@ -630,7 +629,7 @@ en:
CURRENT_PASSWORD_INCORRECT: "Current password incorrect"
NEW_PASSWORD_SHORT: "Password is too short"
NEW_PASSWORD_WEAK: "Password is too easy"
NEW_PASSWORD_FORBIDDENT: "Password contains forbidden characters"
NEW_PASSWORD_FORBIDDEN: "Password contains forbidden characters"
CONTACTS_SYNC_ERROR: "Contacts synchronization error"
CANT_GET_MESSAGE_LIST: "Can't get message list"
CANT_GET_MESSAGE: "Can't get message"

View file

@ -425,7 +425,6 @@ de_DE:
LABEL_FILTERS_NAME: "Filter"
LABEL_TEMPLATES_NAME: "Vorlagen"
LABEL_SECURITY_NAME: "Sicherheit"
LABEL_SOCIAL_NAME: "Social"
LABEL_THEMES_NAME: "Themen"
LABEL_CHANGE_PASSWORD_NAME: "Passwort"
LABEL_OPEN_PGP_NAME: "OpenPGP"
@ -629,7 +628,7 @@ de_DE:
CURRENT_PASSWORD_INCORRECT: "Aktuelles Passwort falsch"
NEW_PASSWORD_SHORT: "Passwort ist zu kurz"
NEW_PASSWORD_WEAK: "Passwort ist zu einfach"
NEW_PASSWORD_FORBIDDENT: "Passwort enthält unzulässige Zeichen"
NEW_PASSWORD_FORBIDDEN: "Passwort enthält unzulässige Zeichen"
CONTACTS_SYNC_ERROR: "Fehler bei Kontakte-Synchronisierung"
CANT_GET_MESSAGE_LIST: "Die Nachrichtenliste ist nicht verfügbar"
CANT_GET_MESSAGE: "Diese Nachricht ist nicht verfügbar"

View file

@ -425,7 +425,6 @@ en_GB:
LABEL_FILTERS_NAME: "Filters"
LABEL_TEMPLATES_NAME: "Templates"
LABEL_SECURITY_NAME: "Security"
LABEL_SOCIAL_NAME: "Social"
LABEL_THEMES_NAME: "Themes"
LABEL_CHANGE_PASSWORD_NAME: "Password"
LABEL_OPEN_PGP_NAME: "OpenPGP"
@ -630,7 +629,7 @@ en_GB:
CURRENT_PASSWORD_INCORRECT: "Current password incorrect"
NEW_PASSWORD_SHORT: "Password is too short"
NEW_PASSWORD_WEAK: "Password is too easy"
NEW_PASSWORD_FORBIDDENT: "Password contains forbidden characters"
NEW_PASSWORD_FORBIDDEN: "Password contains forbidden characters"
CONTACTS_SYNC_ERROR: "Contacts synchronization error"
CANT_GET_MESSAGE_LIST: "Can't get message list"
CANT_GET_MESSAGE: "Can't get message"

View file

@ -425,7 +425,6 @@ en_US:
LABEL_FILTERS_NAME: "Filters"
LABEL_TEMPLATES_NAME: "Templates"
LABEL_SECURITY_NAME: "Security"
LABEL_SOCIAL_NAME: "Social"
LABEL_THEMES_NAME: "Themes"
LABEL_CHANGE_PASSWORD_NAME: "Password"
LABEL_OPEN_PGP_NAME: "OpenPGP"
@ -630,7 +629,7 @@ en_US:
CURRENT_PASSWORD_INCORRECT: "Current password incorrect"
NEW_PASSWORD_SHORT: "Password is too short"
NEW_PASSWORD_WEAK: "Password is too easy"
NEW_PASSWORD_FORBIDDENT: "Password contains forbidden characters"
NEW_PASSWORD_FORBIDDEN: "Password contains forbidden characters"
CONTACTS_SYNC_ERROR: "Contacts synchronization error"
CANT_GET_MESSAGE_LIST: "Can't get message list"
CANT_GET_MESSAGE: "Can't get message"

View file

@ -426,7 +426,6 @@ es_ES:
LABEL_FILTERS_NAME: "Filtros"
LABEL_TEMPLATES_NAME: "Plantillas"
LABEL_SECURITY_NAME: "Seguridad"
LABEL_SOCIAL_NAME: "Social"
LABEL_THEMES_NAME: "Temas"
LABEL_CHANGE_PASSWORD_NAME: "Contraseña"
LABEL_OPEN_PGP_NAME: "OpenPGP"
@ -630,7 +629,7 @@ es_ES:
CURRENT_PASSWORD_INCORRECT: "La contraseña actual es incorrecta"
NEW_PASSWORD_SHORT: "La contraseña es muy corta"
NEW_PASSWORD_WEAK: "La contraseña es muy fácil"
NEW_PASSWORD_FORBIDDENT: "La contraseña contiene caracteres prohibidos"
NEW_PASSWORD_FORBIDDEN: "La contraseña contiene caracteres prohibidos"
CONTACTS_SYNC_ERROR: "Error de sincronización de Contactos"
CANT_GET_MESSAGE_LIST: "No se puede obtener la lista de mensajes"
CANT_GET_MESSAGE: "No se puede obtener el mensaje"

View file

@ -426,7 +426,6 @@ fr_FR:
LABEL_FILTERS_NAME: "Filtres"
LABEL_TEMPLATES_NAME: "Modèles"
LABEL_SECURITY_NAME: "Sécurité"
LABEL_SOCIAL_NAME: "Social"
LABEL_THEMES_NAME: "Thèmes"
LABEL_CHANGE_PASSWORD_NAME: "Mot de passe"
LABEL_OPEN_PGP_NAME: "OpenPGP"
@ -631,7 +630,7 @@ fr_FR:
CURRENT_PASSWORD_INCORRECT: "Le mot de passe actuel est incorrect"
NEW_PASSWORD_SHORT: "Le mot de passe est trop court"
NEW_PASSWORD_WEAK: "Le mot de passe n'est pas assez fort"
NEW_PASSWORD_FORBIDDENT: "Le mot de passe contient des caractères invalides"
NEW_PASSWORD_FORBIDDEN: "Le mot de passe contient des caractères invalides"
CONTACTS_SYNC_ERROR: "Erreur de synchronisation des contacts"
CANT_GET_MESSAGE_LIST: "Impossible d'obtenir la liste des messages"
CANT_GET_MESSAGE: "Impossible d'obtenir le message"

View file

@ -424,7 +424,6 @@ nl_NL:
LABEL_FILTERS_NAME: "Filters"
LABEL_TEMPLATES_NAME: "Templates"
LABEL_SECURITY_NAME: "Beveiliging"
LABEL_SOCIAL_NAME: "Social"
LABEL_THEMES_NAME: "Thema's"
LABEL_CHANGE_PASSWORD_NAME: "Wachtwoord"
LABEL_OPEN_PGP_NAME: "OpenPGP"
@ -628,7 +627,7 @@ nl_NL:
CURRENT_PASSWORD_INCORRECT: "Huidig wachtwoord onjuist"
NEW_PASSWORD_SHORT: "Wachtwoord is te kort"
NEW_PASSWORD_WEAK: "Wachtwoord is te makkelijk"
NEW_PASSWORD_FORBIDDENT: "Wachtwoord bevat verboden tekens"
NEW_PASSWORD_FORBIDDEN: "Wachtwoord bevat verboden tekens"
CONTACTS_SYNC_ERROR: "Contactpersonen synchronisatie fout"
CANT_GET_MESSAGE_LIST: "Berichtenlijst kan niet worden opgehaald"
CANT_GET_MESSAGE: "Bericht kan niet worden opgehaald"

View file

@ -423,7 +423,6 @@ zh_CN:
LABEL_FILTERS_NAME: "筛选条件"
LABEL_TEMPLATES_NAME: "模版"
LABEL_SECURITY_NAME: "安全"
LABEL_SOCIAL_NAME: "社交"
LABEL_THEMES_NAME: "主题"
LABEL_CHANGE_PASSWORD_NAME: "密码"
LABEL_OPEN_PGP_NAME: "OpenPGP"
@ -628,7 +627,7 @@ zh_CN:
CURRENT_PASSWORD_INCORRECT: "当前密码不正确"
NEW_PASSWORD_SHORT: "密码太短"
NEW_PASSWORD_WEAK: "密码过于简单"
NEW_PASSWORD_FORBIDDENT: "密码包含禁止使用的字符"
NEW_PASSWORD_FORBIDDEN: "密码包含禁止使用的字符"
CONTACTS_SYNC_ERROR: "联系人同步错误"
CANT_GET_MESSAGE_LIST: "无法获取邮件列表"
CANT_GET_MESSAGE: "无法获取邮件"