Rev 6039: Merge into trunk resolving conflict in release notes in file:///home/vila/src/bzr/bugs/824513-fadatasync-options/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/824513-fadatasync-options/

------------------------------------------------------------
revno: 6039 [merge]
revision-id: v.ladeuil+lp at free.fr-20110824080223-ie0lfsqocwklqhal
parent: v.ladeuil+lp at free.fr-20110823074931-sgd14gh8tv5lfjsy
parent: pqm at pqm.ubuntu.com-20110823191816-6btr7jhq3evgz020
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 824513-fadatasync-options
timestamp: Wed 2011-08-24 10:02:23 +0200
message:
  Merge into trunk resolving conflict in release notes
modified:
  bzrlib/i18n.py                 i18n.py-20110429130428-eblvodng604h3dzi-1
  bzrlib/tests/test_i18n.py      test_i18n.py-20110517012016-wjj0ai7qrasnj49p-1
  doc/en/release-notes/bzr-2.4.txt bzr2.4.txt-20110114053217-k7ym9jfz243fddjm-1
-------------- next part --------------
=== modified file 'bzrlib/i18n.py'
--- a/bzrlib/i18n.py	2011-06-30 11:14:06 +0000
+++ b/bzrlib/i18n.py	2011-08-23 15:05:57 +0000
@@ -74,10 +74,14 @@
     global _translations
     if lang is None:
         lang = _get_current_locale()
+    if lang is not None:
+        languages = lang.split(':')
+    else:
+        languages = None
     _translations = _gettext.translation(
             'bzr',
             localedir=_get_locale_dir(),
-            languages=lang.split(':'),
+            languages=languages,
             fallback=True)
 
 

=== modified file 'bzrlib/tests/test_i18n.py'
--- a/bzrlib/tests/test_i18n.py	2011-06-27 15:52:06 +0000
+++ b/bzrlib/tests/test_i18n.py	2011-08-23 15:05:57 +0000
@@ -19,8 +19,6 @@
 from bzrlib import i18n, tests
 
 
-
-
 class ZzzTranslations(object):
     """Special Zzz translation for debugging i18n stuff.
 
@@ -91,3 +89,18 @@
     def test_multiline(self):
         self.assertEqual(u"zz{{spam\nham}}\n\nzz{{eggs\n}}",
                          i18n.gettext_per_paragraph("spam\nham\n\neggs\n"))
+
+
+class TestInstall(tests.TestCase):
+
+    def test_custom_languages(self):
+        self.addCleanup(i18n.install)
+        i18n.install('nl:fy')
+
+    def test_no_env_variables(self):
+        self.addCleanup(i18n.install)
+        self.overrideEnv('LANGUAGE', None)
+        self.overrideEnv('LC_ALL', None)
+        self.overrideEnv('LC_MESSAGES', None)
+        self.overrideEnv('LANG', None)
+        i18n.install()

=== modified file 'doc/en/release-notes/bzr-2.4.txt'
--- a/doc/en/release-notes/bzr-2.4.txt	2011-08-23 07:49:31 +0000
+++ b/doc/en/release-notes/bzr-2.4.txt	2011-08-24 08:02:23 +0000
@@ -38,6 +38,8 @@
 * ``dirstate.fdatasync`` and ``repository.fdatasync`` can now properly be
   disabled. (Vincent Ladeuil, #824513)
 
+* Fix i18n use when no environment variables are set. (Jelmer Vernooij, #810701)
+
 Documentation
 *************