[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-05-01 Thread noreply
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/103167 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/103167

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-05-01 Thread Andreas Preikschat
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/103167 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-05-01 Thread Andreas Preikschat
Review: Approve -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/103167 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Un

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-24 Thread Armin Köhler
> Whether they are related or not is completely beside the point. The point is > that if any of the if-statements evaluate to false, your variable will not > exist, and will cause a traceback. It's about writing code that doesn't > contain potential bugs. Thanks für explaining. I thought about that

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-23 Thread Raoul Snyman
Review: Approve Whether they are related or not is completely beside the point. The point is that if any of the if-statements evaluate to false, your variable will not exist, and will cause a traceback. It's about writing code that doesn't contain potential bugs. -- https://code.launchpad.net/

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-23 Thread Armin Köhler
Armin Köhler has proposed merging lp:~orangeshirt/openlp/bibles_fixes into lp:openlp. Requested reviews: Raoul Snyman (raoul-snyman) Related bugs: Bug #825205 in OpenLP: "Keep/restore selected book, chapters and verses when changing the bible translation" https://bugs.launchpad.net/openlp/

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-23 Thread Armin Köhler
> You don't declare "initialise_chapter_verse" in a scope where it may be used. > If the if-statement on line 26 is false, then "initialise_chapter_verse" is > undefined. If the if-statements on lines 29 and 35 are false, then > "initialise_chapter_verse" is undefined as well. Sorry but line 26 has

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-23 Thread Raoul Snyman
Review: Needs Fixing You don't declare "initialise_chapter_verse" in a scope where it may be used. If the if-statement on line 26 is false, then "initialise_chapter_verse" is undefined. If the if-statements on lines 29 and 35 are false, then "initialise_chapter_verse" is undefined as well. Lin

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-22 Thread Armin Köhler
Armin Köhler has proposed merging lp:~orangeshirt/openlp/bibles_fixes into lp:openlp. Requested reviews: OpenLP Core (openlp-core) Related bugs: Bug #825205 in OpenLP: "Keep/restore selected book, chapters and verses when changing the bible translation" https://bugs.launchpad.net/openlp/+b

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-21 Thread noreply
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/102585 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/102585

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-21 Thread Raoul Snyman
Review: Approve -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/102585 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Un

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-21 Thread Raoul Snyman
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/102585 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-20 Thread Tim Bentley
Review: Approve With a slight reservation as to the code to work out which testaments are present. -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/102585 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list:

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-04-18 Thread Armin Köhler
Armin Köhler has proposed merging lp:~orangeshirt/openlp/bibles_fixes into lp:openlp. Requested reviews: OpenLP Core (openlp-core) Related bugs: Bug #941683 in OpenLP: "OSIS Bible Book Names are not always in English" https://bugs.launchpad.net/openlp/+bug/941683 For more details, see: htt

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-31 Thread noreply
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/99599 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/99599 Y

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-31 Thread Andreas Preikschat
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/99599 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/9

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-31 Thread Andreas Preikschat
Review: Approve -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/99599 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Uns

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-31 Thread Tim Bentley
Review: Approve -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/99599 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Uns

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-27 Thread Armin Köhler
Armin Köhler has proposed merging lp:~orangeshirt/openlp/bibles_fixes into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/99599 fix bug in autocompleter from bible quicksearch. The option Applic

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-04 Thread noreply
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/95648 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/95648 Y

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-04 Thread Raoul Snyman
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/95648 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/9

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-04 Thread Raoul Snyman
Review: Approve -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/95648 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Uns

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-04 Thread Jonathan Corwin
Review: Approve Took me a few minutes to realise you'd changed it to share the same loop! Looks OK to me -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/95648 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing l

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-02 Thread Armin Köhler
Armin Köhler has proposed merging lp:~orangeshirt/openlp/bibles_fixes into lp:openlp. Requested reviews: Jonathan Corwin (j-corwin) For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/95648 add additional language auto detection for osis bible files -- h

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-01 Thread Jonathan Corwin
The title of the branch made me assume this was a fix rather than a new feature. We're still accepting fixes. -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/95157 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Maili

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-01 Thread Armin Köhler
> But the "else" code (lines 35-39) are only getting triggered if a > tag is found but the BiblesResourcesDB.get_language failed. > > Previously it was always triggered (lines 17-20). Does this code still need to > be called if no tag is found? Upps. You're right. I didn't realise that. Could I

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-01 Thread Jonathan Corwin
But the "else" code (lines 35-39) are only getting triggered if a tag is found but the BiblesResourcesDB.get_language failed. Previously it was always triggered (lines 17-20). Does this code still need to be called if no tag is found? -- https://code.launchpad.net/~orangeshirt/openlp/bibles_f

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-03-01 Thread Armin Köhler
> Question: Is the osis file guaranteed to contain the tag? No, if I understand the manual the language tag is optional. But I think, that is no problem, if there is no language tag found the normal language dialog pop up and ask the user to choose the language of the bible. This change only tri

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-02-29 Thread Jonathan Corwin
Review: Needs Information Question: Is the osis file guaranteed to contain the tag? -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/95157 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpa

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2012-02-29 Thread Armin Köhler
Armin Köhler has proposed merging lp:~orangeshirt/openlp/bibles_fixes into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/95157 add language auto detection for osis bible files -- https://code.

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-05 Thread noreply
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/63495 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/63495 Y

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-05 Thread Raoul Snyman
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/63495 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/6

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-05 Thread Raoul Snyman
Review: Approve -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/63495 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsu

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-05 Thread Tim Bentley
Review: Approve Run through on all my bible databases without a problem even the ones which broke the current head version. -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/63495 Your team OpenLP Core is subscribed to branch lp:openlp. __

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-05 Thread Armin Köhler
Armin Köhler has proposed merging lp:~orangeshirt/openlp/bibles_fixes into lp:openlp. Requested reviews: OpenLP Core (openlp-core) Related bugs: Bug #792811 in OpenLP: "Bible Upgrade wizard crashed" https://bugs.launchpad.net/openlp/+bug/792811 Bug #792831 in OpenLP: "Bible Update Languag

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-02 Thread noreply
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/62947 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/62947 Y

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-02 Thread Raoul Snyman
The proposal to merge lp:~orangeshirt/openlp/bibles_fixes into lp:openlp has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/62947 -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/6

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-02 Thread Raoul Snyman
Review: Approve -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/62947 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsu

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-02 Thread Jonathan Corwin
Review: Approve -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/62947 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsu

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-01 Thread Armin Köhler
An additional comment: The traceback only occur after the the first error is fixed. Otherwise it isn't possible to download "1 Samuel". Perhaps this traceback occurs on other chapters or books too, but I doesn't know that. -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/629

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-01 Thread Armin Köhler
> Hello, > > Can you give examples what you are fixing? changes in line 8-12: If you try to download verses for example from "1 Samuel" => "NiV 2010" from Biblegateway it fails because the book name was twice encoded. First from urllib.quote and then from urllib.urlencode. urlencode doesn't wor

Re: [Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-06-01 Thread Andreas Preikschat
Review: Needs Information Hello, Can you give examples what you are fixing? -- https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/62947 Your team OpenLP Core is subscribed to branch lp:openlp. ___ Mailing list: https://launchpad.net/~op

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-05-31 Thread Armin Köhler
Armin Köhler has proposed merging lp:~orangeshirt/openlp/bibles_fixes into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/62947 Fixes problems with unicode book names on Biblegateway Fixes downl

[Openlp-core] [Merge] lp:~orangeshirt/openlp/bibles_fixes into lp:openlp

2011-05-30 Thread Armin Köhler
Armin Köhler has proposed merging lp:~orangeshirt/openlp/bibles_fixes into lp:openlp. Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~orangeshirt/openlp/bibles_fixes/+merge/62922 Fixes problems with unicode book names on Biblegateway Fixes downl