4646# find this format documented anywhere.
4747
4848
49- import locale
5049import os
5150import re
5251import sys
5352
5453
5554__all__ = ['NullTranslations' , 'GNUTranslations' , 'Catalog' ,
56- 'find ' , 'translation ' , 'install ' , 'textdomain' , 'bindtextdomain ' ,
57- 'bind_textdomain_codeset ' ,
58- 'dgettext ' , 'dngettext ' , 'gettext ' , 'lgettext' , 'ldgettext ' ,
59- 'ldngettext' , 'lngettext' , 'ngettext' ,
55+ 'bindtextdomain ' , 'find ' , 'translation ' , 'install ' ,
56+ 'textdomain' , 'dgettext' , 'dngettext' , 'gettext ' ,
57+ 'ngettext ' , 'pgettext ' , 'dpgettext ' , 'npgettext ' ,
58+ 'dnpgettext'
6059 ]
6160
6261_default_localedir = os .path .join (sys .base_prefix , 'share' , 'locale' )
8382 (?P<INVALID>\w+|.) # invalid token
8483 """ , re .VERBOSE | re .DOTALL )
8584
85+
8686def _tokenize (plural ):
8787 for mo in re .finditer (_token_pattern , plural ):
8888 kind = mo .lastgroup
@@ -94,12 +94,14 @@ def _tokenize(plural):
9494 yield value
9595 yield ''
9696
97+
9798def _error (value ):
9899 if value :
99100 return ValueError ('unexpected token in plural form: %s' % value )
100101 else :
101102 return ValueError ('unexpected end of plural form' )
102103
104+
103105_binary_ops = (
104106 ('||' ,),
105107 ('&&' ,),
@@ -111,6 +113,7 @@ def _error(value):
111113_binary_ops = {op : i for i , ops in enumerate (_binary_ops , 1 ) for op in ops }
112114_c2py_ops = {'||' : 'or' , '&&' : 'and' , '/' : '//' }
113115
116+
114117def _parse (tokens , priority = - 1 ):
115118 result = ''
116119 nexttok = next (tokens )
@@ -160,6 +163,7 @@ def _parse(tokens, priority=-1):
160163
161164 return result , nexttok
162165
166+
163167def _as_int (n ):
164168 try :
165169 i = round (n )
@@ -172,6 +176,7 @@ def _as_int(n):
172176 DeprecationWarning , 4 )
173177 return n
174178
179+
175180def c2py (plural ):
176181 """Gets a C expression as used in PO files for plural forms and returns a
177182 Python function that implements an equivalent expression.
@@ -209,6 +214,7 @@ def func(n):
209214
210215
211216def _expand_lang (loc ):
217+ import locale
212218 loc = locale .normalize (loc )
213219 COMPONENT_CODESET = 1 << 0
214220 COMPONENT_TERRITORY = 1 << 1
@@ -249,12 +255,10 @@ def _expand_lang(loc):
249255 return ret
250256
251257
252-
253258class NullTranslations :
254259 def __init__ (self , fp = None ):
255260 self ._info = {}
256261 self ._charset = None
257- self ._output_charset = None
258262 self ._fallback = None
259263 if fp is not None :
260264 self ._parse (fp )
@@ -273,13 +277,6 @@ def gettext(self, message):
273277 return self ._fallback .gettext (message )
274278 return message
275279
276- def lgettext (self , message ):
277- if self ._fallback :
278- return self ._fallback .lgettext (message )
279- if self ._output_charset :
280- return message .encode (self ._output_charset )
281- return message .encode (locale .getpreferredencoding ())
282-
283280 def ngettext (self , msgid1 , msgid2 , n ):
284281 if self ._fallback :
285282 return self ._fallback .ngettext (msgid1 , msgid2 , n )
@@ -288,48 +285,43 @@ def ngettext(self, msgid1, msgid2, n):
288285 else :
289286 return msgid2
290287
291- def lngettext (self , msgid1 , msgid2 , n ):
288+ def pgettext (self , context , message ):
292289 if self ._fallback :
293- return self ._fallback .lngettext (msgid1 , msgid2 , n )
290+ return self ._fallback .pgettext (context , message )
291+ return message
292+
293+ def npgettext (self , context , msgid1 , msgid2 , n ):
294+ if self ._fallback :
295+ return self ._fallback .npgettext (context , msgid1 , msgid2 , n )
294296 if n == 1 :
295- tmsg = msgid1
297+ return msgid1
296298 else :
297- tmsg = msgid2
298- if self ._output_charset :
299- return tmsg .encode (self ._output_charset )
300- return tmsg .encode (locale .getpreferredencoding ())
299+ return msgid2
301300
302301 def info (self ):
303302 return self ._info
304303
305304 def charset (self ):
306305 return self ._charset
307306
308- def output_charset (self ):
309- return self ._output_charset
310-
311- def set_output_charset (self , charset ):
312- self ._output_charset = charset
313-
314307 def install (self , names = None ):
315308 import builtins
316309 builtins .__dict__ ['_' ] = self .gettext
317- if hasattr (names , "__contains__" ):
318- if "gettext" in names :
319- builtins .__dict__ ['gettext' ] = builtins .__dict__ ['_' ]
320- if "ngettext" in names :
321- builtins .__dict__ ['ngettext' ] = self .ngettext
322- if "lgettext" in names :
323- builtins .__dict__ ['lgettext' ] = self .lgettext
324- if "lngettext" in names :
325- builtins .__dict__ ['lngettext' ] = self .lngettext
310+ if names is not None :
311+ allowed = {'gettext' , 'ngettext' , 'npgettext' , 'pgettext' }
312+ for name in allowed & set (names ):
313+ builtins .__dict__ [name ] = getattr (self , name )
326314
327315
328316class GNUTranslations (NullTranslations ):
329317 # Magic number of .mo files
330318 LE_MAGIC = 0x950412de
331319 BE_MAGIC = 0xde120495
332320
321+ # The encoding of a msgctxt and a msgid in a .mo file is
322+ # msgctxt + "\x04" + msgid (gettext version >= 0.15)
323+ CONTEXT = "%s\x04 %s"
324+
333325 # Acceptable .mo versions
334326 VERSIONS = (0 , 1 )
335327
@@ -385,6 +377,9 @@ def _parse(self, fp):
385377 item = b_item .decode ().strip ()
386378 if not item :
387379 continue
380+ # Skip over comment lines:
381+ if item .startswith ('#-#-#-#-#' ) and item .endswith ('#-#-#-#-#' ):
382+ continue
388383 k = v = None
389384 if ':' in item :
390385 k , v = item .split (':' , 1 )
@@ -423,46 +418,48 @@ def _parse(self, fp):
423418 masteridx += 8
424419 transidx += 8
425420
426- def lgettext (self , message ):
421+ def gettext (self , message ):
427422 missing = object ()
428423 tmsg = self ._catalog .get (message , missing )
429424 if tmsg is missing :
430- if self ._fallback :
431- return self . _fallback . lgettext ( message )
432- tmsg = message
433- if self ._output_charset :
434- return tmsg . encode ( self ._output_charset )
435- return tmsg . encode ( locale . getpreferredencoding ())
425+ tmsg = self ._catalog . get (( message , self . plural ( 1 )), missing )
426+ if tmsg is not missing :
427+ return tmsg
428+ if self ._fallback :
429+ return self ._fallback . gettext ( message )
430+ return message
436431
437- def lngettext (self , msgid1 , msgid2 , n ):
432+ def ngettext (self , msgid1 , msgid2 , n ):
438433 try :
439434 tmsg = self ._catalog [(msgid1 , self .plural (n ))]
440435 except KeyError :
441436 if self ._fallback :
442- return self ._fallback .lngettext (msgid1 , msgid2 , n )
437+ return self ._fallback .ngettext (msgid1 , msgid2 , n )
443438 if n == 1 :
444439 tmsg = msgid1
445440 else :
446441 tmsg = msgid2
447- if self ._output_charset :
448- return tmsg .encode (self ._output_charset )
449- return tmsg .encode (locale .getpreferredencoding ())
442+ return tmsg
450443
451- def gettext (self , message ):
444+ def pgettext (self , context , message ):
445+ ctxt_msg_id = self .CONTEXT % (context , message )
452446 missing = object ()
453- tmsg = self ._catalog .get (message , missing )
447+ tmsg = self ._catalog .get (ctxt_msg_id , missing )
454448 if tmsg is missing :
455- if self ._fallback :
456- return self ._fallback .gettext (message )
457- return message
458- return tmsg
449+ tmsg = self ._catalog .get ((ctxt_msg_id , self .plural (1 )), missing )
450+ if tmsg is not missing :
451+ return tmsg
452+ if self ._fallback :
453+ return self ._fallback .pgettext (context , message )
454+ return message
459455
460- def ngettext (self , msgid1 , msgid2 , n ):
456+ def npgettext (self , context , msgid1 , msgid2 , n ):
457+ ctxt_msg_id = self .CONTEXT % (context , msgid1 )
461458 try :
462- tmsg = self ._catalog [( msgid1 , self .plural (n ) )]
459+ tmsg = self ._catalog [ctxt_msg_id , self .plural (n )]
463460 except KeyError :
464461 if self ._fallback :
465- return self ._fallback .ngettext ( msgid1 , msgid2 , n )
462+ return self ._fallback .npgettext ( context , msgid1 , msgid2 , n )
466463 if n == 1 :
467464 tmsg = msgid1
468465 else :
@@ -507,12 +504,12 @@ def find(domain, localedir=None, languages=None, all=False):
507504 return result
508505
509506
510-
511507# a mapping between absolute .mo file path and Translation object
512508_translations = {}
513509
510+
514511def translation (domain , localedir = None , languages = None ,
515- class_ = None , fallback = False , codeset = None ):
512+ class_ = None , fallback = False ):
516513 if class_ is None :
517514 class_ = GNUTranslations
518515 mofiles = find (domain , localedir , languages , all = True )
@@ -538,25 +535,20 @@ def translation(domain, localedir=None, languages=None,
538535 # are not used.
539536 import copy
540537 t = copy .copy (t )
541- if codeset :
542- t .set_output_charset (codeset )
543538 if result is None :
544539 result = t
545540 else :
546541 result .add_fallback (t )
547542 return result
548543
549544
550- def install (domain , localedir = None , codeset = None , names = None ):
551- t = translation (domain , localedir , fallback = True , codeset = codeset )
545+ def install (domain , localedir = None , * , names = None ):
546+ t = translation (domain , localedir , fallback = True )
552547 t .install (names )
553548
554549
555-
556550# a mapping b/w domains and locale directories
557551_localedirs = {}
558- # a mapping b/w domains and codesets
559- _localecodesets = {}
560552# current global domain, `messages' used for compatibility w/ GNU gettext
561553_current_domain = 'messages'
562554
@@ -575,63 +567,59 @@ def bindtextdomain(domain, localedir=None):
575567 return _localedirs .get (domain , _default_localedir )
576568
577569
578- def bind_textdomain_codeset (domain , codeset = None ):
579- global _localecodesets
580- if codeset is not None :
581- _localecodesets [domain ] = codeset
582- return _localecodesets .get (domain )
583-
584-
585570def dgettext (domain , message ):
586571 try :
587- t = translation (domain , _localedirs .get (domain , None ),
588- codeset = _localecodesets .get (domain ))
572+ t = translation (domain , _localedirs .get (domain , None ))
589573 except OSError :
590574 return message
591575 return t .gettext (message )
592576
593- def ldgettext (domain , message ):
594- codeset = _localecodesets .get (domain )
595- try :
596- t = translation (domain , _localedirs .get (domain , None ), codeset = codeset )
597- except OSError :
598- return message .encode (codeset or locale .getpreferredencoding ())
599- return t .lgettext (message )
600577
601578def dngettext (domain , msgid1 , msgid2 , n ):
602579 try :
603- t = translation (domain , _localedirs .get (domain , None ),
604- codeset = _localecodesets .get (domain ))
580+ t = translation (domain , _localedirs .get (domain , None ))
605581 except OSError :
606582 if n == 1 :
607583 return msgid1
608584 else :
609585 return msgid2
610586 return t .ngettext (msgid1 , msgid2 , n )
611587
612- def ldngettext ( domain , msgid1 , msgid2 , n ):
613- codeset = _localecodesets . get (domain )
588+
589+ def dpgettext (domain , context , message ):
614590 try :
615- t = translation (domain , _localedirs .get (domain , None ), codeset = codeset )
591+ t = translation (domain , _localedirs .get (domain , None ))
592+ except OSError :
593+ return message
594+ return t .pgettext (context , message )
595+
596+
597+ def dnpgettext (domain , context , msgid1 , msgid2 , n ):
598+ try :
599+ t = translation (domain , _localedirs .get (domain , None ))
616600 except OSError :
617601 if n == 1 :
618- tmsg = msgid1
602+ return msgid1
619603 else :
620- tmsg = msgid2
621- return tmsg . encode ( codeset or locale . getpreferredencoding () )
622- return t . lngettext ( msgid1 , msgid2 , n )
604+ return msgid2
605+ return t . npgettext ( context , msgid1 , msgid2 , n )
606+
623607
624608def gettext (message ):
625609 return dgettext (_current_domain , message )
626610
627- def lgettext (message ):
628- return ldgettext (_current_domain , message )
629611
630612def ngettext (msgid1 , msgid2 , n ):
631613 return dngettext (_current_domain , msgid1 , msgid2 , n )
632614
633- def lngettext (msgid1 , msgid2 , n ):
634- return ldngettext (_current_domain , msgid1 , msgid2 , n )
615+
616+ def pgettext (context , message ):
617+ return dpgettext (_current_domain , context , message )
618+
619+
620+ def npgettext (context , msgid1 , msgid2 , n ):
621+ return dnpgettext (_current_domain , context , msgid1 , msgid2 , n )
622+
635623
636624# dcgettext() has been deemed unnecessary and is not implemented.
637625
0 commit comments