Re: [Openlp-core] [Merge] lp:~alisonken1/openlp/pjlink2-l into lp:openlp

2017-11-17 Thread Phill
Review: Needs Information

You've got a load of test files that appear to have been removed, and the 
re-added in another place. e.g.:

=== removed file 'tests/functional/openlp_core/lib/test_projector_db.py'
=== added file 'tests/functional/openlp_core/projectors/test_projector_db.py'

Have you moved these through the OS, rather than using bzr mv? It would keep 
the revision history intact and produce a cleaner diff.
-- 
https://code.launchpad.net/~alisonken1/openlp/pjlink2-l/+merge/333860
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:~alisonken1/openlp/pjlink2-l into lp:openlp

2017-11-17 Thread Ken Roberts
Yes - some of the files were OS  mv'ed before I remembered the bzr mv.
Sorry about that. It would probably have to wait until monday if you
want me to back out the changes and try to redo them with the proper
bzr move.
Let me know if that is what you want me to try.

On Fri, Nov 17, 2017 at 8:02 AM, Phill  wrote:
> Review: Needs Information
>
> You've got a load of test files that appear to have been removed, and the 
> re-added in another place. e.g.:
>
> === removed file 'tests/functional/openlp_core/lib/test_projector_db.py'
> === added file 'tests/functional/openlp_core/projectors/test_projector_db.py'
>
> Have you moved these through the OS, rather than using bzr mv? It would keep 
> the revision history intact and produce a cleaner diff.
> --
> https://code.launchpad.net/~alisonken1/openlp/pjlink2-l/+merge/333860
> You are the owner of lp:~alisonken1/openlp/pjlink2-l.



-- 
- Ken
Registered Linux user 296561
Slackin' since 1993
Slackware Linux (http://www.slackware.com)
OpenLP - Church Projection Software
Empower Your Church http://openlp.org

https://code.launchpad.net/~alisonken1/openlp/pjlink2-l/+merge/333860
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:~alisonken1/openlp/pjlink2-l into lp:openlp

2017-11-17 Thread Raoul Snyman
It's not a big issue to me, I can see the files moved.
-- 
https://code.launchpad.net/~alisonken1/openlp/pjlink2-l/+merge/333860
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:~raoul-snyman/openlp/web-i18n-updates into lp:openlp/website

2017-11-17 Thread Raoul Snyman
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/web-i18n-updates into 
lp:openlp/website.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/web-i18n-updates/+merge/333929

Update the translatability of the website, removing HTML tags and other 
technical entities that are not necessary.

Wrote a blog post which is due to go live on Sunday the 19th at 12:00 (midday) 
UTC.
-- 
Your team OpenLP Core is requested to review the proposed merge of 
lp:~raoul-snyman/openlp/web-i18n-updates into lp:openlp/website.
=== added file 'blog/making-the-web-site-translation-friendly.rst'
--- blog/making-the-web-site-translation-friendly.rst	1970-01-01 00:00:00 +
+++ blog/making-the-web-site-translation-friendly.rst	2017-11-18 06:14:54 +
@@ -0,0 +1,44 @@
+.. title: Making the Web Site Translation Friendly
+.. slug: 2017/11/19/making-the-web-site-translation-friendly
+.. date: 2017-11-19 12:00:00 UTC
+.. type: text
+.. previewimage: https://openlp.org/cover-images/making-the-web-site-translation-friendly.jpg
+
+Over the years, we have tried to have a multi-lingual website. Unfortunately each time has ended up with the same
+scenario:
+
+1. User gets excited
+2. User joins the translation team
+3. User translates 50% to 80% of the website
+4. User forgets about translation
+5. Translation is no longer maintained, and we get requests to fix a language we don't speak
+
+If you've ever wondered why our manual is only in English, this is why.
+
+Earlier this year, however, after some more requests by users to be able to translate the website, we looked at a new
+feature from online translation site `Transifex.com`_ called *Live Translation*. Essentially this allows you to
+translate your website without the need for much maintenance. So we decided to silently roll out a beta phase of a
+translatable website.
+
+We're quite pleased with the result so far. We've had a number of people translate the website, and most of those
+translations have stuck to 100% completion. We also don't publish a translation until it is 100% complete. This helps
+us to keep a website that looks great no matter which language it is being displayed in.
+
+Along the way, however, there have been a couple of hitches. One of them is that there was a lot of HTML in the strings
+that needed to be translated. We have gone through the website and tried to address this as much as possible. There
+are still some HTML tags here and there, but more complicated stuff like links and icons have been removed, which
+should make translating the site much easier.
+
+Unfortunately this does have the side effect that a lot of the strings that were already translated will now have to be
+translated again, but we trust you will bear with us while those folks who have volunteered to translate the site bring
+it back up to 100% translated.
+
+Would you like to be involved in this project? Just sign up on `Transifex.com`_, and join the `website project`_.
+
+*As a side note, the blog has been puposefully kept untranslated.*
+
+[ Image Credit: `Whisky Zulu by Dennis van Zuijlekom`_ ]
+
+.. _Transifex.com: https://www.transifex.com/
+.. _website project: https://www.transifex.com/openlp/openlp-website/
+.. _Whisky Zulu by Dennis van Zuijlekom: https://www.flickr.com/photos/dvanzuijlekom/11438391234/

=== modified file 'conf.py'
--- conf.py	2017-06-21 05:34:56 +
+++ conf.py	2017-11-18 06:14:54 +
@@ -430,7 +430,7 @@
 # 'Read more...' for the index page, if INDEX_TEASERS is True (translatable)
 INDEX_READ_MORE_LINK = '{read_more}...'
 # 'Read more...' for the RSS_FEED, if RSS_TEASERS is True (translatable)
-RSS_READ_MORE_LINK = '{read_more}... ({min_remaining_read})'
+FEED_READ_MORE_LINK = '{read_more}... ({min_remaining_read})'
 
 # A HTML fragment describing the license, for the sidebar.
 # (translatable)
@@ -620,7 +620,7 @@
 # RSS_LINK = None
 
 # Show only teasers in the RSS feed? Default to True
-RSS_TEASERS = False
+FEED_TEASERS = False
 
 # Strip HTML in the RSS feed? Default to False
 # RSS_PLAIN = False
@@ -681,6 +681,7 @@
 #"""
 EXTRA_HEAD_DATA = """
 
+
 """
 
 # Google Analytics or whatever else you use. Added to the bottom of 
@@ -701,6 +702,7 @@
 
 
 
+
 
 """
 

=== added file 'files/cover-images/making-the-web-site-translation-friendly.jpg'
Binary files files/cover-images/making-the-web-site-translation-friendly.jpg	1970-01-01 00:00:00 + and files/cover-images/making-the-web-site-translation-friendly.jpg	2017-11-18 06:14:54 + differ
=== modified file 'files/scripts/openlp.js'
--- files/scripts/openlp.js	2017-06-21 05:34:56 +
+++ files/scripts/openlp.js	2017-11-18 06:14:54 +
@@ -57,8 +57,37 @@
   $("#return-url").val(location.protocol + "//" + location.host + location.pathname);
 }
 
+function showToastr() {
+  var cookies = document.cookie;
+  if (cookies.search("hasVisitedOpenLPBefore=true") != -1) {
+return;
+  }
+  else if