equal
deleted
inserted
replaced
419 if self._output_charset: |
419 if self._output_charset: |
420 return tmsg.encode(self._output_charset) |
420 return tmsg.encode(self._output_charset) |
421 elif self._charset: |
421 elif self._charset: |
422 return tmsg.encode(self._charset) |
422 return tmsg.encode(self._charset) |
423 return tmsg |
423 return tmsg |
424 |
424 |
425 def lgettext(self, message): |
425 def lgettext(self, message): |
426 missing = object() |
426 missing = object() |
427 tmsg = self._catalog.get(message, missing) |
427 tmsg = self._catalog.get(message, missing) |
428 if tmsg is missing: |
428 if tmsg is missing: |
429 if self._fallback: |
429 if self._fallback: |
519 def upgettext(self, context, message): |
519 def upgettext(self, context, message): |
520 ctxt_message_id = self.CONTEXT_ENCODING % (context, message) |
520 ctxt_message_id = self.CONTEXT_ENCODING % (context, message) |
521 missing = object() |
521 missing = object() |
522 tmsg = self._catalog.get(ctxt_message_id, missing) |
522 tmsg = self._catalog.get(ctxt_message_id, missing) |
523 if tmsg is missing: |
523 if tmsg is missing: |
|
524 # XXX logilab patch for compat w/ catalog generated by cw < 3.5 |
|
525 return self.ugettext(message) |
524 if self._fallback: |
526 if self._fallback: |
525 return self._fallback.upgettext(context, message) |
527 return self._fallback.upgettext(context, message) |
526 return unicode(message) |
528 return unicode(message) |
527 return tmsg |
529 return tmsg |
528 |
530 |