From: Martin v. Löwis <martin@v.loewis.de>
Date: Fri, 11 Jan 2002 06:37:07 +0000 (+0000)
Subject: Add fallback argument to translation(). Set fallback to 1 for install().
X-Git-Tag: v2.2.1c1~243
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2380a9e13fbcc0b79bdf66869c7589c740236539;p=thirdparty%2FPython%2Fcpython.git

Add fallback argument to translation(). Set fallback to 1 for install().
Fixes #500595.
---

diff --git a/Lib/gettext.py b/Lib/gettext.py
index 638d4ae7a31c..6795ee6528f3 100644
--- a/Lib/gettext.py
+++ b/Lib/gettext.py
@@ -230,11 +230,14 @@ def find(domain, localedir=None, languages=None):
 # a mapping between absolute .mo file path and Translation object
 _translations = {}
 
-def translation(domain, localedir=None, languages=None, class_=None):
+def translation(domain, localedir=None, languages=None,
+                class_=None, fallback=0):
     if class_ is None:
         class_ = GNUTranslations
     mofile = find(domain, localedir, languages)
     if mofile is None:
+        if fallback:
+            return NullTranslations()
         raise IOError(ENOENT, 'No translation file found for domain', domain)
     key = os.path.abspath(mofile)
     # TBD: do we need to worry about the file pointer getting collected?
@@ -248,7 +251,7 @@ def translation(domain, localedir=None, languages=None, class_=None):
 
 
 def install(domain, localedir=None, unicode=0):
-    translation(domain, localedir).install(unicode)
+    translation(domain, localedir, fallback=1).install(unicode)