raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

- Modified the def create_separated_list by suggestions of TRB143

Browse Source
This commit is contained in:
Olli Suutari 2016-10-17 22:42:07 +03:00
parent b3d537eec8
commit aef0941e18
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openlp/core/lib/__init__.py
View File

@ -318,15 +318,15 @@ def create_separated_list(string_list):
""" """
list_length = len(string_list) list_length = len(string_list)
if list_length == 1: if list_length == 1:
return_list = string_list[0] list_to_string = string_list[0]
elif list_length == 2: elif list_length == 2:
return_list = translate('OpenLP.core.lib', '{one} and {two}').format(one=string_list[0], two=string_list[1]) list_to_string = translate('OpenLP.core.lib', '{one} and {two}').format(one=string_list[0], two=string_list[1])
elif list_length > 2: elif list_length > 2:
return_list = translate('OpenLP.core.lib', '{first}, and {last}').format(first=', '.join(string_list[:-1]), list_to_string = translate('OpenLP.core.lib', '{first}, and {last}').format(first=', '.join(string_list[:-1]),
last=string_list[-1]) last=string_list[-1])
else: else:
return_list = "" list_to_string = ''
return return_list return list_to_string
from .exceptions import ValidationError from .exceptions import ValidationError