almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-06 13:01:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add 0 item case and remove "one" string in localize_list

Browse source
This commit is contained in:
Andrew Dickinson 2020-04-26 13:52:55 -04:00
parent 7ec5c72150
commit 55eb67f52b
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ihatemoney/utils.py
View file

@ -314,7 +314,6 @@ def localize_list(list, surround_with_em=True):
:return: A locally formatted list of objects :return: A locally formatted list of objects
""" """
list = list[:] list = list[:]
one = _("{single_object}")
two = _("{dual_object_0} and {dual_object_1}") two = _("{dual_object_0} and {dual_object_1}")
start = _("{start_object}, {next_object}") start = _("{start_object}, {next_object}")
middle = _("{previous_object}, {next_object}") middle = _("{previous_object}, {next_object}")
@ -322,8 +321,10 @@ def localize_list(list, surround_with_em=True):
item_wrapper = em_surround if surround_with_em else lambda x: x item_wrapper = em_surround if surround_with_em else lambda x: x
if len(list) == 0:
return ""
if len(list) == 1: if len(list) == 1:
return one.format(single_object=item_wrapper(list[0])) return str(item_wrapper(list[0]))
elif len(list) == 2: elif len(list) == 2:
return two.format( return two.format(
dual_object_0=item_wrapper(list[0]), dual_object_1=item_wrapper(list[1]) dual_object_0=item_wrapper(list[0]), dual_object_1=item_wrapper(list[1])