merge - set self.language attribute when translator passed into Client()

Author: rouilj

CHANGES.txt

@@ -41,7 +41,9 @@ Fixed:
   a multilink link "messages" that does not have a 'name' property
   causes a crash. (found/fix by cmeerw; commit and better handling of
   non-labeled multilink by John Rouillard)
-  
+- in cgi/client.py, set self.language attribute when translator passed
+  into Client(). (John Rouillard)
+
 Features:
 
 - add support for authorized changes. User can be prompted to enter

roundup/cgi/client.py

@@ -452,9 +452,12 @@ def __init__(self, instance, request, env, form=None, translator=None):
         self.env = env
         if translator is not None:
             self.setTranslator(translator)
-            # XXX we should set self.language to "translator"'s language,
-            # but how to get it ?
-            self.language = ""
+            # set self.language to "translator"'s language
+            try:
+                self.language = translator.info()["language"]
+            except (AttributeError, KeyError):
+                # info() missing or no language key
+                self.language = ""
         else:
             self.setTranslator(TranslationService.NullTranslationService())
             self.language = ""  # as is the default from determine_language