Merge lp:~jr/bzr/i18n-topic-help into lp:bzr

[Jonathan Riddell]

Add topic help to translations

[Jelmer Vernooij (jelmer)]

Should this also be guarded against initializing i18n twice?

review: Needs Fixing

=== modified file 'bzrlib/export_pot.py'
--- bzrlib/export_pot.py	2011-05-28 12:17:22 +0000
+++ bzrlib/export_pot.py	2011-09-01 09:07:26 +0000
@@ -28,6 +28,7 @@
     errors,
     help_topics,
     plugin,
+    help,
     )
 from bzrlib.trace import (
     mutter,
@@ -234,7 +235,11 @@
                     outf,
                     'dummy/help_topics/'+key+'/detail.txt',
                     1, doc)
-
+        elif callable(doc): # help topics from files
+            _poentry_per_paragraph(
+                    outf,
+                    'en/help_topics/'+key+'.txt',
+                    1, doc(key))
         summary = topic_registry.get_summary(key)
         if summary is not None:
             _poentry(outf, 'dummy/help_topics/'+key+'/summary.txt',
@@ -246,5 +251,4 @@
     _standard_options(outf)
     _command_helps(outf)
     _error_messages(outf)
-    # disable exporting help topics until we decide  how to translate it.
-    #_help_topics(outf)
+    _help_topics(outf)

=== modified file 'bzrlib/help_topics/__init__.py'
--- bzrlib/help_topics/__init__.py	2011-08-21 09:24:01 +0000
+++ bzrlib/help_topics/__init__.py	2011-09-01 09:07:26 +0000
@@ -40,6 +40,7 @@
     config,
     osutils,
     registry,
+    i18n,
     )
 
 
@@ -879,6 +880,8 @@
         result += _format_see_also(additional_see_also)
         if plain:
             result = help_as_plain_text(result)
+        i18n.install()
+        result = i18n.gettext_per_paragraph(result)
         return result
 
     def get_help_topic(self):