openlp-core team mailing list archive

[Azaziah <suutari.olli@xxxxxxxxx>]

The proposal to merge lp:~suutari-olli/openlp/combined-bible-quick-search into lp:openlp has been updated.

Description changed to:

Thank you for your review Tim,

I’ve managed to simplify the code structure.

“This needs to be broken down into vers small bits which cannot be broken. Look at the about ui for a example.”
I’m not sure if I understand what you meant with that. 
The example verses need to be translatable.

I agree with you, the string with the scripture reference error is 
already quite horrifying and I can remember how I used to struggle 
with it for the Finnish translation.  However, I feel like the 
sample verses make the message much easier to understand.

If we can’t find an alternative solution for this, I propose the following:
We (I) copy paste the old translation from scripture reference error and add localized sample verses by ourselves, thus limiting the possibility of translation screw ups. By having the template and just replacing the foreign Bible book names to it, it shouldn’t take too long.

Refactored the code for combined search.
- Added: def on_quick_reference_search(self): 
  and moved definition of reference search there.
- Added: def on_quick_text_search(self): 
  and moved definition of text search there.
- Removed some un-needed code duplicates 
  (Double finalizing, 3rd normalizing of mouse cursor)
- Searching scripture ref with shorter than 3 char search is now possible 
   (G1 = Genesis 1)

Also removed “Search” from “Search Text or Reference…” 
since it does not fit the box properly.

lp:~suutari-olli/openlp/combined-bible-quick-search (revision 2624)
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-01-Pull/1382/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-02-Functional-Tests/1300/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-03-Interface-Tests/1239/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1071/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/662/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-05a-Code_Analysis/729/
[←[1;32mSUCCESS←[1;m] https://ci.openlp.io/job/Branch-05b-Test_Coverage/597/
------------------------------------------------------------------------------
This branch introduces following improvements to Quick Bible search:
- Combined Reference/Text search which first performs the Reference
  search and then moves to Text search if nothing is found.
- Possibility to use “.” when shortening Book names in Reference search.
  For an example Gen. 1 = Gen 1 = Genesis 1.
- New/Improved error messages (E.g. added actual example verses
  to Reference error)
  (Parts of the new messages are Bolded so <br> is required since
   \n does not work with bolding)

This branch also prevents users from performing Text searches which are:
- Shorter than 3 characters long (not including spaces)
- Searches consisting from only spaces

These currently possible bad search quarries result in LONG search times
and program instability/crashing. It’s still possible to search 3 characters
separated by spaces, but that scenario is relatively rarer.

For more details, see:
https://code.launchpad.net/~suutari-olli/openlp/combined-bible-quick-search/+merge/290845
-- 
Your team OpenLP Core is subscribed to branch lp:openlp.