diff -r fa22bd13b4d1 -r 2d5c4745efec VirtualMailManager/AliasDomain.py --- a/VirtualMailManager/AliasDomain.py Sun Aug 23 17:08:18 2009 +0000 +++ b/VirtualMailManager/AliasDomain.py Tue Aug 25 11:08:00 2009 +0000 @@ -29,18 +29,18 @@ if alias is not None: self.__gid, primary = alias if primary: - raise VADE(_(u"The domain »%s« is a primary domain.") % + raise VADE(_(u"The domain “%s” is a primary domain.") % self.__name, ERR.ALIASDOMAIN_ISDOMAIN) def save(self): if self.__gid > 0: - raise VADE(_(u'The alias domain »%s« already exists.') %self.__name, + raise VADE(_(u'The alias domain “%s” already exists.') %self.__name, ERR.ALIASDOMAIN_EXISTS) if self._domain is None: raise VADE(_(u'No destination domain for alias domain denoted.'), ERR.ALIASDOMAIN_NO_DOMDEST) if self._domain._id < 1: - raise VADE (_(u"The target domain »%s« doesn't exist yet.") % + raise VADE (_(u"The target domain “%s” doesn't exist yet.") % self._domain._name, ERR.NO_SUCH_DOMAIN) dbc = self._dbh.cursor() dbc.execute('INSERT INTO domain_name (domainname, gid, is_primary)\ @@ -59,10 +59,10 @@ return {'alias': self.__name, 'domain': domain[0]} else:# an almost unlikely case, isn't it? raise VADE( - _(u'There is no primary domain for the alias domain »%s«.')\ + _(u'There is no primary domain for the alias domain “%s”.')\ % self.__name, ERR.NO_SUCH_DOMAIN) else: - raise VADE(_(u"The alias domain »%s« doesn't exist yet.") % + raise VADE(_(u"The alias domain “%s” doesn't exist yet.") % self.__name, ERR.NO_SUCH_ALIASDOMAIN) def switch(self): @@ -70,14 +70,14 @@ raise VADE(_(u'No destination domain for alias domain denoted.'), ERR.ALIASDOMAIN_NO_DOMDEST) if self._domain._id < 1: - raise VADE (_(u"The target domain »%s« doesn't exist yet.") % + raise VADE (_(u"The target domain “%s” doesn't exist yet.") % self._domain._name, ERR.NO_SUCH_DOMAIN) if self.__gid < 1: - raise VADE(_(u"The alias domain »%s« doesn't exist yet.") % + raise VADE(_(u"The alias domain “%s” doesn't exist yet.") % self.__name, ERR.NO_SUCH_ALIASDOMAIN) if self.__gid == self._domain._id: - raise VADE(_(u"The alias domain »%(alias)s« is already assigned to\ - the domain »%(domain)s«.") % + raise VADE(_(u"The alias domain “%(alias)s” is already assigned to\ + the domain “%(domain)s”.") % {'alias': self.__name, 'domain': self._domain._name}, ERR.ALIASDOMAIN_EXISTS) dbc = self._dbh.cursor() @@ -96,6 +96,6 @@ self._dbh.commit() else: raise VADE( - _(u"The alias domain »%s« doesn't exist yet.") % self.__name, + _(u"The alias domain “%s” doesn't exist yet.") % self.__name, ERR.NO_SUCH_ALIASDOMAIN)