openlp-core team mailing list archive

[Stevan Pettit <openlp@xxxxxxxxxxxxxxx>]

Stevan Pettit has proposed merging lp:~smpettit/openlp/bug-832345 into lp:openlp.

Requested reviews:
  Tim Bentley (trb143)
  Andreas Preikschat (googol)
Related bugs:
  Bug #832345 in OpenLP: "Make it more obvious what the importer should be used to import exported songs (openlyrics)"
  https://bugs.launchpad.net/openlp/+bug/832345

For more details, see:
https://code.launchpad.net/~smpettit/openlp/bug-832345/+merge/78341

Bug #832345

Modified the description of the OpenLyrics import item to include a reference to OpernLP 2.0 song export.

Added code to select .xml files when OpenLyrics is selected as song import type.

Added code to translate the new OpenLyrics import description.

Changed code to translate the literal, not a variable.
-- 
https://code.launchpad.net/~smpettit/openlp/bug-832345/+merge/78341
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py	2011-09-12 16:35:32 +0000
+++ openlp/plugins/songs/forms/songimportform.py	2011-10-06 02:10:30 +0000
@@ -240,8 +240,9 @@
         self.formatLabel.setText(WizardStrings.FormatLabel)
         self.formatComboBox.setItemText(SongFormat.OpenLP2, UiStrings().OLPV2)
         self.formatComboBox.setItemText(SongFormat.OpenLP1, UiStrings().OLPV1)
-        self.formatComboBox.setItemText(
-            SongFormat.OpenLyrics, WizardStrings.OL)
+        self.formatComboBox.setItemText(SongFormat.OpenLyrics,
+            translate('SongsPlugin.ImportWizardForm',
+            'OpenLyrics or OpenLP 2.0 Exported Song'))
         self.formatComboBox.setItemText(SongFormat.OpenSong, WizardStrings.OS)
         self.formatComboBox.setItemText(
             SongFormat.WordsOfWorship, WizardStrings.WoW)
@@ -508,7 +509,8 @@
         Get OpenLyrics song database files
         """
         self.getFiles(WizardStrings.OpenTypeFile % WizardStrings.OL,
-            self.openLyricsFileListWidget)
+            self.openLyricsFileListWidget, u'%s (*.xml)' %
+            translate('SongsPlugin.ImportWizardForm', 'OpenLyrics Files'))
 
     def onOpenLyricsRemoveButtonClicked(self):
         """