Skip to content

Commit 07d125a

Browse files
committed
get_translations() cannot return None, remove uncessary checks. (closes #127, closes #126)
1 parent 1bbd65d commit 07d125a

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

flask_babel/__init__.py

-12
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
# -*- coding: utf-8 -*-
21
"""
32
flaskext.babel
43
~~~~~~~~~~~~~~
@@ -593,8 +592,6 @@ def gettext(self, string, **variables):
593592
gettext(u'Hello %(name)s!', name='World')
594593
"""
595594
t = self.get_translations()
596-
if t is None:
597-
return string if not variables else string % variables
598595
s = t.ugettext(string)
599596
return s if not variables else s % variables
600597

@@ -612,10 +609,6 @@ def ngettext(self, singular, plural, num, **variables):
612609
"""
613610
variables.setdefault('num', num)
614611
t = self.get_translations()
615-
if t is None:
616-
s = singular if num == 1 else plural
617-
return s if not variables else s % variables
618-
619612
s = t.ungettext(singular, plural, num)
620613
return s if not variables else s % variables
621614

@@ -625,8 +618,6 @@ def pgettext(self, context, string, **variables):
625618
.. versionadded:: 0.7
626619
"""
627620
t = self.get_translations()
628-
if t is None:
629-
return string if not variables else string % variables
630621
s = t.upgettext(context, string)
631622
return s if not variables else s % variables
632623

@@ -637,9 +628,6 @@ def npgettext(self, context, singular, plural, num, **variables):
637628
"""
638629
variables.setdefault('num', num)
639630
t = self.get_translations()
640-
if t is None:
641-
s = singular if num == 1 else plural
642-
return s if not variables else s % variables
643631
s = t.unpgettext(context, singular, plural, num)
644632
return s if not variables else s % variables
645633

0 commit comments

Comments
 (0)