i18n: patch for displaying error page correctly

[Shun-ichi Goto <shunichi.goto@…>]

On i18n branch, this patch corrects passing NullTranslations instance instead of class object. This is caused on running tracd without auth then select 'login'.

trac/util/translation.py

@@ -67 +67 @@
     locale_dir = pkg_resources.resource_filename(__name__, '../locale')
     _current.translations = Translations.load(locale_dir, locale)
 
+_null_translation = NullTranslations()
+
 def get_translations():
-    return getattr(_current, 'translations', NullTranslations)
+    return getattr(_current, 'translations', _null_translation)
 
 def deactivate():
     del _current.translations

And also this is required to allow translation on error page.

trac/web/api.py

@@ -336 +336 @@
             if template.endswith('.html'):
                 if env:
                     from trac.web.chrome import Chrome
-                    data = Chrome(env).render_template(self, template, data,
-                                                       'text/html')
+                    from trac.util import translation
+                    translation.activate(self.locale)
+                    try:
+                        data = Chrome(env).render_template(self, template, data,
+                                                           'text/html')
+                    finally:
+                        translation.deactivate()
                 else:
                     content_type = 'text/plain'
                     data = '%s\n\n%s: %s' % (data.get('title'),

[Christian Boos]

cmlenz or asmodai, can one of you have a look?

[Jeroen Ruigrok van der Werven]

Yes, a real problem.

I applied the fix to translation.py, small change from _null_translation to _null_translations.

[Jeroen Ruigrok van der Werven]

Committed in r6439 and r6441.

Thanks.