forked from openlp/openlp
Small string fixes
This commit is contained in:
parent
1cd9fff9bd
commit
d10507e250
@ -18,11 +18,11 @@
|
|||||||
# Software Foundation; version 2 of the License. #
|
# Software Foundation; version 2 of the License. #
|
||||||
# #
|
# #
|
||||||
# This program is distributed in the hope that it will be useful, but WITHOUT #
|
# This program is distributed in the hope that it will be useful, but WITHOUT #
|
||||||
# AN_y WARRANT_y; without even the implied warranty of MERCHANTABILIT_y or #
|
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or #
|
||||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
|
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for #
|
||||||
# more details. #
|
# more details. #
|
||||||
# #
|
# #
|
||||||
# _you should have received a copy of the GNU General Public License along #
|
# You should have received a copy of the GNU General Public License along #
|
||||||
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
|
||||||
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
|
||||||
###############################################################################
|
###############################################################################
|
||||||
@ -179,7 +179,7 @@ class ThemeForm(QtGui.QWizard, Ui_ThemeWizard, RegistryProperties):
|
|||||||
if self.page(self.currentId()) == self.background_page and \
|
if self.page(self.currentId()) == self.background_page and \
|
||||||
self.theme.background_type == background_image and is_not_image_file(self.theme.background_filename):
|
self.theme.background_type == background_image and is_not_image_file(self.theme.background_filename):
|
||||||
QtGui.QMessageBox.critical(self, translate('OpenLP.ThemeWizard', 'Background Image Empty'),
|
QtGui.QMessageBox.critical(self, translate('OpenLP.ThemeWizard', 'Background Image Empty'),
|
||||||
translate('OpenLP.ThemeWizard', '_you have not selected a '
|
translate('OpenLP.ThemeWizard', 'You have not selected a '
|
||||||
'background image. Please select one before continuing.'))
|
'background image. Please select one before continuing.'))
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
|
@ -63,7 +63,6 @@ class CCLIFileImport(SongImport):
|
|||||||
for filename in self.import_source:
|
for filename in self.import_source:
|
||||||
filename = str(filename)
|
filename = str(filename)
|
||||||
log.debug('Importing CCLI File: %s', filename)
|
log.debug('Importing CCLI File: %s', filename)
|
||||||
lines = []
|
|
||||||
if os.path.isfile(filename):
|
if os.path.isfile(filename):
|
||||||
detect_file = open(filename, 'r')
|
detect_file = open(filename, 'r')
|
||||||
detect_content = detect_file.read(2048)
|
detect_content = detect_file.read(2048)
|
||||||
@ -250,7 +249,7 @@ class CCLIFileImport(SongImport):
|
|||||||
# e.g. For use solely with the SongSelect Terms of Use.
|
# e.g. For use solely with the SongSelect Terms of Use.
|
||||||
All rights Reserved. www.ccli.com
|
All rights Reserved. www.ccli.com
|
||||||
CCLI Licence number of user
|
CCLI Licence number of user
|
||||||
# e.g. CCL-Liedlizenznummer: 14 / CCLI License No. 14
|
# e.g. CCLI-Liedlizenznummer: 14 / CCLI License No. 14
|
||||||
|
|
||||||
"""
|
"""
|
||||||
log.debug('TXT file text: %s', text_list)
|
log.debug('TXT file text: %s', text_list)
|
||||||
|
@ -74,10 +74,10 @@ class AuthorType(object):
|
|||||||
WordsAndMusic = 'words+music'
|
WordsAndMusic = 'words+music'
|
||||||
Translation = 'translation'
|
Translation = 'translation'
|
||||||
Types = {
|
Types = {
|
||||||
Words: translate('OpenLP.Ui', 'Words'),
|
Words: translate('SongsPlugin.AuthorType', 'Words'),
|
||||||
Music: translate('OpenLP.Ui', 'Music'),
|
Music: translate('SongsPlugin.AuthorType', 'Music'),
|
||||||
WordsAndMusic: translate('OpenLP.Ui', 'Words and Music'),
|
WordsAndMusic: translate('SongsPlugin.AuthorType', 'Words and Music'),
|
||||||
Translation: translate('OpenLP.Ui', 'Translation')
|
Translation: translate('SongsPlugin.AuthorType', 'Translation')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -664,7 +664,7 @@ class OpenLyrics(object):
|
|||||||
# OpenLyrics 0.8 uses <br/> for new lines. Append text from "lines" element to verse text.
|
# OpenLyrics 0.8 uses <br/> for new lines. Append text from "lines" element to verse text.
|
||||||
if version > '0.7':
|
if version > '0.7':
|
||||||
text = self._process_lines_mixed_content(element)
|
text = self._process_lines_mixed_content(element)
|
||||||
# OpenLyrics version <= 0.7 contais <line> elements to represent lines. First child element is tested.
|
# OpenLyrics version <= 0.7 contains <line> elements to represent lines. First child element is tested.
|
||||||
else:
|
else:
|
||||||
# Loop over the "line" elements removing comments and chords.
|
# Loop over the "line" elements removing comments and chords.
|
||||||
for line in element:
|
for line in element:
|
||||||
|
Loading…
Reference in New Issue
Block a user