merged with trunk

This commit is contained in:
Armin Köhler 2011-02-19 22:43:10 +01:00
commit 21bf01e6d2
2 changed files with 25 additions and 2 deletions

20
README.txt Normal file
View File

@ -0,0 +1,20 @@
OpenLP 2.0
==========
You're probably reading this because you've just downloaded the source code for
OpenLP 2.0. If you are looking for the installer file, please go to the download
page on the web site::
http://openlp.org/en/download.html
If you're looking for how to contribute to OpenLP, then please look at the
contribution page on the web site::
http://openlp.org/en/documentation/introduction/contributing.html
If you've looked at that page, and are wanting to help develop, test or
translate OpenLP, have a look at the OpenLP wiki::
http://wiki.openlp.org/
Thanks for downloading OpenLP 2.0!

View File

@ -199,8 +199,11 @@ class CCLIFileImport(SongImport):
if len(author_list) < 2: if len(author_list) < 2:
author_list = song_author.split(u'|') author_list = song_author.split(u'|')
for author in author_list: for author in author_list:
seperated = author.split(u',') separated = author.split(u',')
self.add_author(seperated[1].strip() + u' ' + seperated[0].strip()) if len(separated) > 1:
self.add_author(u' '.join(reversed(separated)))
else:
self.add_author(author)
self.title = song_name self.title = song_name
self.copyright = song_copyright self.copyright = song_copyright
self.ccli_number = song_ccli self.ccli_number = song_ccli