- Changes based on comments by TRB143

openlp/core/common/uistrings.py

@@ -82,7 +82,7 @@ class UiStrings(object):
         self.File = translate('OpenLP.Ui', 'File')
         self.FileNotFound = translate('OpenLP.Ui', 'File Not Found')
         self.FileNotFoundMessage = translate('OpenLP.Ui', 'File %s not found.\nPlease try selecting it individually.')
-        self.FontSizePtUnit = translate('OpenLP.Ui', ' pt', 'Abbreviated font pointsize unit')
+        self.FontSizePtUnit = translate('OpenLP.Ui', 'pt', 'Abbreviated font pointsize unit')
         self.Help = translate('OpenLP.Ui', 'Help')
         self.Hours = translate('OpenLP.Ui', 'h', 'The abbreviated unit for hours')
         self.IFdSs = translate('OpenLP.Ui', 'Invalid Folder Selected', 'Singular')
@@ -128,7 +128,7 @@ class UiStrings(object):
                                                             'player is disabled.')
         self.ResetBG = translate('OpenLP.Ui', 'Reset Background')
         self.ResetLiveBG = translate('OpenLP.Ui', 'Reset live background.')
-        self.Seconds = translate('OpenLP.Ui', ' s', 'The abbreviated unit for seconds')
+        self.Seconds = translate('OpenLP.Ui', 's', 'The abbreviated unit for seconds')
         self.SaveAndPreview = translate('OpenLP.Ui', 'Save && Preview')
         self.Search = translate('OpenLP.Ui', 'Search')
         self.SearchThemes = translate('OpenLP.Ui', 'Search Themes...', 'Search bar place holder text ')

openlp/core/ui/exceptiondialog.py

@@ -96,18 +96,19 @@ class Ui_ExceptionDialog(object):
         self.description_explanation.setText(
             translate('OpenLP.ExceptionDialog', '<strong>Please describe what you were trying to do.</strong> '
                                                 '&nbsp;If possible, write in English.'))
-        expection_part1 = (translate('OpenLP.ExceptionDialog',
-                         '<strong>Oops, OpenLP hit a problem and couldn\'t recover!</strong> <br><br> <strong>You can '
-                         'help </strong> OpenLP developers to <strong>fix this</strong> by<br> sending them a <strong>'
-                         'bug report</strong> to {email}<br><br>'
-                         ).format(email='<a href = "mailto:bugs@openlp.org" > bugs@openlp.org</a>'))
+        exception_part1 = (translate('OpenLP.ExceptionDialog',
+                                     '<strong>Oops, OpenLP hit a problem and couldn\'t recover!</strong> <br><br>'
+                                     '<strong>You can help </strong> the OpenLP developers to <strong>fix this</strong>'
+                                     ' by<br> sending them a <strong>bug report</strong> to {email}{newlines}'
+                                     ).format(email='<a href = "mailto:bugs@openlp.org" > bugs@openlp.org</a>',
+                                              newlines='<br><br>'))
         self.message_label.setText(
             translate('OpenLP.ExceptionDialog', '{first_part}'
                       '<strong>No email app? </strong> You can <strong>save</strong> this '
                       'information to a <strong>file</strong> and<br>'
                       'send it from your <strong>mail on browser</strong> via an <strong>attachement.</strong><br><br>'
                       '<strong>Thank you<strong> for being part of making OpenLP better!<br>'
-                      ).format(first_part = expection_part1))
+                      ).format(first_part = exception_part1))
         self.send_report_button.setText(translate('OpenLP.ExceptionDialog', 'Send E-Mail'))
         self.save_report_button.setText(translate('OpenLP.ExceptionDialog', 'Save to File'))
         self.attach_tile_button.setText(translate('OpenLP.ExceptionDialog', 'Attach File'))

openlp/core/ui/slidecontroller.py

@@ -290,7 +290,7 @@ class SlideController(DisplayController, RegistryProperties):
             self.delay_spin_box = QtWidgets.QSpinBox()
             self.delay_spin_box.setObjectName('delay_spin_box')
             self.delay_spin_box.setRange(1, 180)
-            self.delay_spin_box.setSuffix(UiStrings().Seconds)
+            self.delay_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().Seconds))
             self.delay_spin_box.setToolTip(translate('OpenLP.SlideController', 'Delay between slides in seconds.'))
             self.receive_spin_delay()
             self.toolbar.add_toolbar_widget(self.delay_spin_box)

openlp/core/ui/themewizard.py

@@ -419,15 +419,15 @@ class Ui_ThemeWizard(object):
         self.main_font_label.setText(translate('OpenLP.ThemeWizard', 'Font:'))
         self.main_color_label.setText(translate('OpenLP.ThemeWizard', 'color:'))
         self.main_size_label.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.main_size_spin_box.setSuffix(UiStrings().FontSizePtUnit)
+        self.main_size_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit))
         self.line_spacing_label.setText(translate('OpenLP.ThemeWizard', 'Line Spacing:'))
-        self.line_spacing_spin_box.setSuffix(UiStrings().FontSizePtUnit)
+        self.line_spacing_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit))
         self.outline_check_box.setText(translate('OpenLP.ThemeWizard', '&Outline:'))
         self.outline_size_label.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.outline_size_spin_box.setSuffix(UiStrings().FontSizePtUnit)
+        self.outline_size_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit))
         self.shadow_check_box.setText(translate('OpenLP.ThemeWizard', '&Shadow:'))
         self.shadow_size_label.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.shadow_size_spin_box.setSuffix(UiStrings().FontSizePtUnit)
+        self.shadow_size_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit))
         self.main_bold_check_box.setText(translate('OpenLP.ThemeWizard', 'Bold'))
         self.main_italics_check_box.setText(translate('OpenLP.ThemeWizard', 'Italic'))
         self.footer_area_page.setTitle(translate('OpenLP.ThemeWizard', 'Footer Area Font Details'))
@@ -436,7 +436,7 @@ class Ui_ThemeWizard(object):
         self.footer_font_label.setText(translate('OpenLP.ThemeWizard', 'Font:'))
         self.footer_color_label.setText(translate('OpenLP.ThemeWizard', 'color:'))
         self.footer_size_label.setText(translate('OpenLP.ThemeWizard', 'Size:'))
-        self.footer_size_spin_box.setSuffix(UiStrings().FontSizePtUnit)
+        self.footer_size_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit))
         self.alignment_page.setTitle(translate('OpenLP.ThemeWizard', 'Text Formatting Details'))
         self.alignment_page.setSubTitle(translate('OpenLP.ThemeWizard', 'Allows additional display '
                                                   'formatting information to be defined'))

openlp/plugins/alerts/lib/alertstab.py

@@ -101,9 +101,9 @@ class AlertsTab(SettingsTab):
         self.font_color_label.setText(translate('AlertsPlugin.AlertsTab', 'Font color:'))
         self.background_color_label.setText(UiStrings().BackgroundColorColon)
         self.font_size_label.setText(translate('AlertsPlugin.AlertsTab', 'Font size:'))
-        self.font_size_spin_box.setSuffix(UiStrings().FontSizePtUnit)
+        self.font_size_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().FontSizePtUnit))
         self.timeout_label.setText(translate('AlertsPlugin.AlertsTab', 'Alert timeout:'))
-        self.timeout_spin_box.setSuffix(UiStrings().Seconds)
+        self.timeout_spin_box.setSuffix(' {unit}'.format(unit=UiStrings().Seconds))
         self.preview_group_box.setTitle(UiStrings().Preview)
         self.font_preview.setText(UiStrings().OLPV2x)