Rev 6114: (jr) Do not run i18n initialisation twice. (Jonathan Riddell) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6114 [merge]
revision-id: pqm at pqm.ubuntu.com-20110831235921-ra2k5rt3x4f6xeli
parent: pqm at pqm.ubuntu.com-20110831193937-tl38nsd3y1pe8s3w
parent: jriddell at canonical.com-20110831110814-het57q039cvbcleo
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2011-08-31 23:59:21 +0000
message:
  (jr) Do not run i18n initialisation twice. (Jonathan Riddell)
modified:
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/i18n.py                 i18n.py-20110429130428-eblvodng604h3dzi-1
  doc/en/release-notes/bzr-2.5.txt bzr2.5.txt-20110708125756-587p0hpw7oke4h05-1
=== modified file 'bzrlib/commands.py'
--- a/bzrlib/commands.py	2011-07-15 14:27:20 +0000
+++ b/bzrlib/commands.py	2011-08-31 10:56:58 +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'
--- a/bzrlib/i18n.py	2011-08-25 10:33:14 +0000
+++ b/bzrlib/i18n.py	2011-08-31 10:56:58 +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'
--- a/doc/en/release-notes/bzr-2.5.txt	2011-08-27 19:08:54 +0000
+++ b/doc/en/release-notes/bzr-2.5.txt	2011-08-31 11:08:14 +0000
@@ -111,6 +111,8 @@
 
 * Install translation .mo files. (Jonathan Riddell)
 
+* Do not run i18n initialisation twice. (Jonathan Riddell)
+
 Bug Fixes
 *********