← Back to branch summary

~bzr-pqm/bzr/bzr.dev

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/i18n.py

Committer: Canonical.com Patch Queue Manager
Date: 2011-08-23 19:18:16 UTC
mfrom: (6015.9.17 2.4)
mto: (6015.27.1 integration) (6093.1.1 trunk) (6104.1.1 2.5-get_cached_parent_map-388269) (6123.1.6 +trunk) (6169.2.2 overflow_pack_stat_683191_706957) (6133.1.1 trunk) (6165.1.1 trunk) (6191.1.1 trunk) (6201.1.1 dev_2.4_integration) (6205.1.1 2.4-into-2.5) (6232.1.1 dev_2.4_integration) (6234.1.1 trunk) (6256.1.1 dev_2.4_integration) (6344.1.1 dev_2.4_integration) (6437.2.1 2.5b5-dev) (6206.1.1 2.5-client-reconnect-819604)
mto: This revision was merged to the branch mainline in revision 6100.
Revision ID: pqm@pqm.ubuntu.com-20110823191816-6btr7jhq3evgz020

(vila) Fix i18n use when no environment variables are set. (Jelmer Vernooij,
#810701) (Jonathan Riddell)

files modified:
bzrlib/i18n.py

bzrlib/tests/test_i18n.py

doc/en/release-notes/bzr-2.4.txt

Show diffs side-by-side

added added

removed removed

74

74

global _translations

75

75

if lang is None:

76

76

lang = _get_current_locale()

77

if lang is not None:

78

languages = lang.split(':')

79

else:

80

languages = None

77

81

_translations = _gettext.translation(

78

82

'bzr',

79

83

localedir=_get_locale_dir(),

80

languages=lang.split(':'),

84

languages=languages,

81

85

fallback=True)

82

86

83

87

Older »