Branch 'pykolab-0.4' - pykolab/plugins

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Wed Jun 13 12:48:21 CEST 2012


 pykolab/plugins/recipientpolicy/__init__.py |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

New commits:
commit 58050404ca8c9fadc4cd30be00e848a490791895
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Tue Jun 12 13:08:50 2012 +0100

    Search for or fallback to the default_locale for the user's preferredlanguage attribute. (#839)

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:





More information about the commits mailing list