Merge lp:~jr/bzr/i18n-install-once into lp:bzr

[Jonathan Riddell]

Do not run i18n initialisation twice.

Check that i18n has been initialized rather than doing it twice.

[Jelmer Vernooij (jelmer)]

review: Approve

[Jonathan Riddell (jr)]

sent to pqm by email

=== modified file 'bzrlib/commands.py'
--- bzrlib/commands.py	2011-07-15 14:27:20 +0000
+++ bzrlib/commands.py	2011-08-31 11:10:18 +0000
@@ -465,7 +465,7 @@
             usage help (e.g. Purpose, Usage, Options) with a
             message explaining how to obtain full help.
         """
-        if self.l10n and not i18n.installed():
+        if self.l10n:
             i18n.install()  # Install i18n only for get_help_text for now.
         doc = self.help()
         if doc:
 
=== modified file 'bzrlib/i18n.py'
--- bzrlib/i18n.py	2011-08-25 10:33:14 +0000
+++ bzrlib/i18n.py	2011-08-31 11:10:18 +0000
@@ -72,6 +72,8 @@
 
 def install(lang=None):
     global _translations
+    if installed():
+        return
     if lang is None:
         lang = _get_current_locale()
     if lang is not None:
 
=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2011-08-27 19:08:54 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2011-08-31 11:10:18 +0000
@@ -111,6 +111,8 @@
 
 * Install translation .mo files. (Jonathan Riddell)
 
+* Do not run i18n initialisation twice. (Jonathan Riddell)
+
 Bug Fixes
 *********