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

- The footer now follows proper english grammar rules.

Browse Source
This commit is contained in:
Olli Suutari 2016-10-02 20:03:59 +03:00
parent cff02e6b7a
commit c7a682ebfb
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -317,10 +317,14 @@ def create_separated_list(string_list):
:param string_list: List of unicode strings :param string_list: List of unicode strings
""" """
if LooseVersion(Qt.PYQT_VERSION_STR) >= LooseVersion('4.9') and LooseVersion(Qt.qVersion()) >= LooseVersion('4.8'): if LooseVersion(Qt.PYQT_VERSION_STR) >= LooseVersion('4.9') and LooseVersion(Qt.qVersion()) >= LooseVersion('4.8'):
# Separate items with multiple same type creators with ',' and the last with " and ". # Separate items with multiple same type creators with ',' and the last with ', and ' ' If we have two creators,
# ',' is not used by proper grammar, however in some languages ',' is not used at all before 'and'.
and_translated = translate('OpenLP.Ui', 'and') and_translated = translate('OpenLP.Ui', 'and')
if len(string_list) > 1: comma_and = translate ('OpenLP.ui', ', and')
if len(string_list) == 2:
string_list = ', '.join(string_list[:-1]) + ' ' + and_translated + ' ' + string_list[-1] string_list = ', '.join(string_list[:-1]) + ' ' + and_translated + ' ' + string_list[-1]
elif len(string_list) > 2:
string_list = ', '.join(string_list[:-1]) + comma_and + ' ' + string_list[-1]
else: else:
string_list = ''.join(string_list) string_list = ''.join(string_list)
return string_list return string_list