openlp-core team mailing list archive

[jerryb <gerald.britton@xxxxxxxxx>]

jerryb has proposed merging lp:~gerald-britton/openlp/openoffice into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~gerald-britton/openlp/openoffice/+merge/64256

This small patch adds accommodation for both OpenOffice and LibreOffice.  It also attempts to standardize the three error messages where these names appear so that they read the same.
-- 
https://code.launchpad.net/~gerald-britton/openlp/openoffice/+merge/64256
Your team OpenLP Core is requested to review the proposed merge of lp:~gerald-britton/openlp/openoffice into lp:openlp.

=== modified file 'openlp/plugins/songs/forms/songimportform.py'
--- openlp/plugins/songs/forms/songimportform.py	2011-06-01 05:43:41 +0000
+++ openlp/plugins/songs/forms/songimportform.py	2011-06-10 21:23:37 +0000
@@ -297,7 +297,7 @@
         self.songsOfFellowshipDisabledLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'The Songs of '
             'Fellowship importer has been disabled because OpenLP cannot '
-            'find OpenOffice.org on your computer.'))
+            'access OpenOffice or LibreOffice.'))
         self.genericAddButton.setText(
             translate('SongsPlugin.ImportWizardForm', 'Add Files...'))
         self.genericRemoveButton.setText(
@@ -305,7 +305,7 @@
         self.genericDisabledLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'The generic document/'
             'presentation importer has been disabled because OpenLP cannot '
-            'find OpenOffice.org on your computer.'))
+            'access OpenOffice or LibreOffice.'))
         self.easiSlidesFilenameLabel.setText(
             translate('SongsPlugin.ImportWizardForm', 'Filename:'))
         self.easiSlidesBrowseButton.setText(UiStrings().Browse)

=== modified file 'openlp/plugins/songs/lib/oooimport.py'
--- openlp/plugins/songs/lib/oooimport.py	2011-05-31 20:05:47 +0000
+++ openlp/plugins/songs/lib/oooimport.py	2011-06-10 21:23:37 +0000
@@ -68,7 +68,7 @@
             self.log_error(
                 self.import_source[0],
                 translate('SongsPlugin.SongImport',
-                    'Unable to open OpenOffice.org or LibreOffice'))
+                'Cannot access OpenOffice or LibreOffice'))
             log.error(exc)
             return
         self.import_wizard.progressBar.setMaximum(len(self.import_source))