SF.net SVN: postfixadmin:[1541] trunk
Brought to you by:
christian_boltz,
gingerdog
From: <chr...@us...> - 2013-10-19 18:45:44
|
Revision: 1541 http://sourceforge.net/p/postfixadmin/code/1541 Author: christian_boltz Date: 2013-10-19 18:45:41 +0000 (Sat, 19 Oct 2013) Log Message: ----------- AliasdomainHandler.php: - better error/success messages - cleanup TODO notes *.lang: - new texts for alias domains: alias_domain_change_failed, alias_domain_changed, alias_domain_to_itsself Modified Paths: -------------- trunk/languages/bg.lang trunk/languages/ca.lang trunk/languages/cn.lang trunk/languages/cs.lang trunk/languages/da.lang trunk/languages/de.lang trunk/languages/en.lang trunk/languages/es.lang trunk/languages/et.lang trunk/languages/eu.lang trunk/languages/fi.lang trunk/languages/fo.lang trunk/languages/fr.lang trunk/languages/hr.lang trunk/languages/hu.lang trunk/languages/is.lang trunk/languages/it.lang trunk/languages/ja.lang trunk/languages/lt.lang trunk/languages/mk.lang trunk/languages/nb.lang trunk/languages/nl.lang trunk/languages/nn.lang trunk/languages/pl.lang trunk/languages/pt-br.lang trunk/languages/ru.lang trunk/languages/sk.lang trunk/languages/sl.lang trunk/languages/sv.lang trunk/languages/tr.lang trunk/languages/tw.lang trunk/model/AliasdomainHandler.php Modified: trunk/languages/bg.lang =================================================================== --- trunk/languages/bg.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/bg.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -91,8 +91,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Не ви е позволено да използвате избраната конфигурация.'; $PALANG['pCreate_alias_domain_error2'] = 'Избраната конфигурация е невалидна. Изберете друга!'; $PALANG['pCreate_alias_domain_error3'] = 'Възникна грешка при добавяне в базата. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Този ALIAS не е валиден!'; $PALANG['email_address_already_exists'] = 'Този е-мейл адрес вече съществува, моля изберете различен!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/ca.lang =================================================================== --- trunk/languages/ca.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/ca.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -89,8 +89,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'L\'àlies no és vàlid!'; $PALANG['email_address_already_exists'] = 'Aquesta adreça ja existeix, escull una altra de diferent, si us plau!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/cn.lang =================================================================== --- trunk/languages/cn.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/cn.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = '该别名非法!'; $PALANG['email_address_already_exists'] = '邮件地址已经存在, 请重新选择!'; Modified: trunk/languages/cs.lang =================================================================== --- trunk/languages/cs.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/cs.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -95,8 +95,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Adresa neni platná!'; $PALANG['email_address_already_exists'] = 'Taková emailová adresa již existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/da.lang =================================================================== --- trunk/languages/da.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/da.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -95,8 +95,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Du har ikke tilladelse til at lave den valgte konfiguration'; $PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfiguration er ikke korrekt, vælg venligst en anden.'; $PALANG['pCreate_alias_domain_error3'] = 'Indsætning i databasen fejlede. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Alle domænerne har allerede aliases.'; $PALANG['pCreate_alias_domain_success'] = 'Domæne-alias blev tilføjet alias-tabellen. (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldigt.'; $PALANG['email_address_already_exists'] = 'Emailadressen eksisterer allerede, vælg venligst en anden.'; Modified: trunk/languages/de.lang =================================================================== --- trunk/languages/de.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/de.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -92,8 +92,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Sie dürfen die gewählte Konfiguration nicht erstellen.'; $PALANG['pCreate_alias_domain_error2'] = 'Die gewählte Konfiguration ist ungültig, bitte wählen Sie eine andere'; $PALANG['pCreate_alias_domain_error3'] = 'Das Erstellen der Alias-Domain %s ist fehlgeschlagen!'; +$PALANG['alias_domain_change_failed'] = 'Ändern der Alias-Domain %s fehlgeschlagen!'; $PALANG['pCreate_alias_domain_error4'] = 'Alle Domains sind bereits Alias-Domains.'; $PALANG['pCreate_alias_domain_success'] = 'Die Alias-Domain %s wurde erstellt.'; +$PALANG['alias_domain_changed'] = 'Die Alias-Domain %s wurde geändert.'; +$PALANG['alias_domain_to_itsself'] = 'Eine Domain kann keine Alias-Domain von sich selbst sein!'; $PALANG['pCreate_alias_address_text_error1'] = 'Dieses ALIAS ist nicht erlaubt!'; $PALANG['email_address_already_exists'] = 'Diese eMail-Adresse existiert bereits. Bitte wählen Sie eine andere!'; Modified: trunk/languages/en.lang =================================================================== --- trunk/languages/en.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/en.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -93,8 +93,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; $PALANG['pCreate_alias_domain_error3'] = 'Creating the alias domain %s failed!'; +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; $PALANG['pCreate_alias_address_text_error1'] = 'The ALIAS is not valid!'; $PALANG['email_address_already_exists'] = 'This email address already exists, please choose a different one!'; Modified: trunk/languages/es.lang =================================================================== --- trunk/languages/es.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/es.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'No estás autorizado a crear la configuración que has elegido.'; $PALANG['pCreate_alias_domain_error2'] = '¡La configuración seleccionada no es válida, por favor elige una diferente!'; $PALANG['pCreate_alias_domain_error3'] = 'Falló la inserción en la base de datos. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Ya están todos los dominios asignados.'; $PALANG['pCreate_alias_domain_success'] = '¡El alias de dominio se insertó en la tabla! (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = '¡El ALIAS no es válido!'; $PALANG['email_address_already_exists'] = '¡Esta dirección ya existe, elija otra diferente por favor!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/et.lang =================================================================== --- trunk/languages/et.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/et.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS pole kehtiv!'; $PALANG['email_address_already_exists'] = 'See e-posti aadress eksisteerib juba, palun vali erinev!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/eu.lang =================================================================== --- trunk/languages/eu.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/eu.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -89,8 +89,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'ALIASa okerra da!'; $PALANG['email_address_already_exists'] = 'Helbide hau existitzen da, ezberdin bat aukera ezazu mesedez!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Alias sortze mugara heldu zara!'; Modified: trunk/languages/fi.lang =================================================================== --- trunk/languages/fi.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/fi.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -91,8 +91,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Sinulla ei ole oikeutta luoda valittua konfiguraatiota.'; $PALANG['pCreate_alias_domain_error2'] = 'Valittu konfiguraatio on viallinen, ole hyvä ja valitse toinen!'; $PALANG['pCreate_alias_domain_error3'] = 'Syöttö tietokantaan epäonnistui. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Kaikilla domaineilla on jo alias.'; $PALANG['pCreate_alias_domain_success'] = 'Domainin alias on lisätty domain alias tauluun! (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Alias ei ole oikean muotoinen!'; $PALANG['email_address_already_exists'] = 'Tämä sähköpostiosoite on jo käytössä, ole hyvä ja valitse jokin toinen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/fo.lang =================================================================== --- trunk/languages/fo.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/fo.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'DULNEVNI er ógyldugt!'; $PALANG['email_address_already_exists'] = 'Hendan e-post adressa finst longu, vinarliga vel eina aðra!'; Modified: trunk/languages/fr.lang =================================================================== --- trunk/languages/fr.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/fr.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -92,8 +92,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Vous n\'etes pas autorisé a créer la configuration choisie.'; $PALANG['pCreate_alias_domain_error2'] = 'La configuration choisie est invalide, merci d\'en choisir une autre!'; $PALANG['pCreate_alias_domain_error3'] = 'Insertion dans la base de donnée échouée. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Tous les domaines sont déj\xE0 liés \xE0 un alias.'; $PALANG['pCreate_alias_domain_success'] = 'L\'alias de domaine est déj\xE0 pr\xE9sent dans la table de domaine! (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Cet ALIAS n\'est pas valide!'; $PALANG['email_address_already_exists'] = 'Ce compte courriel existe déjà, choisissez un autre libellé !'; # XXX check text - should be 'This email address already exists, please choose a different one\!' $PALANG['pCreate_alias_address_text_error3'] = 'Vous avez atteint votre limite d\'alias créés !'; Modified: trunk/languages/hr.lang =================================================================== --- trunk/languages/hr.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/hr.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -89,8 +89,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS nije valjan!'; $PALANG['email_address_already_exists'] = 'Ova adresa e-pote već postoji, molimo izaberite drugu!'; Modified: trunk/languages/hu.lang =================================================================== --- trunk/languages/hu.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/hu.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -92,8 +92,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Az ALIAS érvénytelen!'; $PALANG['email_address_already_exists'] = 'Ez az email cím már létezik, kérlek válassz másikat!'; Modified: trunk/languages/is.lang =================================================================== --- trunk/languages/is.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/is.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Aliasinn er ekki í lagi!'; $PALANG['email_address_already_exists'] = 'Þetta pósthólf er nú þegar til, veldu annað!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/it.lang =================================================================== --- trunk/languages/it.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/it.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -91,8 +91,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'L\' Alias non è valido!'; $PALANG['email_address_already_exists'] = 'Questo indirizzo di posta esiste già, per favore sceglierne uno diverso!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/ja.lang =================================================================== --- trunk/languages/ja.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/ja.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -92,8 +92,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = '全てのドメインがエイリアスされています。'; $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'メールアドレスが無効です。'; $PALANG['email_address_already_exists'] = 'このメールアドレスは既に存在するので、 別のアドレスを選択してください。'; # XXX check/beautify - was split in two lines before Modified: trunk/languages/lt.lang =================================================================== --- trunk/languages/lt.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/lt.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Jūs negalite sukurti pasirinktos konfigūracijos.'; $PALANG['pCreate_alias_domain_error2'] = 'Pasirinkta neteisinga konfigūracija, pasirinkite kitą!'; $PALANG['pCreate_alias_domain_error3'] = 'Duomenų bazės papildyti nepavyko. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Visos sritys jau turi sinonimus.'; $PALANG['pCreate_alias_domain_success'] = 'Srities sinonimas užregistruotas! (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Netinkamas sinonimas!'; $PALANG['email_address_already_exists'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!'; Modified: trunk/languages/mk.lang =================================================================== --- trunk/languages/mk.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/mk.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Алијасот не е валиден!'; $PALANG['email_address_already_exists'] = 'Оваа адреса веќе постои. Ве молам одберете друга!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/nb.lang =================================================================== --- trunk/languages/nb.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/nb.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -92,8 +92,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Du har ikke tillatelse til å opprette den valgte konfigurasjonen.'; $PALANG['pCreate_alias_domain_error2'] = 'Den valgte konfigurasjonen er ugyldig, vennligst endre den!'; $PALANG['pCreate_alias_domain_error3'] = 'Det mislyktes å lagre informasjonen i databasen. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Det er allerede opprettet alias for alle domenene.'; $PALANG['pCreate_alias_domain_success'] = 'Domenealiaset har blitt lagt inn i tabellen over aliasdomener! (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!'; $PALANG['email_address_already_exists'] = 'Denne e-postadressen eksisterer allerede, vennligst velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/nl.lang =================================================================== --- trunk/languages/nl.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/nl.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -91,8 +91,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'U heeft niet genoeg rechten om de huidige configuratie te maken.'; $PALANG['pCreate_alias_domain_error2'] = 'De huidige configuratie is ongeldig, slecteer een andere!'; $PALANG['pCreate_alias_domain_error3'] = 'Fout bij vullen database. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Alle domeinen hebben al een alias!'; $PALANG['pCreate_alias_domain_success'] = 'De domein alias is toegevoegd aan de alias domein tabel! (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'De Alias is niet geldig!'; $PALANG['email_address_already_exists'] = 'Dit e-mail aders bestaat al, kies aub een andere.'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/nn.lang =================================================================== --- trunk/languages/nn.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/nn.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldig!'; $PALANG['email_address_already_exists'] = 'Denne epostadressen eksisterer allerede, velg en annen!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/pl.lang =================================================================== --- trunk/languages/pl.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/pl.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -93,8 +93,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Nie masz uprawnień do tworzenia takiej konfiguracji.'; $PALANG['pCreate_alias_domain_error2'] = 'Wybrana konfiguracja jest nieprawidłowa, proszę wybrać inną!'; $PALANG['pCreate_alias_domain_error3'] = 'Dodanie do bazy nie powiodło się. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Wszystkie domeny są już aliasowane.'; $PALANG['pCreate_alias_domain_success'] = 'Alias domeny został dodany do tabeli aliasów domen! (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Alias jest niepoprawny!'; $PALANG['email_address_already_exists'] = 'Taki adres email juz istnieje, proszę wybrać inny!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/pt-br.lang =================================================================== --- trunk/languages/pt-br.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/pt-br.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -94,8 +94,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Você não possui permissão para criar a configuração desejada.'; $PALANG['pCreate_alias_domain_error2'] = 'Configuração inválida. Por favor, defina outra configuração!'; $PALANG['pCreate_alias_domain_error3'] = 'Não foi possível criar o alias de domínio. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Todos os domínios já estão espelhados.'; $PALANG['pCreate_alias_domain_success'] = 'Alias de domínio criado! (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Alias inválido!'; $PALANG['email_address_already_exists'] = 'Endereço de email fornecido já existe. Por favor, escolha outro endereço!'; Modified: trunk/languages/ru.lang =================================================================== --- trunk/languages/ru.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/ru.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -94,8 +94,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Вам не разрешено создавать выбранную конфигурацию.'; $PALANG['pCreate_alias_domain_error2'] = 'Выбранная конфигурация некорректна, пожалуйста, выберите другую!'; $PALANG['pCreate_alias_domain_error3'] = 'Не удалось добавить запись в базу данных. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Все домены уже задействованы в доменах-алиасах.'; $PALANG['pCreate_alias_domain_success'] = 'Домен-алиас добавлен в таблицу доменов-алиасов! (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Неверное имя алиаса!'; $PALANG['email_address_already_exists'] = 'Этот почтовый адрес уже существует, пожалуйста, выберите другой.'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/sk.lang =================================================================== --- trunk/languages/sk.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/sk.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -91,8 +91,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'Nie ste oprávnení vytvoriť zvolenú konfiguráciu.'; $PALANG['pCreate_alias_domain_error2'] = 'Zvolená konfigurácia nie je platná, zvoľte inú!'; $PALANG['pCreate_alias_domain_error3'] = 'Chyba pri vkladaní do databázy. (%s)'; # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'Všetky domény už majú aliasy.'; $PALANG['pCreate_alias_domain_success'] = 'Alias domény bol pridaný do tabuľky! (%s)'; # XXX Text changed to: The alias domain %s has been created. +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Adresa nie je platná!'; $PALANG['email_address_already_exists'] = 'Takáto emailová adresa už existuje!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/sl.lang =================================================================== --- trunk/languages/sl.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/sl.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Sintaksa aliasa je napačna!'; $PALANG['email_address_already_exists'] = 'Ta e-poštni naslov že obstaja, prosimo izberite drugega!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/sv.lang =================================================================== --- trunk/languages/sv.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/sv.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -92,8 +92,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'Detta ALIAS är inte giltigt!'; $PALANG['email_address_already_exists'] = 'Denna epostadress existerar redan, välj en annan epostadress!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/tr.lang =================================================================== --- trunk/languages/tr.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/tr.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = 'ALIAS uygun deðil!'; $PALANG['email_address_already_exists'] = 'Bu e-posta zaten kullanýlýyor, lütfen baþka bir tane seçin!'; # XXX check text - should be 'This email address already exists, please choose a different one\!' Modified: trunk/languages/tw.lang =================================================================== --- trunk/languages/tw.lang 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/languages/tw.lang 2013-10-19 18:45:41 UTC (rev 1541) @@ -90,8 +90,11 @@ $PALANG['pCreate_alias_domain_error1'] = 'You are not allowed to create the chosen configuration.'; # XXX $PALANG['pCreate_alias_domain_error2'] = 'The chosen configuration is invalid, please choose a different one!'; # XXX $PALANG['pCreate_alias_domain_error3'] = 'Database insert failed. (%s)'; # XXX # XXX Text changed to: Creating the alias domain %s failed! +$PALANG['alias_domain_change_failed'] = 'Changing the alias domain %s failed!'; # XXX $PALANG['pCreate_alias_domain_error4'] = 'All domains are already aliased.'; # XXX $PALANG['pCreate_alias_domain_success'] = 'The alias domain %s has been created.'; # XXX +$PALANG['alias_domain_changed'] = 'The alias domain %s has been changed.'; # XXX +$PALANG['alias_domain_to_itsself'] = 'A domain can\'t be an alias domain to itsself!'; # XXX $PALANG['pCreate_alias_address_text_error1'] = '該別名非法!'; $PALANG['email_address_already_exists'] = '郵件地址已經存在, 請重新選擇!'; Modified: trunk/model/AliasdomainHandler.php =================================================================== --- trunk/model/AliasdomainHandler.php 2013-10-13 22:07:15 UTC (rev 1540) +++ trunk/model/AliasdomainHandler.php 2013-10-19 18:45:41 UTC (rev 1541) @@ -10,10 +10,7 @@ protected $id_field = 'alias_domain'; protected $domain_field = 'alias_domain'; - # init $this->struct, $this->db_table and $this->id_field protected function initStruct() { - # TODO: add public function set_options_for_admin() to list only domains available to that admin - $this->struct=array( # field name allow display in... type $PALANG label $PALANG description default / options / ... # editing? form list @@ -67,12 +64,12 @@ $this->msg['error_does_not_exist'] = 'pCreate_alias_domain_error2'; # TODO: better error message if ($this->new) { $this->msg['logname'] = 'create_alias_domain'; - $this->msg['store_error'] = 'pCreate_alias_domain_error3'; # TODO: error message could be better + $this->msg['store_error'] = 'pCreate_alias_domain_error3'; $this->msg['successmessage'] = 'pCreate_alias_domain_success'; } else { $this->msg['logname'] = 'edit_alias_domain'; - $this->msg['store_error'] = 'pCreate_alias_domain_error3'; # TODO: error message could be better - $this->msg['successmessage'] = 'pCreate_alias_domain_success'; # TODO: better message for edit + $this->msg['store_error'] = 'alias_domain_change_failed'; + $this->msg['successmessage'] = 'alias_domain_changed'; } } @@ -125,7 +122,7 @@ */ protected function _field_target_domain($field, $val) { if ($val == $this->id) { - $this->errormsg[$field] = Config::lang('pCreate_alias_domain_error2'); # TODO: error message could be better... + $this->errormsg[$field] = Config::lang('alias_domain_to_itsself'); return false; } return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |