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

attempt to fix test; naming errors

Browse Source
This commit is contained in:
Andreas Preikschat 2013-02-27 13:41:04 +01:00
parent 51eb93fe75
commit 20e26e7ea1
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openlp/core/utils/actions.py
View File

@ -411,7 +411,7 @@ class ActionList(object):
for existing_action in existing_actions:
if action is existing_action:
continue
if not global_context or existing_action in affected_actions:
if existing_action in affected_actions:
return False
if existing_action.shortcutContext() in [QtCore.Qt.WindowShortcut, QtCore.Qt.ApplicationShortcut]:
return False

8
openlp/plugins/songs/lib/__init__.py
View File

@ -165,7 +165,7 @@ class VerseType(object):
translate('SongsPlugin.VerseType', 'Intro'),
translate('SongsPlugin.VerseType', 'Ending'),
translate('SongsPlugin.VerseType', 'Other')]
tanslated_tags = [name[0].lower() for name in translated_names]
translated_tags = [name[0].lower() for name in translated_names]
@staticmethod
def translated_tag(verse_tag, default=Other):
@ -181,9 +181,9 @@ class VerseType(object):
verse_tag = verse_tag[0].lower()
for num, tag in enumerate(VerseType.tags):
if verse_tag == tag:
return VerseType.tanslated_tags[num].upper()
if default in VerseType.tanslated_tags:
return VerseType.tanslated_tags[default].upper()
return VerseType.translated_tags[num].upper()
if default in VerseType.translated_tags:
return VerseType.translated_tags[default].upper()
@staticmethod
def translated_name(verse_tag, default=Other):