[Openlp-core] Linux Test Results: Failed

2019-08-29 Thread Raoul Snyman 
Linux tests failed, please see https://ci.openlp.io/job/MP-03-Linux-Tests/234/ 
for more details
-- 
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372031
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

[Openlp-core] JavaScript Test Results: Passed

2019-08-29 Thread Raoul Snyman 
JavaScript tests passed!
-- 
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/372031
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

[Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-08-29 Thread John Lines 
The proposal to merge lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp 
has been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/370364
-- 
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

[Openlp-core] Linting: Passed

2019-08-29 Thread Raoul Snyman 
Linting passed!
-- 
https://code.launchpad.net/~raoul-snyman/openlp/fix-display-chords/+merge/372026
Your team OpenLP Core is requested to review the proposed merge of 
lp:~raoul-snyman/openlp/fix-display-chords into 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

[Openlp-core] macOS Test Results: Passed

2019-08-29 Thread Raoul Snyman 
macOS tests passed!
-- 
https://code.launchpad.net/~raoul-snyman/openlp/fix-display-chords/+merge/372026
Your team OpenLP Core is requested to review the proposed merge of 
lp:~raoul-snyman/openlp/fix-display-chords into 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

[Openlp-core] JavaScript Test Results: Passed

2019-08-29 Thread Raoul Snyman 
JavaScript tests passed!
-- 
https://code.launchpad.net/~raoul-snyman/openlp/fix-display-chords/+merge/372026
Your team OpenLP Core is requested to review the proposed merge of 
lp:~raoul-snyman/openlp/fix-display-chords into 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

[Openlp-core] Linux Test Results: Passed

2019-08-29 Thread Raoul Snyman 
Linux tests passed!
-- 
https://code.launchpad.net/~raoul-snyman/openlp/fix-display-chords/+merge/372026
Your team OpenLP Core is requested to review the proposed merge of 
lp:~raoul-snyman/openlp/fix-display-chords into 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

[Openlp-core] [Merge] lp:~raoul-snyman/openlp/fix-display-chords into lp:openlp

2019-08-29 Thread Raoul Snyman 
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/fix-display-chords 
into lp:openlp.

Commit message:
Fix chords in songs being displayed on the display screen and in the slide 
controller.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/fix-display-chords/+merge/372026

Fix chords in songs being displayed on the display screen and in the slide 
controller.
-- 
Your team OpenLP Core is requested to review the proposed merge of 
lp:~raoul-snyman/openlp/fix-display-chords into lp:openlp.
=== modified file 'openlp/core/display/render.py'
--- openlp/core/display/render.py	2019-08-06 20:46:41 +
+++ openlp/core/display/render.py	2019-08-29 21:10:52 +
@@ -67,6 +67,15 @@
 CCLI_NO = '123456'
 
 
+def remove_chords(text):
+"""
+Remove chords from the text
+
+:param text: Text to be cleaned
+"""
+return re.sub(r'\[.+?\]', r'', text)
+
+
 def remove_tags(text, can_remove_chords=False):
 """
 Remove Tags from text for display
@@ -82,7 +91,7 @@
 text = text.replace(tag['end tag'], '')
 # Remove ChordPro tags
 if can_remove_chords:
-text = re.sub(r'\[.+?\]', r'', text)
+text = remove_chords(text)
 return text
 
 
@@ -377,6 +386,8 @@
 text = render_chords_for_printing(text, '{br}')
 else:
 text = render_chords(text)
+else:
+text = remove_chords(text)
 for tag in FormattingTags.get_html_tags():
 text = text.replace(tag['start tag'], tag['start html'])
 text = text.replace(tag['end tag'], tag['end html'])

=== modified file 'openlp/core/lib/serviceitem.py'
--- openlp/core/lib/serviceitem.py	2019-05-24 22:11:11 +
+++ openlp/core/lib/serviceitem.py	2019-08-29 21:10:52 +
@@ -185,7 +185,7 @@
 self._rendered_slides.append(rendered_slide)
 display_slide = {
 'title': raw_slide['title'],
-'text': remove_tags(page),
+'text': remove_tags(page, can_remove_chords=True),
 'verse': verse_tag,
 }
 self._display_slides.append(display_slide)

___
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] [Merge] lp:~tomasgroth/openlp/chordpro-fixes into lp:openlp

2019-08-29 Thread noreply 
The proposal to merge lp:~tomasgroth/openlp/chordpro-fixes into lp:openlp has 
been updated.

Status: Needs review => Merged

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/chordpro-fixes/+merge/372018
-- 
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

Re: [Openlp-core] [Merge] lp:~john+ubuntu-g/openlp/singingthefaith into lp:openlp

2019-08-29 Thread Tomas Groth 
Review: Needs Information

Hi John,

I still don't get why the hint file is not included...
If you already made the file, why should others have to do it? I assume that 
the "Singing The Faith" files that can be imported are the same for all 
potential users? 
-- 
https://code.launchpad.net/~john+ubuntu-g/openlp/singingthefaith/+merge/370364
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

Re: [Openlp-core] [Merge] lp:~tomasgroth/openlp/chordpro-fixes into lp:openlp

2019-08-29 Thread Raoul Snyman 
Review: Approve


-- 
https://code.launchpad.net/~tomasgroth/openlp/chordpro-fixes/+merge/372018
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

[Openlp-core] Linting: Passed

2019-08-29 Thread Raoul Snyman 
Linting passed!
-- 
https://code.launchpad.net/~tomasgroth/openlp/chordpro-fixes/+merge/372018
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

[Openlp-core] macOS Test Results: Passed

2019-08-29 Thread Raoul Snyman 
macOS tests passed!
-- 
https://code.launchpad.net/~tomasgroth/openlp/chordpro-fixes/+merge/372018
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

[Openlp-core] Linux Test Results: Passed

2019-08-29 Thread Raoul Snyman 
Linux tests passed!
-- 
https://code.launchpad.net/~tomasgroth/openlp/chordpro-fixes/+merge/372018
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

[Openlp-core] JavaScript Test Results: Passed

2019-08-29 Thread Raoul Snyman 
JavaScript tests passed!
-- 
https://code.launchpad.net/~tomasgroth/openlp/chordpro-fixes/+merge/372018
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

[Openlp-core] [Merge] lp:~tomasgroth/openlp/chordpro-fixes into lp:openlp

2019-08-29 Thread Tomas Groth 
The proposal to merge lp:~tomasgroth/openlp/chordpro-fixes into lp:openlp has 
been updated.

Status: Needs review => Superseded

For more details, see:
https://code.launchpad.net/~tomasgroth/openlp/chordpro-fixes/+merge/371955
-- 
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