VirtualMailManager/aliasdomain.py
branchv0.6.x
changeset 417 8209da83e256
parent 379 7518d927d443
child 568 14abdd04ddf5
--- a/VirtualMailManager/aliasdomain.py	Thu Feb 24 01:02:24 2011 +0000
+++ b/VirtualMailManager/aliasdomain.py	Thu Feb 24 20:47:35 2011 +0000
@@ -72,7 +72,7 @@
             raise ADErr(_(u'No destination domain set for the alias domain.'),
                         ALIASDOMAIN_NO_DOMDEST)
         if self._domain.gid < 1:
-            raise ADErr(_(u"The target domain '%s' doesn't exist.") %
+            raise ADErr(_(u"The target domain '%s' does not exist.") %
                         self._domain.name, NO_SUCH_DOMAIN)
         dbc = self._dbh.cursor()
         dbc.execute('INSERT INTO domain_name (domainname, gid, is_primary) '
@@ -85,7 +85,7 @@
         """Returns a dict (keys: "alias" and "domain") with the names of the
         AliasDomain and its primary domain."""
         if self._gid < 1:
-            raise ADErr(_(u"The alias domain '%s' doesn't exist.") %
+            raise ADErr(_(u"The alias domain '%s' does not exist.") %
                         self._name, NO_SUCH_ALIASDOMAIN)
         dbc = self._dbh.cursor()
         dbc.execute('SELECT domainname FROM domain_name WHERE gid = %s AND '
@@ -106,10 +106,10 @@
             raise ADErr(_(u'No destination domain set for the alias domain.'),
                         ALIASDOMAIN_NO_DOMDEST)
         if self._domain.gid < 1:
-            raise ADErr(_(u"The target domain '%s' doesn't exist.") %
+            raise ADErr(_(u"The target domain '%s' does not exist.") %
                         self._domain.name, NO_SUCH_DOMAIN)
         if self._gid < 1:
-            raise ADErr(_(u"The alias domain '%s' doesn't exist.") %
+            raise ADErr(_(u"The alias domain '%s' does not exist.") %
                         self._name, NO_SUCH_ALIASDOMAIN)
         if self._gid == self._domain.gid:
             raise ADErr(_(u"The alias domain '%(alias)s' is already assigned "
@@ -130,7 +130,7 @@
         Raises an AliasDomainError if the AliasDomain doesn't exist.
         """
         if self._gid < 1:
-            raise ADErr(_(u"The alias domain '%s' doesn't exist.") %
+            raise ADErr(_(u"The alias domain '%s' does not exist.") %
                         self._name, NO_SUCH_ALIASDOMAIN)
         dbc = self._dbh.cursor()
         dbc.execute('DELETE FROM domain_name WHERE domainname = %s AND NOT '