openlp-core team mailing list archive

[Samuel Findlay <samuel.findlay@xxxxxxxxx>]

Samuel Findlay has proposed merging lp:~sfindlay/openlp/work into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~sfindlay/openlp/work/+merge/113904

Song Import Wizard: 
* corrected default disabledLabelText
* added disabledLabelText for MediaShout
-- 
https://code.launchpad.net/~sfindlay/openlp/work/+merge/113904
Your team OpenLP Core is requested to review the proposed merge of lp:~sfindlay/openlp/work into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/importer.py'
--- openlp/plugins/songs/lib/importer.py	2012-07-08 19:37:05 +0000
+++ openlp/plugins/songs/lib/importer.py	2012-07-09 05:54:19 +0000
@@ -169,7 +169,8 @@
         u'selectMode': SongFormatSelect.MultipleFiles,
         u'filter': u'',
         u'comboBoxText': None,
-        u'disabledLabelText': u'',
+        u'disabledLabelText': translate('SongsPlugin.ImportWizardForm',
+            'This importer has been disabled.'),
         u'getFilesTitle': None,
         u'invalidSourceMsg': None,
         u'descriptionText': None
@@ -257,7 +258,11 @@
             u'canDisable': True,
             u'selectMode': SongFormatSelect.SingleFile,
             u'filter': u'%s (*.mdb)' % translate('SongsPlugin.ImportWizardForm',
-                'MediaShout Database')
+                'MediaShout Database'),
+            u'disabledLabelText': translate('SongsPlugin.ImportWizardForm',
+                'The MediaShout importer has been disabled because the pyodbc '
+                'module is not available. This importer is only available on '
+                'Windows.')	
         },
         OpenSong: {
             u'class': OpenSongImport,