SF.net SVN: postfixadmin:[1567] trunk
Brought to you by:
christian_boltz,
gingerdog
Menu
▾
▴
SF.net SVN: postfixadmin:[1567] trunk
|
From: <chr...@us...> - 2013-11-10 23:05:47
|
Revision: 1567
http://sourceforge.net/p/postfixadmin/code/1567
Author: christian_boltz
Date: 2013-11-10 23:05:43 +0000 (Sun, 10 Nov 2013)
Log Message:
-----------
DomainHandler.php
- delete(): check if the domain is an alias domain target - if yes, do
not allow to delete it
- better error message if domain_postdeletion() fails
*.lang:
- rename pAdminDelete_domain_error to domain_postdel_failed and change
the text
- add delete_domain_aliasdomain_target
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/DomainHandler.php
Modified: trunk/languages/bg.lang
===================================================================
--- trunk/languages/bg.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/bg.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -100,6 +100,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Не мога да добавя домейна! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Домейна бе добавен успешно! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Грешка при изтриването на домейна!';
+$PALANG['domain_postdel_failed'] = 'Грешка при изтриването на домейна!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Редактиране на домейн';
Modified: trunk/languages/ca.lang
===================================================================
--- trunk/languages/ca.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/ca.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -98,6 +98,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -222,7 +223,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Imposible afegir el domini! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'El domini ha estat afegit! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Editar un domini';
Modified: trunk/languages/cn.lang
===================================================================
--- trunk/languages/cn.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/cn.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = '该别名非法!';
$PALANG['email_address_already_exists'] = '邮件地址已经存在, 请重新选择!';
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '新增域失败! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = '新增域成功! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = '修改域';
Modified: trunk/languages/cs.lang
===================================================================
--- trunk/languages/cs.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/cs.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -104,6 +104,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -232,7 +233,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Doména byla přidána! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Nepodařilo se odstranit doménu!';
+$PALANG['domain_postdel_failed'] = 'Nepodařilo se odstranit doménu!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Upravit doménu';
Modified: trunk/languages/da.lang
===================================================================
--- trunk/languages/da.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/da.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -104,6 +104,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Aliaset er ikke gyldigt.';
$PALANG['email_address_already_exists'] = 'Emailadressen eksisterer allerede, vælg venligst en anden.';
@@ -232,7 +233,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Domænet er tilføjet! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Administratoren kunne ikke slettes.';
-$PALANG['pAdminDelete_domain_error'] = 'Domænet kunne ikke slettes!';
+$PALANG['domain_postdel_failed'] = 'Domænet kunne ikke slettes!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Domæne-aliaset kunne ikke slettes!';
$PALANG['pAdminEdit_domain_welcome'] = 'Redigér et domæne';
Modified: trunk/languages/de.lang
===================================================================
--- trunk/languages/de.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/de.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$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['delete_domain_aliasdomain_target'] = 'Die Domain %s ist das Ziel einer oder mehrerer Alias-Domains und kann nicht gelöscht werden! (Löschen Sie zuerst die Alias-Domains.)';
$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!';
@@ -229,7 +230,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Die Domain %s wurde angelegt.';
$PALANG['pAdminDelete_admin_error'] = 'Admin kann nicht gelöscht werden!';
-$PALANG['pAdminDelete_domain_error'] = 'Domain konnte nicht gelöscht werden!';
+$PALANG['domain_postdel_failed'] = 'Domain konnte nicht gelöscht werden!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Alias-Domain konnte nicht gelöscht werden!';
$PALANG['pAdminEdit_domain_welcome'] = 'Domain editieren';
Modified: trunk/languages/en.lang
===================================================================
--- trunk/languages/en.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/en.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -102,6 +102,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)';
$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!';
@@ -230,7 +231,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'The domain %s has been added.';
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!';
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!';
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!';
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!';
$PALANG['pAdminEdit_domain_welcome'] = 'Edit a domain';
Modified: trunk/languages/es.lang
===================================================================
--- trunk/languages/es.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/es.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '¡Imposible añadir el dominio! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = '¡El dominio ha sido añadido! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = '¡No se pudo eliminar el dominio!';
+$PALANG['domain_postdel_failed'] = '¡No se pudo eliminar el dominio!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = '¡No se pudo eliminar el alias de dominio!';
$PALANG['pAdminEdit_domain_welcome'] = 'Editar un dominio';
Modified: trunk/languages/et.lang
===================================================================
--- trunk/languages/et.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/et.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Domeeni lisamine ebaõnnestus! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domeen on lisatud! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Redigeeri domeeni';
Modified: trunk/languages/eu.lang
===================================================================
--- trunk/languages/eu.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/eu.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -98,6 +98,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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!';
@@ -221,7 +222,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Ezinezkoa domeinua gehitzea! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domeinua gehituta! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Domeinu bat aldatu';
Modified: trunk/languages/fi.lang
===================================================================
--- trunk/languages/fi.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/fi.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -100,6 +100,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Domainin lisäys ei onnistunut! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domain on lisätty! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Domainin voitu poistaa!';
+$PALANG['domain_postdel_failed'] = 'Domainin voitu poistaa!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Domainin aliasta ei voitu poistaa!';
$PALANG['pAdminEdit_domain_welcome'] = 'Muokkaa domainia';
Modified: trunk/languages/fo.lang
===================================================================
--- trunk/languages/fo.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/fo.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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!';
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Fái ikki stovnað navnaøki! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Navnaøki er stovnað! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Broyt navnaøki';
Modified: trunk/languages/fr.lang
===================================================================
--- trunk/languages/fr.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/fr.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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 !';
@@ -225,7 +226,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Le domaine a été ajouté! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Impossible de supprimer le domain!';
+$PALANG['domain_postdel_failed'] = 'Impossible de supprimer le domain!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Impossible de supprimé cet alias de domaine!';
$PALANG['pAdminEdit_domain_welcome'] = 'Modifier un domaine';
Modified: trunk/languages/hr.lang
===================================================================
--- trunk/languages/hr.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/hr.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -98,6 +98,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'ALIAS nije valjan!';
$PALANG['email_address_already_exists'] = 'Ova adresa e-pote već postoji, molimo izaberite drugu!';
@@ -222,7 +223,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Domenu nije bilo moguče dodati! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domena je bila uspjeno dodana! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Uredi domenu';
Modified: trunk/languages/hu.lang
===================================================================
--- trunk/languages/hu.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/hu.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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!';
@@ -229,7 +230,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'A domain-t felvettük az adatbázisba! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'A domain törlése nem sikerült!';
+$PALANG['domain_postdel_failed'] = 'A domain törlése nem sikerült!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Domain szerkesztése';
Modified: trunk/languages/is.lang
===================================================================
--- trunk/languages/is.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/is.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Get ekki bætt við léni! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Lén hefur verið bætt inn! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Breyta léni';
Modified: trunk/languages/it.lang
===================================================================
--- trunk/languages/it.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/it.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -100,6 +100,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Impossibile aggiungere il dominio! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Il dominio è stato aggiunto! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Impossibile cancellare il dominio!';
+$PALANG['domain_postdel_failed'] = 'Impossibile cancellare il dominio!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Modifica un domain';
Modified: trunk/languages/ja.lang
===================================================================
--- trunk/languages/ja.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/ja.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'メールアドレスが無効です。';
$PALANG['email_address_already_exists'] = 'このメールアドレスは既に存在するので、 別のアドレスを選択してください。'; # XXX check/beautify - was split in two lines before
@@ -229,7 +230,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'ドメインを追加しました。 (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'ドメインが削除できません！';
+$PALANG['domain_postdel_failed'] = 'ドメインが削除できません！'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'ドメインの修正';
Modified: trunk/languages/lt.lang
===================================================================
--- trunk/languages/lt.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/lt.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = 'Netinkamas sinonimas!';
$PALANG['email_address_already_exists'] = 'Šis el.pašto adresas jau yra, pasirinkite kitą pavadinimą!';
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Srities užregistruoti nepavyko! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Sritis užregistruota! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Nepavyko panaikinti administratoriaus!';
-$PALANG['pAdminDelete_domain_error'] = 'Nepavyko panaikinti srities!';
+$PALANG['domain_postdel_failed'] = 'Nepavyko panaikinti srities!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Nepavyko panaikinti srities sinonimo!';
$PALANG['pAdminEdit_domain_welcome'] = 'Keisti sritį';
Modified: trunk/languages/mk.lang
===================================================================
--- trunk/languages/mk.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/mk.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Не можам да го додадам доменот! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Доменот е додаден! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Измена на домен';
Modified: trunk/languages/nb.lang
===================================================================
--- trunk/languages/nb.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/nb.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Kunne ikke opprette domenet! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domenet er blitt opprettet! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Kunne ikke fjerne domenet!';
+$PALANG['domain_postdel_failed'] = 'Kunne ikke fjerne domenet!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Kunne ikke fjerne domenealias!';
$PALANG['pAdminEdit_domain_welcome'] = 'Endre et domene';
Modified: trunk/languages/nl.lang
===================================================================
--- trunk/languages/nl.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/nl.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -100,6 +100,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Mislukt om het domein toe te voegen. (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domein is toegevoegd! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Niet in staat beheerder te verwijderen!';
-$PALANG['pAdminDelete_domain_error'] = 'Niet in staat domein te verwijderen!';
+$PALANG['domain_postdel_failed'] = 'Niet in staat domein te verwijderen!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Niet in staat domein alias te verwijderen!';
$PALANG['pAdminEdit_domain_welcome'] = 'Bewerk een domein';
Modified: trunk/languages/nn.lang
===================================================================
--- trunk/languages/nn.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/nn.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Klarte ikke å legge til domenet! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domenet er lagt til! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Endre domenet';
Modified: trunk/languages/pl.lang
===================================================================
--- trunk/languages/pl.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/pl.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -102,6 +102,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -226,7 +227,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Nie można dodać domeny! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domena została dodana! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Nie można usunąć domeny!';
+$PALANG['domain_postdel_failed'] = 'Nie można usunąć domeny!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Nie można usunąć aliasu domeny!';
$PALANG['pAdminEdit_domain_welcome'] = 'Edytuj domenę';
Modified: trunk/languages/pt-br.lang
===================================================================
--- trunk/languages/pt-br.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/pt-br.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -103,6 +103,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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!';
@@ -231,7 +232,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Domínio criado! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Não foi possível remover o domínio!';
+$PALANG['domain_postdel_failed'] = 'Não foi possível remover o domínio!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Não foi possível remover o alias de domínio!';
$PALANG['pAdminEdit_domain_welcome'] = 'Edição de domínio.';
Modified: trunk/languages/ru.lang
===================================================================
--- trunk/languages/ru.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/ru.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -103,6 +103,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -231,7 +232,7 @@
$PALANG['pAdminCreate_domain_result_success'] = 'Домен был добавлен! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Невозможно удалить администратора!';
-$PALANG['pAdminDelete_domain_error'] = 'Невозможно удалить домен!';
+$PALANG['domain_postdel_failed'] = 'Невозможно удалить домен!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Невозможно удалить домен-алиас!';
$PALANG['pAdminEdit_domain_welcome'] = 'Редактирование домена';
Modified: trunk/languages/sk.lang
===================================================================
--- trunk/languages/sk.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/sk.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -100,6 +100,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -224,7 +225,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Nepodarilo sa pridať doménu! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Doména bola pridaná! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Nepodarilo sa odstrániť doménu!';
+$PALANG['domain_postdel_failed'] = 'Nepodarilo sa odstrániť doménu!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Nepodario sa odstrániť alias domény!';
$PALANG['pAdminEdit_domain_welcome'] = 'Upraviť doménu';
Modified: trunk/languages/sl.lang
===================================================================
--- trunk/languages/sl.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/sl.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Domene ni bilo mogoče dodati! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domena je bila uspešno dodana! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Uredi domeno';
Modified: trunk/languages/sv.lang
===================================================================
--- trunk/languages/sv.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/sv.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -101,6 +101,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -225,7 +226,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Kan inte skapa domänen! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domänen har skapats! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Kunde inte tabort domän!';
+$PALANG['domain_postdel_failed'] = 'Kunde inte tabort domän!'; # XXX Text changed to: The domain postdeletion script failed, check the error log for details!
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Ändra en domän';
Modified: trunk/languages/tr.lang
===================================================================
--- trunk/languages/tr.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/tr.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # 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\!'
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = 'Domain eklenemedi! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = 'Domain eklendi! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = 'Domain düzenle';
Modified: trunk/languages/tw.lang
===================================================================
--- trunk/languages/tw.lang 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/languages/tw.lang 2013-11-10 23:05:43 UTC (rev 1567)
@@ -99,6 +99,7 @@
$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['delete_domain_aliasdomain_target'] = 'The domain %s is the target for one or more alias domains and can\'t be deleted! (Delete the alias domains first.)'; # XXX
$PALANG['pCreate_alias_address_text_error1'] = '該別名非法!';
$PALANG['email_address_already_exists'] = '郵件地址已經存在, 請重新選擇!';
@@ -223,7 +224,7 @@
$PALANG['pAdminCreate_domain_result_error'] = '新增網域失敗! (%s)'; # XXX Text changed to: Adding the domain %s failed!
$PALANG['pAdminCreate_domain_result_success'] = '新增網域成功! (%s)'; # XXX Text changed to: The domain %s has been added.
$PALANG['pAdminDelete_admin_error'] = 'Unable to delete admin!'; # XXX
-$PALANG['pAdminDelete_domain_error'] = 'Unable to remove domain!'; # XXX
+$PALANG['domain_postdel_failed'] = 'The domain postdeletion script failed, check the error log for details!'; # XXX
$PALANG['pAdminDelete_alias_domain_error'] = 'Unable to remove domain alias!'; # XXX
$PALANG['pAdminEdit_domain_welcome'] = '修改網域';
Modified: trunk/model/DomainHandler.php
===================================================================
--- trunk/model/DomainHandler.php 2013-11-10 22:22:22 UTC (rev 1566)
+++ trunk/model/DomainHandler.php 2013-11-10 23:05:43 UTC (rev 1567)
@@ -140,8 +140,17 @@
return false;
}
- # TODO: check if this domain is an alias domain target - if yes, do not allow to delete it
+ if (Config::bool('alias_domain')) {
+ # check if this domain is an alias domain target - if yes, do not allow to delete it
+ $handler = new AliasdomainHandler(0, $this->admin_username);
+ $handler->getList("target_domain = '" . escape_string($this->id) . "'");
+ $aliasdomains = $handler->result();
+ if (count($aliasdomains) > 0) {
+ $this->errormsg[] = Config::Lang_f('delete_domain_aliasdomain_target', $this->id);
+ return false;
+ }
+ }
# the correct way would be to recursively delete mailboxes, aliases, alias_domains, fetchmail entries
# with *Handler before deleting the domain, but this would be terribly slow on domains with many aliases etc.,
@@ -166,7 +175,7 @@
db_delete($this->db_table, $this->id_field, $this->id);
if ( !domain_postdeletion($this->id) ) {
- $this->error_msg[] = $PALANG['pAdminDelete_domain_error']; # TODO: better error message
+ $this->error_msg[] = $PALANG['domain_postdel_failed'];
}
db_log ($this->id, 'delete_domain', $this->id); # TODO delete_domain is not a valid db_log keyword yet
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|