From 5c1c4c70bae2be6e50063434e8ec69ef89bd4983 Mon Sep 17 00:00:00 2001 From: "Jeroen van Meeuwen (Kolab Systems)" Date: Tue, 12 Jun 2012 13:08:50 +0100 Subject: Search for or fallback to the default_locale for the user's preferredlanguage attribute. (#839) --- pykolab/plugins/recipientpolicy/__init__.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'pykolab') diff --git a/pykolab/plugins/recipientpolicy/__init__.py b/pykolab/plugins/recipientpolicy/__init__.py index ab72980..1c97857 100644 --- a/pykolab/plugins/recipientpolicy/__init__.py +++ b/pykolab/plugins/recipientpolicy/__init__.py @@ -61,6 +61,15 @@ class KolabRecipientpolicy(object): elif not user_attrs['domain'] == kw['primary_domain']: user_attrs['domain'] = kw['primary_domain'] + if not user_attrs.has_key('preferredlanguage'): + default_locale = conf.get(user_attrs['domain'], 'default_locale') + if default_locale == None: + default_locale = conf.get(user_attrs['domain'], 'default_locale') + if default_locale == None: + default_locale = 'en_US' + + user_attrs['preferredlanguage'] = default_locale + try: mail = kw['primary_mail'] % user_attrs mail = utils.translate(mail, user_attrs['preferredlanguage']) @@ -91,6 +100,15 @@ class KolabRecipientpolicy(object): elif not user_attrs['domain'] == kw['primary_domain']: user_attrs['domain'] = kw['primary_domain'] + if not user_attrs.has_key('preferredlanguage'): + default_locale = conf.get(user_attrs['domain'], 'default_locale') + if default_locale == None: + default_locale = conf.get(user_attrs['domain'], 'default_locale') + if default_locale == None: + default_locale = 'en_US' + + user_attrs['preferredlanguage'] = default_locale + try: exec("alternative_mail_routines = %s" % kw['secondary_mail']) except Exception, e: -- cgit v1.1