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

Make user strings more specific and translatable.

Browse Source
This commit is contained in:
Mattias Põldaru 2012-03-06 21:56:49 +02:00
parent 0c391385d0
commit 14e9f76304
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openlp/plugins/songs/lib/openlyricsimport.py
View File

@ -77,7 +77,4 @@ class OpenLyricsImport(SongImport):
except OpenLyricsError as exception:
log.exception(u'OpenLyricsException of type %s: %s in file %s'
% (exception.type, exception.message, file_path))
if exception.type == 'XML':
self.logError(file_path, SongStrings.XMLSyntaxError)
else:
self.logError(file_path, exception.message)
self.logError(file_path, exception.display_message)

13
openlp/plugins/songs/lib/xml.py
View File

@ -676,11 +676,17 @@ class OpenLyrics(object):
try:
lyrics = song_xml.lyrics
except AttributeError:
raise OpenLyricsError('XML', 'Missing lyrics item')
raise OpenLyricsError('XML', 'Missing lyrics item',
unicode(translate('OpenLP.OpenLyricsImportError',
'XML tree is missing <lyrics> tag. '
'It is not valid OpenLyrics file.')))
try:
verses = lyrics.verse
except AttributeError:
raise OpenLyricsError('XML', 'Missing verse item')
raise OpenLyricsError('XML', 'Missing lyrics item',
unicode(translate('OpenLP.OpenLyricsImportError',
'XML tree is missing <verse> tag. '
'It is not valid OpenLyrics file.')))
# Loop over the "verse" elements.
for verse in verses:
text = u''
@ -804,9 +810,10 @@ class OpenLyricsError(Exception):
"""
By now raised only in case of missing lyrics or verse element in XML.
"""
def __init__(self, exception_type, message):
def __init__(self, exception_type, message, display_message):
self.type = exception_type
self.message = message
self.display_message = display_message
def __str__(self):
return "%s: %s" % (self.type, self.message)