2 commits - pykolab/translate.py wallace/module_invitationpolicy.py

Thomas Brüderli bruederli at kolabsys.com
Tue Feb 24 17:03:57 CET 2015


 pykolab/translate.py               |    5 ++---
 wallace/module_invitationpolicy.py |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit d77f8f4d02a15128038694fd2a1528f2f281d649
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Feb 23 21:37:01 2015 -0500

    Minor improvement in notification message text (newlines)

diff --git a/wallace/module_invitationpolicy.py b/wallace/module_invitationpolicy.py
index 17d1168..6ac5389 100644
--- a/wallace/module_invitationpolicy.py
+++ b/wallace/module_invitationpolicy.py
@@ -1148,7 +1148,7 @@ def send_update_notification(object, receiving_user, old=None, reply=True):
         }
 
     if object.get_recurrence_id():
-        message_text += "\n" + _("NOTE: This update only refers to this single occurrence!")
+        message_text += _("NOTE: This update only refers to this single occurrence!") + "\n"
 
     message_text += "\n" + _("*** This is an automated message. Please do not reply. ***")
 


commit ff67debc5f404400a79e8f55f563a1ca5b57cafd
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Mon Feb 23 21:36:23 2015 -0500

    Do not hard-code locale dir. Let gettext use the default location (#4685)

diff --git a/pykolab/translate.py b/pykolab/translate.py
index 080cbc2..ce9e406 100644
--- a/pykolab/translate.py
+++ b/pykolab/translate.py
@@ -28,8 +28,7 @@ import os
 N_ = lambda x: x
 _ = lambda x: current.lgettext(x)
 
-localedir = '/usr/local/share/locale'
-current = gettext.translation(domain, localedir, fallback=True)
+current = gettext.translation(domain, fallback=True)
 
 def getDefaultLangs():
     languages = []
@@ -58,6 +57,6 @@ def setUserLanguage(lang):
             langs.append(l)
 
     try:
-        current = gettext.translation(domain, localedir, languages=langs, fallback=True)
+        current = gettext.translation(domain, languages=langs, fallback=True)
     except:
         pass




More information about the commits mailing list