[Openlp-core] [Merge] lp:~suutari-olli/openlp/add-bible-license-field into lp:openlp
Azaziah has proposed merging lp:~suutari-olli/openlp/add-bible-license-field into lp:openlp. Requested reviews: OpenLP Core (openlp-core) Related bugs: Bug #1557579 in OpenLP: "Make the song-footer text "Written by" optional" https://bugs.launchpad.net/openlp/+bug/1557579 Bug #1623631 in OpenLP: "Add "Full License" field for Bibles" https://bugs.launchpad.net/openlp/+bug/1623631 For more details, see: https://code.launchpad.net/~suutari-olli/openlp/add-bible-license-field/+merge/306048 In this branch: - Added "Full License" field for Bibles (1623631) - Added a setting for controlling visibility of "Written by:" (1557579) - Added placeholder texts for Bible metadata fields - Re-organized uistrings to alphabetical order lp:~suutari-olli/openlp/add-bible-license-field (revision 2707) [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-01-Pull/1777/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1688/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1626/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1382/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/972/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1040/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-05b-Test_Coverage/908/ [[1;32mSUCCESS[1;m] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/71/ -- Your team OpenLP Core is requested to review the proposed merge of lp:~suutari-olli/openlp/add-bible-license-field into lp:openlp. === modified file 'openlp/core/common/uistrings.py' --- openlp/core/common/uistrings.py 2016-08-10 18:31:33 + +++ openlp/core/common/uistrings.py 2016-09-18 20:29:10 + @@ -59,6 +59,13 @@ self.Automatic = translate('OpenLP.Ui', 'Automatic') self.BackgroundColor = translate('OpenLP.Ui', 'Background Color') self.BackgroundColorColon = translate('OpenLP.Ui', 'Background color:') +self.BibleShortSearchTitle = translate('OpenLP.Ui', 'Search is Empty or too Short') +self.BibleShortSearch = translate('OpenLP.Ui', 'The search you have entered is empty or shorter ' + 'than 3 characters long.Please try again with ' + 'a longer search.') +self.BibleNoBiblesTitle = translate('OpenLP.Ui', 'No Bibles Available') +self.BibleNoBibles = translate('OpenLP.Ui', 'There are no Bibles currently installed.' +'Please use the Import Wizard to install one or more Bibles.') self.Bottom = translate('OpenLP.Ui', 'Bottom') self.Browse = translate('OpenLP.Ui', 'Browse...') self.Cancel = translate('OpenLP.Ui', 'Cancel') @@ -117,6 +124,8 @@ self.OLPV2x = "{name} {version}".format(name=self.OLP, version="2.4") self.OpenLPStart = translate('OpenLP.Ui', 'OpenLP is already running. Do you wish to continue?') self.OpenService = translate('OpenLP.Ui', 'Open service.') +self.OptionalShowInFooter = translate('OpenLP.Ui', 'Optional, this will be displayed in footer.') +self.OptionalHideInFooter = translate('OpenLP.Ui', 'Optional, this won\'t be displayed in footer.') self.PlaySlidesInLoop = translate('OpenLP.Ui', 'Play Slides in Loop') self.PlaySlidesToEnd = translate('OpenLP.Ui', 'Play Slides to End') self.Preview = translate('OpenLP.Ui', 'Preview') @@ -130,6 +139,7 @@ 'player is disabled.') self.ResetBG = translate('OpenLP.Ui', 'Reset Background') self.ResetLiveBG = translate('OpenLP.Ui', 'Reset live background.') +self.RequiredShowInFooter = translate('OpenLP.Ui', 'Required, this will be displayed in footer.') self.Seconds = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds') self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview') self.Search = translate('OpenLP.Ui', 'Search') @@ -157,13 +167,6 @@ self.View = translate('OpenLP.Ui', 'View') self.ViewMode = translate('OpenLP.Ui', 'View Mode') self.Video = translate('OpenLP.Ui', 'Video') -self.BibleShortSearchTitle = translate('OpenLP.Ui', 'Search is Empty or too Short') -self.BibleShortSearch = translate('OpenLP.Ui', 'The search you have entered is empty or shorter ' - 'than 3 characters long.Please try again with ' - 'a longer search.') -self.BibleNoBiblesTitle = translate('OpenLP.Ui', 'No Bibles Available') -self.BibleNoBibles = translate('OpenLP.Ui', 'There are no Bibles currently installed.' -'Please use the Import Wizard to install one or more Bibles.') book_chapter =
[Openlp-core] [Bug 1618489] Re: Improper characters in Mediashout import cause traceback
** Branch linked: lp:~tomasgroth/openlp/25bugfixes5 -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1618489 Title: Improper characters in Mediashout import cause traceback Status in OpenLP: New Bug description: If Mediashout import has improper characters, the importer causes a traceback: --- Exception Traceback --- Traceback (most recent call last): File "openlp\core\ui\wizard.py", line 216, in on_current_id_changed File "openlp\plugins\songs\forms\songimportform.py", line 351, in perform_wizard File "openlp\plugins\songs\lib\importers\mediashout.py", line 77, in do_import File "openlp\plugins\songs\lib\importers\mediashout.py", line 100, in process_song File "openlp\plugins\songs\lib\importers\songimport.py", line 353, in finish File "openlp\plugins\songs\lib\openlyricsxml.py", line 102, in add_verse_to_lyrics File "lxml.etree.pyx", line 2972, in lxml.etree.CDATA.__cinit__ (src\lxml\lxml.etree.c:69195) File "apihelpers.pxi", line 1393, in lxml.etree._utf8 (src\lxml\lxml.etree.c:27125) ValueError: All strings must be XML compatible: Unicode or ASCII, no NULL bytes or control characters Such a file can be found in the db provided in here: https://support.openlp.org/scp/tickets.php?id=3690 Such characters can be found in the database on: Verses > record > 2856. Here’s a screen capture of the characters, I’m unable to copy them. https://drive.google.com/file/d/0B9y8rZiYItltcHBpUUt0OWR4aGc/view?usp=sharing Copy-paste sample: “That covers me and Raised this dead man's life It's all because of Jesus I'm alive” Win 10 | 2.4.2 To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1618489/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1624850] [NEW] CSV Bible importer has problems with special characters
Public bug reported: I imported a Finnish csv bible into OpenLP, all the Finnish special letters, "ä, ö" got replaced by ה and צ Win 10 / Trunk 2696 ** Affects: openlp Importance: Undecided Status: New -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1624850 Title: CSV Bible importer has problems with special characters Status in OpenLP: New Bug description: I imported a Finnish csv bible into OpenLP, all the Finnish special letters, "ä, ö" got replaced by ה and צ Win 10 / Trunk 2696 To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1624850/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1624847] Re: Invalid CSV import results in traceback
** Attachment added: "92_csv.rar" https://bugs.launchpad.net/openlp/+bug/1624847/+attachment/4743025/+files/92_csv.rar -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1624847 Title: Invalid CSV import results in traceback Status in OpenLP: New Bug description: I started importing a .csv Bible, importer asked "What book is: ". Win 10 / Trunk 2696 Traceback (most recent call last): File "D:\bzr\openlp\add-bible-license-field\openlp\core\ui\lib\wizard.py", line 219, in on_current_id_changed self.perform_wizard() File "D:\bzr\openlp\add-bible-license-field\openlp\plugins\bibles\forms\bibleimportform.py", line 830, in perform_wizard if importer.do_import(license_version) and not importer.stop_import_flag: File "D:\bzr\openlp\add-bible-license-field\openlp\plugins\bibles\lib\importers\csvbible.py", line 165, in do_import book_list = self.process_books(books) File "D:\bzr\openlp\add-bible-license-field\openlp\plugins\bibles\lib\importers\csvbible.py", line 125, in process_books book_list.update({int(book.id): book.name}) ValueError: invalid literal for int() with base 10: '' To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1624847/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1624847] [NEW] Invalid CSV import results in traceback
Public bug reported: I started importing a .csv Bible, importer asked "What book is: ". Win 10 / Trunk 2696 Traceback (most recent call last): File "D:\bzr\openlp\add-bible-license-field\openlp\core\ui\lib\wizard.py", line 219, in on_current_id_changed self.perform_wizard() File "D:\bzr\openlp\add-bible-license-field\openlp\plugins\bibles\forms\bibleimportform.py", line 830, in perform_wizard if importer.do_import(license_version) and not importer.stop_import_flag: File "D:\bzr\openlp\add-bible-license-field\openlp\plugins\bibles\lib\importers\csvbible.py", line 165, in do_import book_list = self.process_books(books) File "D:\bzr\openlp\add-bible-license-field\openlp\plugins\bibles\lib\importers\csvbible.py", line 125, in process_books book_list.update({int(book.id): book.name}) ValueError: invalid literal for int() with base 10: '' ** Affects: openlp Importance: Undecided Status: New -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1624847 Title: Invalid CSV import results in traceback Status in OpenLP: New Bug description: I started importing a .csv Bible, importer asked "What book is: ". Win 10 / Trunk 2696 Traceback (most recent call last): File "D:\bzr\openlp\add-bible-license-field\openlp\core\ui\lib\wizard.py", line 219, in on_current_id_changed self.perform_wizard() File "D:\bzr\openlp\add-bible-license-field\openlp\plugins\bibles\forms\bibleimportform.py", line 830, in perform_wizard if importer.do_import(license_version) and not importer.stop_import_flag: File "D:\bzr\openlp\add-bible-license-field\openlp\plugins\bibles\lib\importers\csvbible.py", line 165, in do_import book_list = self.process_books(books) File "D:\bzr\openlp\add-bible-license-field\openlp\plugins\bibles\lib\importers\csvbible.py", line 125, in process_books book_list.update({int(book.id): book.name}) ValueError: invalid literal for int() with base 10: '' To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1624847/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
[Openlp-core] [Bug 1616230] Re: W8.1 OpenLP 2.4.2 Suddenly closes with no error messages
The usual reason for these sort of crashes is that the computer runs out of memory and when OpenLP needs more memory than is available, it crashes. Normally it happens when presenting images or presentation (powerpoint or pdf). How much RAM do you have on your PC? -- You received this bug notification because you are a member of OpenLP Core, which is subscribed to OpenLP. https://bugs.launchpad.net/bugs/1616230 Title: W8.1 OpenLP 2.4.2 Suddenly closes with no error messages Status in OpenLP: New Bug description: During its use OpenLP suddenly closes itself with no error message, no crashes windows errors. 1) Operating System: OS Windows 8.1 64 PT-BR Single Language 2) Version of OpenLP: OpenLP 2.4.2 3) The exact steps to take in order to reproduce the error: Nothing special. Just launch OpenLP and at any unexpected time it quits. Not always, just sometimes. Can be during edition of songs, or during a presentation. 4) A debug log and possible a traceback: see attachment 5) Version of MS Office or OpenOffice: MS Offices 2007 32 bits PT-BR 6) What Bible translation and type you are importing: - To manage notifications about this bug go to: https://bugs.launchpad.net/openlp/+bug/1616230/+subscriptions ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
Re: [Openlp-core] [Merge] lp:~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick into lp:openlp
Review: Approve Looks good! Thanks for the extra effort! -- https://code.launchpad.net/~suutari-olli/openlp/fix-advanced-bible-search-clear-button-giving-focus-to-quick/+merge/306037 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp