Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
1be64198
Commit
1be64198
authored
Jan 11, 2002
by
Martin v. Löwis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add fallback argument to translation(). Request fallbacks on install.
Fixes #500595.
parent
57f61fb8
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
4 deletions
+12
-4
Doc/lib/libgettext.tex
Doc/lib/libgettext.tex
+5
-2
Lib/gettext.py
Lib/gettext.py
+5
-2
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Doc/lib/libgettext.tex
View file @
1be64198
...
@@ -123,7 +123,8 @@ If no such file is found, then \code{None} is returned.
...
@@ -123,7 +123,8 @@ If no such file is found, then \code{None} is returned.
\end{funcdesc}
\end{funcdesc}
\begin{funcdesc}
{
translation
}{
domain
\optional
{
, localedir
\optional
{
,
\begin{funcdesc}
{
translation
}{
domain
\optional
{
, localedir
\optional
{
,
languages
\optional
{
, class
_}}}}
languages
\optional
{
,
class
_
,
\optional
{
fallback
}}}}}
Return a
\class
{
Translations
}
instance based on the
\var
{
domain
}
,
Return a
\class
{
Translations
}
instance based on the
\var
{
domain
}
,
\var
{
localedir
}
, and
\var
{
languages
}
, which are first passed to
\var
{
localedir
}
, and
\var
{
languages
}
, which are first passed to
\function
{
find()
}
to get the
\function
{
find()
}
to get the
...
@@ -132,7 +133,9 @@ identical \file{.mo} file names are cached. The actual class instantiated
...
@@ -132,7 +133,9 @@ identical \file{.mo} file names are cached. The actual class instantiated
is either
\var
{
class
_}
if provided, otherwise
is either
\var
{
class
_}
if provided, otherwise
\class
{
GNUTranslations
}
. The class's constructor must take a single
\class
{
GNUTranslations
}
. The class's constructor must take a single
file object argument. If no
\file
{
.mo
}
file is found, this
file object argument. If no
\file
{
.mo
}
file is found, this
function raises
\exception
{
IOError
}
.
function raises
\exception
{
IOError
}
if
\var
{
fallback
}
is false
(which is the default), and returns a
\class
{
NullTranslations
}
instance
if
\var
{
fallback
}
is true.
\end{funcdesc}
\end{funcdesc}
\begin{funcdesc}
{
install
}{
domain
\optional
{
, localedir
\optional
{
, unicode
}}}
\begin{funcdesc}
{
install
}{
domain
\optional
{
, localedir
\optional
{
, unicode
}}}
...
...
Lib/gettext.py
View file @
1be64198
...
@@ -230,11 +230,14 @@ def find(domain, localedir=None, languages=None):
...
@@ -230,11 +230,14 @@ def find(domain, localedir=None, languages=None):
# a mapping between absolute .mo file path and Translation object
# a mapping between absolute .mo file path and Translation object
_translations
=
{}
_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
:
if
class_
is
None
:
class_
=
GNUTranslations
class_
=
GNUTranslations
mofile
=
find
(
domain
,
localedir
,
languages
)
mofile
=
find
(
domain
,
localedir
,
languages
)
if
mofile
is
None
:
if
mofile
is
None
:
if
fallback
:
return
NullTranslations
()
raise
IOError
(
ENOENT
,
'No translation file found for domain'
,
domain
)
raise
IOError
(
ENOENT
,
'No translation file found for domain'
,
domain
)
key
=
os
.
path
.
abspath
(
mofile
)
key
=
os
.
path
.
abspath
(
mofile
)
# TBD: do we need to worry about the file pointer getting collected?
# 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):
...
@@ -248,7 +251,7 @@ def translation(domain, localedir=None, languages=None, class_=None):
def
install
(
domain
,
localedir
=
None
,
unicode
=
0
):
def
install
(
domain
,
localedir
=
None
,
unicode
=
0
):
translation
(
domain
,
localedir
).
install
(
unicode
)
translation
(
domain
,
localedir
,
fallback
=
1
).
install
(
unicode
)
...
...
Misc/NEWS
View file @
1be64198
...
@@ -26,6 +26,8 @@ Library
...
@@ -26,6 +26,8 @@ Library
arbitrary shell code can't be executed because a bogus URL was
arbitrary shell code can't be executed because a bogus URL was
passed in.
passed in.
- gettext.translation has an optional fallback argument.
Tools/Demos
Tools/Demos
Build
Build
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment