OpenLP

Merge lp:~trb143/openlp/bug-796440 into lp:openlp

  1. bug-796440
  2. Merge into trunk
Proposed by Tim Bentley
Status: Merged
Approved by: Andreas Preikschat
Approved revision: 1526
Merged at revision: 1685
Proposed branch: lp:~trb143/openlp/bug-796440
Merge into: lp:openlp
Diff against target: 296 lines (+35/-34)
10 files modified
openlp/core/ui/firsttimewizard.py (+1/-1)
openlp/core/ui/generaltab.py (+1/-1)
openlp/core/ui/themestab.py (+1/-1)
openlp/plugins/alerts/alertsplugin.py (+1/-1)
openlp/plugins/alerts/forms/alertform.py (+4/-4)
openlp/plugins/bibles/bibleplugin.py (+2/-2)
openlp/plugins/bibles/forms/bibleupgradeform.py (+3/-3)
openlp/plugins/bibles/lib/csvbible.py (+4/-3)
openlp/plugins/bibles/lib/http.py (+14/-14)
openlp/plugins/bibles/lib/mediaitem.py (+4/-4)
To merge this branch: bzr merge lp:~trb143/openlp/bug-796440
Reviewer Review Type Date Requested Status
Andreas Preikschat (community) Approve
Raoul Snyman Approve
Review via email: mp+67871@code.launchpad.net

This proposal supersedes a proposal from 2011-07-11.

Description of the change

Fix all outstanding (I hope) string errors except #2 with is different to bug!

To post a comment you must log in.
Revision history for this message
Andreas Preikschat (googol-deactivatedaccount) : Posted in a previous version of this proposal
review: Approve
Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

+ 'You need to specify a backup Directory for your '

"backup directory" please.

review: Needs Fixing
Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Andreas Preikschat (googol-deactivatedaccount) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/ui/firsttimewizard.py'
2--- openlp/core/ui/firsttimewizard.py 2011-06-12 16:02:52 +0000
3+++ openlp/core/ui/firsttimewizard.py 2011-07-13 17:44:31 +0000
4@@ -209,7 +209,7 @@
5 'Select the Plugins you wish to use. '))
6 self.songsCheckBox.setText(translate('OpenLP.FirstTimeWizard', 'Songs'))
7 self.customCheckBox.setText(translate('OpenLP.FirstTimeWizard',
8- 'Custom Text'))
9+ 'Custom Slides'))
10 self.bibleCheckBox.setText(translate('OpenLP.FirstTimeWizard', 'Bible'))
11 self.imageCheckBox.setText(translate('OpenLP.FirstTimeWizard',
12 'Images'))
13
14=== modified file 'openlp/core/ui/generaltab.py'
15--- openlp/core/ui/generaltab.py 2011-06-12 16:02:52 +0000
16+++ openlp/core/ui/generaltab.py 2011-07-13 17:44:31 +0000
17@@ -44,7 +44,7 @@
18 """
19 self.screens = ScreenList.get_instance()
20 self.icon_path = u':/icon/openlp-logo-16x16.png'
21- generalTranslated = translate('GeneralTab', 'General')
22+ generalTranslated = translate('OpenLP.GeneralTab', 'General')
23 SettingsTab.__init__(self, parent, u'General', generalTranslated)
24
25 def setupUi(self):
26
27=== modified file 'openlp/core/ui/themestab.py'
28--- openlp/core/ui/themestab.py 2011-06-12 16:02:52 +0000
29+++ openlp/core/ui/themestab.py 2011-07-13 17:44:31 +0000
30@@ -37,7 +37,7 @@
31 """
32 def __init__(self, parent, mainwindow):
33 self.mainwindow = mainwindow
34- generalTranslated = translate('ThemeTab', 'Themes')
35+ generalTranslated = translate('OpenLP.ThemesTab', 'Themes')
36 SettingsTab.__init__(self, parent, u'Themes', generalTranslated)
37 self.icon_path = u':/themes/theme_new.png'
38
39
40=== modified file 'openlp/plugins/alerts/alertsplugin.py'
41--- openlp/plugins/alerts/alertsplugin.py 2011-06-12 16:02:52 +0000
42+++ openlp/plugins/alerts/alertsplugin.py 2011-07-13 17:44:31 +0000
43@@ -104,7 +104,7 @@
44 def about(self):
45 about_text = translate('AlertsPlugin', '<strong>Alerts Plugin</strong>'
46 '<br />The alert plugin controls the displaying of nursery alerts '
47- 'on the display screen')
48+ 'on the display screen.')
49 return about_text
50
51 def setPluginTextStrings(self):
52
53=== modified file 'openlp/plugins/alerts/forms/alertform.py'
54--- openlp/plugins/alerts/forms/alertform.py 2011-06-12 16:02:52 +0000
55+++ openlp/plugins/alerts/forms/alertform.py 2011-07-13 17:44:31 +0000
56@@ -176,8 +176,8 @@
57 # We found '<>' in the alert text, but the ParameterEdit field is empty.
58 if text.find(u'<>') != -1 and not self.parameterEdit.text() and \
59 QtGui.QMessageBox.question(self,
60- translate('AlertPlugin.AlertForm', 'No Parameter Found'),
61- translate('AlertPlugin.AlertForm', 'You have not entered a '
62+ translate('AlertsPlugin.AlertForm', 'No Parameter Found'),
63+ translate('AlertsPlugin.AlertForm', 'You have not entered a '
64 'parameter to be replaced.\nDo you want to continue anyway?'),
65 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
66 QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
67@@ -187,8 +187,8 @@
68 # in the alert text.
69 elif text.find(u'<>') == -1 and self.parameterEdit.text() and \
70 QtGui.QMessageBox.question(self,
71- translate('AlertPlugin.AlertForm', 'No Placeholder Found'),
72- translate('AlertPlugin.AlertForm', 'The alert text does not'
73+ translate('AlertsPlugin.AlertForm', 'No Placeholder Found'),
74+ translate('AlertsPlugin.AlertForm', 'The alert text does not'
75 ' contain \'<>\'.\nDo you want to continue anyway?'),
76 QtGui.QMessageBox.StandardButtons(QtGui.QMessageBox.No |
77 QtGui.QMessageBox.Yes)) == QtGui.QMessageBox.No:
78
79=== modified file 'openlp/plugins/bibles/bibleplugin.py'
80--- openlp/plugins/bibles/bibleplugin.py 2011-06-12 16:02:52 +0000
81+++ openlp/plugins/bibles/bibleplugin.py 2011-07-13 17:44:31 +0000
82@@ -117,9 +117,9 @@
83 self.toolsUpgradeItem = QtGui.QAction(tools_menu)
84 self.toolsUpgradeItem.setObjectName(u'toolsUpgradeItem')
85 self.toolsUpgradeItem.setText(
86- translate('BiblePlugin', '&Upgrade older Bibles'))
87+ translate('BiblesPlugin', '&Upgrade older Bibles'))
88 self.toolsUpgradeItem.setStatusTip(
89- translate('BiblePlugin', 'Upgrade the Bible databases to the '
90+ translate('BiblesPlugin', 'Upgrade the Bible databases to the '
91 'latest format.'))
92 tools_menu.addAction(self.toolsUpgradeItem)
93 QtCore.QObject.connect(self.toolsUpgradeItem,
94
95=== modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py'
96--- openlp/plugins/bibles/forms/bibleupgradeform.py 2011-06-11 08:41:32 +0000
97+++ openlp/plugins/bibles/forms/bibleupgradeform.py 2011-07-13 17:44:31 +0000
98@@ -413,7 +413,7 @@
99 if not backup_path:
100 critical_error_message_box(UiStrings().EmptyField,
101 translate('BiblesPlugin.UpgradeWizardForm',
102- 'You need to specify a Backup Directory for your '
103+ 'You need to specify a backup directory for your '
104 'Bibles.'))
105 self.backupDirectoryEdit.setFocus()
106 return False
107@@ -520,7 +520,7 @@
108 OpenLPWizard.preWizard(self)
109 self.progressLabel.setText(translate(
110 'BiblesPlugin.UpgradeWizardForm',
111- 'Starting Bible upgrade...'))
112+ 'Starting upgrade...'))
113 Receiver.send_message(u'openlp_process_events')
114
115 def performWizard(self):
116@@ -532,7 +532,7 @@
117 if self.maxBibles == 0:
118 self.progressLabel.setText(
119 translate('BiblesPlugin.UpgradeWizardForm', 'There are no '
120- 'Bibles available to upgrade.'))
121+ 'Bibles that need to be upgraded.'))
122 self.progressBar.hide()
123 return
124 self.maxBibles = 0
125
126=== modified file 'openlp/plugins/bibles/lib/csvbible.py'
127--- openlp/plugins/bibles/lib/csvbible.py 2011-06-12 16:02:52 +0000
128+++ openlp/plugins/bibles/lib/csvbible.py 2011-07-13 17:44:31 +0000
129@@ -115,7 +115,8 @@
130 if self.stop_import_flag:
131 break
132 self.wizard.incrementProgressBar(unicode(
133- translate('BibleDB.Wizard', 'Importing books... %s')) %
134+ translate('BiblesPlugin.CSVBible',
135+ 'Importing books... %s')) %
136 unicode(line[2], details['encoding']))
137 book_ref_id = self.get_book_ref_id_by_name(
138 unicode(line[2], details['encoding']), 67, language_id)
139@@ -155,7 +156,7 @@
140 book = self.get_book(line_book)
141 book_ptr = book.name
142 self.wizard.incrementProgressBar(unicode(translate(
143- 'BibleDB.Wizard', 'Importing verses from %s...',
144+ 'BiblesPlugin.CSVBible', 'Importing verses from %s...',
145 'Importing verses from <book name>...')) % book.name)
146 self.session.commit()
147 try:
148@@ -163,7 +164,7 @@
149 except UnicodeError:
150 verse_text = unicode(line[3], u'cp1252')
151 self.create_verse(book.id, line[1], line[2], verse_text)
152- self.wizard.incrementProgressBar(translate('BibleDB.Wizard',
153+ self.wizard.incrementProgressBar(translate('BiblesPlugin.CSVBible',
154 'Importing verses... done.'))
155 Receiver.send_message(u'openlp_process_events')
156 self.session.commit()
157
158=== modified file 'openlp/plugins/bibles/lib/http.py'
159--- openlp/plugins/bibles/lib/http.py 2011-07-08 05:57:39 +0000
160+++ openlp/plugins/bibles/lib/http.py 2011-07-13 17:44:31 +0000
161@@ -69,10 +69,10 @@
162 ``chapter``
163 Chapter number.
164 """
165- log.debug(u'BGExtract.get_bible_chapter("%s", "%s", "%s")', version,
166+ log.debug(u'BGExtract.get_bible_chapter("%s", "%s", "%s")', version,
167 bookname, chapter)
168 urlbookname = urllib.quote(bookname.encode("utf-8"))
169- url_params = u'search=%s+%s&version=%s' % (urlbookname, chapter,
170+ url_params = u'search=%s+%s&version=%s' % (urlbookname, chapter,
171 version)
172 cleaner = [(re.compile('&nbsp;|<br />|\'\+\''), lambda match: '')]
173 soup = get_soup_for_bible_ref(
174@@ -203,7 +203,7 @@
175 ``chapter``
176 Chapter number
177 """
178- log.debug(u'BSExtract.get_bible_chapter("%s", "%s", "%s")', version,
179+ log.debug(u'BSExtract.get_bible_chapter("%s", "%s", "%s")', version,
180 bookname, chapter)
181 urlversion = urllib.quote(version.encode("utf-8"))
182 urlbookname = urllib.quote(bookname.encode("utf-8"))
183@@ -230,7 +230,7 @@
184
185 def get_books_from_http(self, version):
186 """
187- Load a list of all books a Bible contains from Bibleserver mobile
188+ Load a list of all books a Bible contains from Bibleserver mobile
189 website.
190
191 ``version``
192@@ -276,7 +276,7 @@
193 ``chapter``
194 Chapter number
195 """
196- log.debug(u'CWExtract.get_bible_chapter("%s", "%s", "%s")', version,
197+ log.debug(u'CWExtract.get_bible_chapter("%s", "%s", "%s")', version,
198 bookname, chapter)
199 urlbookname = bookname.replace(u' ', u'-')
200 urlbookname = urlbookname.lower()
201@@ -389,7 +389,7 @@
202 """
203 self.wizard.progressBar.setMaximum(68)
204 self.wizard.incrementProgressBar(unicode(translate(
205- 'BiblesPlugin.HTTPBible',
206+ 'BiblesPlugin.HTTPBible',
207 'Registering Bible and loading books...')))
208 self.create_meta(u'download source', self.download_source)
209 self.create_meta(u'download name', self.download_name)
210@@ -415,7 +415,7 @@
211 self.wizard.progressBar.setMaximum(len(books)+2)
212 self.wizard.incrementProgressBar(unicode(translate(
213 'BiblesPlugin.HTTPBible', 'Registering Language...')))
214- bible = BiblesResourcesDB.get_webbible(self.download_name,
215+ bible = BiblesResourcesDB.get_webbible(self.download_name,
216 self.download_source.lower())
217 if bible[u'language_id']:
218 language_id = bible[u'language_id']
219@@ -432,14 +432,14 @@
220 self.wizard.incrementProgressBar(unicode(translate(
221 'BiblesPlugin.HTTPBible', 'Importing %s...',
222 'Importing <book name>...')) % book)
223- book_ref_id = self.get_book_ref_id_by_name(book, len(books),
224+ book_ref_id = self.get_book_ref_id_by_name(book, len(books),
225 language_id)
226 if not book_ref_id:
227 log.exception(u'Importing books from %s - download name: "%s" '\
228 'failed' % (self.download_source, self.download_name))
229 return False
230 book_details = BiblesResourcesDB.get_book_by_id(book_ref_id)
231- log.debug(u'Book details: Name:%s; id:%s; testament_id:%s',
232+ log.debug(u'Book details: Name:%s; id:%s; testament_id:%s',
233 book, book_ref_id, book_details[u'testament_id'])
234 self.create_book(book, book_ref_id, book_details[u'testament_id'])
235 if self.stop_import_flag:
236@@ -524,7 +524,7 @@
237 def get_chapter_count(self, book):
238 """
239 Return the number of chapters in a particular book.
240-
241+
242 ``book``
243 The book object to get the chapter count for.
244 """
245@@ -597,14 +597,14 @@
246 """
247 if error_type == u'download':
248 critical_error_message_box(
249- translate('BiblePlugin.HTTPBible', 'Download Error'),
250- translate('BiblePlugin.HTTPBible', 'There was a '
251+ translate('BiblesPlugin.HTTPBible', 'Download Error'),
252+ translate('BiblesPlugin.HTTPBible', 'There was a '
253 'problem downloading your verse selection. Please check your '
254 'Internet connection, and if this error continues to occur '
255 'please consider reporting a bug.'))
256 elif error_type == u'parse':
257 critical_error_message_box(
258- translate('BiblePlugin.HTTPBible', 'Parse Error'),
259- translate('BiblePlugin.HTTPBible', 'There was a '
260+ translate('BiblesPlugin.HTTPBible', 'Parse Error'),
261+ translate('BiblesPlugin.HTTPBible', 'There was a '
262 'problem extracting your verse selection. If this error continues '
263 'to occur please consider reporting a bug.'))
264
265=== modified file 'openlp/plugins/bibles/lib/mediaitem.py'
266--- openlp/plugins/bibles/lib/mediaitem.py 2011-07-02 06:48:17 +0000
267+++ openlp/plugins/bibles/lib/mediaitem.py 2011-07-13 17:44:31 +0000
268@@ -87,7 +87,7 @@
269 not second_bible:
270 self.displayResults(bible, second_bible)
271 elif critical_error_message_box(
272- message=translate('BiblePlugin.MediaItem',
273+ message=translate('BiblesPlugin.MediaItem',
274 'You cannot combine single and dual Bible verse search results. '
275 'Do you want to delete your search results and start a new '
276 'search?'),
277@@ -437,7 +437,7 @@
278 if verse_count == 0:
279 self.advancedSearchButton.setEnabled(False)
280 critical_error_message_box(
281- message=translate('BiblePlugin.MediaItem',
282+ message=translate('BiblesPlugin.MediaItem',
283 'Bible not fully loaded.'))
284 else:
285 self.advancedSearchButton.setEnabled(True)
286@@ -694,8 +694,8 @@
287 verse.verse, verse.verse))
288 if passage_not_found:
289 QtGui.QMessageBox.information(self,
290- translate('BiblePlugin.MediaItem', 'Information'),
291- unicode(translate('BiblePlugin.MediaItem',
292+ translate('BiblesPlugin.MediaItem', 'Information'),
293+ unicode(translate('BiblesPlugin.MediaItem',
294 'The second Bible does not contain all the verses '
295 'that are in the main Bible. Only verses found in both '
296 'Bibles will be shown. %d verses have not been '