openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #30967
[Merge] lp:~trb143/openlp/about into lp:openlp
Tim Bentley has proposed merging lp:~trb143/openlp/about into lp:openlp.
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~trb143/openlp/about/+merge/314567
Update to automate the date in the display.
Add more guilty parties to the display
lp:~trb143/openlp/about (revision 2715)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1890/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1801/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1740/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1476/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/1066/
[SUCCESS] https://ci.openlp.io/job/Branch-05a-Code_Analysis/1134/
[SUCCESS] https://ci.openlp.io/job/Branch-05b-Test_Coverage/1002/
[SUCCESS] https://ci.openlp.io/job/Branch-05c-Code_Analysis2/146/
--
Your team OpenLP Core is requested to review the proposed merge of lp:~trb143/openlp/about into lp:openlp.
=== modified file 'openlp/core/ui/aboutdialog.py'
--- openlp/core/ui/aboutdialog.py 2016-12-31 11:14:00 +0000
+++ openlp/core/ui/aboutdialog.py 2017-01-11 20:08:57 +0000
@@ -19,6 +19,7 @@
# with this program; if not, write to the Free Software Foundation, Inc., 59 #
# Temple Place, Suite 330, Boston, MA 02111-1307 USA #
###############################################################################
+import datetime
from PyQt5 import QtGui, QtWidgets
@@ -112,9 +113,12 @@
'Jonathan "springermac" Springer', 'Philip "Phill" Ridout']
contributors = ['Stuart "sibecker" Becker', 'Gerald "jerryb" Britton', 'Jonathan "gushie" Corwin',
'Samuel "MrGamgee" Findlay', 'Michael "cocooncrash" Gorven', 'Scott "sguerrieri" Guerrieri',
- 'Matthias "matthub" Hub', 'Meinert "m2j" Jordan', 'Armin "orangeshirt" K\xf6hler',
- 'Rafael "rafaellerm" Lerm', 'Erik "luen" Lundin', 'Edwin "edwinlunando" Lunando',
+ 'Simon Hanna', 'Chris Hill',
+ 'Matthias "matthub" Hub', 'Meinert "m2j" Jordan', 'Ian Knightly'
+ 'Armin "orangeshirt" K\xf6hler',
+ 'Rafael "rafaellerm" Lerm', 'Gabriel loo', 'Erik "luen" Lundin', 'Edwin "edwinlunando" Lunando',
'Dmitriy Marmyshev', 'Brian "brianmeyer" Meyer', 'Joshua "milleja46" Miller',
+ 'Suutari "Azaziah" Olli',
'Stevan "ElderP" Pettit', 'Mattias "mahfiaz" P\xf5ldaru', 'Felipe Polo-Wood',
'Christian "crichter" Richter', 'Arjan "arjans" Schrijver', 'Simon "samscudder" Scudder',
'Jeffrey "whydoubt" Smith', 'Stefan Strasser', 'Maikel Stuivenberg', 'Martin "mijiti" Thompson',
@@ -189,7 +193,8 @@
' Qt5: http://qt.io\n'
' PyQt5: http://www.riverbankcomputing.co.uk/software/pyqt/intro\n'
' Oxygen Icons: http://techbase.kde.org/Projects/Oxygen/\n'
- ' MuPDF: http://www.mupdf.com/\n')
+ ' MuPDF: http://www.mupdf.com/\n'
+ ' MediaInfo: https://mediaarea.net/en/MediaInfo\n')
final_credit = translate('OpenLP.AboutForm', 'Final Credit\n'
' "For God so loved the world that He gave\n'
' His one and only Son, so that whoever\n'
@@ -299,16 +304,17 @@
self.about_notebook.setTabText(self.about_notebook.indexOf(self.credits_tab),
translate('OpenLP.AboutForm', 'Credits'))
cr_others = ('Tim Bentley, Gerald Britton, Jonathan Corwin, Samuel Findlay, '
- 'Michael Gorven, Scott Guerrieri, Matthias Hub, Meinert Jordan, '
- 'Armin K\xf6hler, Erik Lundin, Edwin Lunando, Joshua Miller, '
- 'Brian T. Meyer, Stevan Pettit, Andreas Preikschat, '
+ 'Michael Gorven, Scott Guerrieri, Simon Hanna, Chris, Hill Matthias Hub, Meinert Jordan, '
+ 'Ian Knightley, Armin K\xf6hler, Gabriel Loo, Erik Lundin, Edwin Lunando, Joshua Miller, '
+ 'Brian T. Meyer, Suutari Olli, Stevan Pettit, Andreas Preikschat, '
'Mattias P\xf5ldaru, Christian Richter, Philip Ridout, '
'Ken Roberts, Simon Scudder, Jeffrey Smith, Maikel Stuivenberg, '
'Martin Thompson, Jon Tibble, Dave Warnock, Frode Woldsund, '
'Martin Zibricky, Patrick Zimmermann')
copyright_note = translate('OpenLP.AboutForm',
- 'Copyright \xa9 2004-2017 {cr}\n\n'
- 'Portions copyright \xa9 2004-2017 {others}').format(cr='Raoul Snyman',
+ 'Copyright \xa9 2004-{yr} {cr}\n\n'
+ 'Portions copyright \xa9 2004-{yr} {others}').format(cr='Raoul Snyman',
+ yr=datetime.date.today().year,
others=cr_others)
licence = translate('OpenLP.AboutForm',
'This program is free software; you can redistribute it and/or '
=== modified file 'tests/functional/openlp_core_ui/test_aboutform.py'
--- tests/functional/openlp_core_ui/test_aboutform.py 2016-12-31 11:01:36 +0000
+++ tests/functional/openlp_core_ui/test_aboutform.py 2017-01-11 20:08:57 +0000
@@ -22,6 +22,7 @@
"""
Package to test the openlp.core.ui.firsttimeform package.
"""
+import datetime
from unittest import TestCase
from openlp.core.ui.aboutform import AboutForm
@@ -58,4 +59,20 @@
about_form = AboutForm(None)
# THEN: The build number should be in the text
- assert 'OpenLP 3.1.5 build 3000' in about_form.about_text_edit.toPlainText()
+ self.assertTrue('OpenLP 3.1.5 build 3000' in about_form.about_text_edit.toPlainText(),
+ "The build number should be set correctly")
+
+ def test_about_form_date_test(self):
+ """
+ Test that the copyright date is included correctly
+ """
+ # GIVEN: A mocked out get_application_version function
+ date_string = "2004-%s" % datetime.date.today().year
+
+ # WHEN: The about form is created
+ about_form = AboutForm(None)
+ license_text = about_form.license_text_edit.toPlainText()
+
+ # THEN: The build number should be in the text
+ self.assertTrue(license_text.count(date_string, 0) == 2,
+ "The text string should be added twice to the license string")
Follow ups
