← Back to branch summary

~suutari-olli/openlp/click-slide-to-go-live-from-blank

« back to all changes in this revision

Viewing changes to openlp/plugins/songs/lib/__init__.py

  • Committer: Simon Hanna
  • Date: 2016-05-17 08:48:19 UTC
  • mfrom: (2625.1.36 openlp)
  • mto: (2625.1.37 openlp)
  • mto: This revision was merged to the branch mainline in revision 2649.
  • Revision ID: simon.hanna@serve-me.info-20160517084819-lgup78nzyzjympuu
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
openlp/plugins/songs/lib/__init__.py
29
29
 
30
30
from PyQt5 import QtWidgets
31
31
 
32
 
from openlp.core.common import AppLocation
 
32
from openlp.core.common import AppLocation, CONTROL_CHARS
33
33
from openlp.core.lib import translate
34
 
from openlp.core.utils import CONTROL_CHARS
35
34
from openlp.plugins.songs.lib.db import MediaFile, Song
36
35
from .db import Author
37
36
from .ui import SongStrings
256
255
        for num, translation in enumerate(VerseType.translated_names):
257
256
            if verse_name == translation.lower():
258
257
                return num
 
258
        return None
259
259
 
260
260
    @staticmethod
261
261
    def from_loose_input(verse_name, default=Other):
271
271
            if verse_index is None:
272
272
                verse_index = VerseType.from_string(verse_name, default)
273
273
        elif len(verse_name) == 1:
274
 
            verse_index = VerseType.from_translated_tag(verse_name, default)
 
274
            verse_index = VerseType.from_translated_tag(verse_name, None)
275
275
            if verse_index is None:
276
276
                verse_index = VerseType.from_tag(verse_name, default)
277
277
        else: