openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Review: Needs Fixing

Stopped commeting as there is a pattern in the comments.

A Captial should be used for a component in OpenLP.  Service for Service Manager and Theme for Theme Manager

A lowecase should be used for something inside a component.  An individual service / service item or a individual theme so display.  

Diff comments:

> 
> === modified file 'openlp/core/ui/advancedtab.py'
> --- openlp/core/ui/advancedtab.py	2016-04-05 17:30:20 +0000
> +++ openlp/core/ui/advancedtab.py	2016-04-13 17:12:55 +0000
> @@ -273,24 +273,24 @@
>          self.tab_title_visible = UiStrings().Advanced
>          self.ui_group_box.setTitle(translate('OpenLP.AdvancedTab', 'UI Settings'))
>          self.data_directory_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Data Location'))
> -        self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent files to display:'))
> +        self.recent_label.setText(translate('OpenLP.AdvancedTab', 'Number of recent Service files to display:'))
>          self.media_plugin_check_box.setText(translate('OpenLP.AdvancedTab',
> -                                                      'Remember active media manager tab on startup'))
> +                                                      'Open the last used Library category on startup'))
>          self.double_click_live_check_box.setText(translate('OpenLP.AdvancedTab',
> -                                                           'Double-click to send items straight to live'))
> +                                                           'Double-click to send items straight to Live'))
>          self.single_click_preview_check_box.setText(translate('OpenLP.AdvancedTab',
> -                                                              'Preview items when clicked in Media Manager'))
> +                                                              'Preview items when clicked in Library'))
>          self.single_click_service_preview_check_box.setText(translate('OpenLP.AdvancedTab',
> -                                                                      'Preview items when clicked in Service Manager'))
> +                                                                      'Preview items when clicked in Service'))
>          self.expand_service_item_check_box.setText(translate('OpenLP.AdvancedTab',
> -                                                             'Expand new service items on creation'))
> +                                                             'Expand new Service items on creation'))
>          self.slide_max_height_label.setText(translate('OpenLP.AdvancedTab',
>                                                        'Max height for non-text slides\nin slide controller:'))
>          self.slide_max_height_spin_box.setSpecialValueText(translate('OpenLP.AdvancedTab', 'Disabled'))
>          self.enable_auto_close_check_box.setText(translate('OpenLP.AdvancedTab',
>                                                             'Enable application exit confirmation'))
>          self.service_name_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Default Service Name'))
> -        self.service_name_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable default service name'))
> +        self.service_name_check_box.setText(translate('OpenLP.AdvancedTab', 'Enable default Service name'))

This one is a lower case service

>          self.service_name_time_label.setText(translate('OpenLP.AdvancedTab', 'Date and Time:'))
>          self.service_name_day.setItemText(0, translate('OpenLP.AdvancedTab', 'Monday'))
>          self.service_name_day.setItemText(1, translate('OpenLP.AdvancedTab', 'Tuesday'))
> @@ -300,11 +300,11 @@
>          self.service_name_day.setItemText(5, translate('OpenLP.AdvancedTab', 'Saturday'))
>          self.service_name_day.setItemText(6, translate('OpenLP.AdvancedTab', 'Sunday'))
>          self.service_name_day.setItemText(7, translate('OpenLP.AdvancedTab', 'Now'))
> -        self.service_name_time.setToolTip(translate('OpenLP.AdvancedTab', 'Time when usual service starts.'))
> +        self.service_name_time.setToolTip(translate('OpenLP.AdvancedTab', 'Time when usual Service starts.'))

so is this.

This is an instance of a service (worship) not the Service nmanager (the thing which manages services).

>          self.service_name_label.setText(translate('OpenLP.AdvancedTab', 'Name:'))
>          self.service_name_edit.setToolTip(translate('OpenLP.AdvancedTab', 'Consult the OpenLP manual for usage.'))
>          self.service_name_revert_button.setToolTip(
> -            translate('OpenLP.AdvancedTab', 'Revert to the default service name "%s".') %
> +            translate('OpenLP.AdvancedTab', 'Revert to the default Service name "%s".') %

and again

>              UiStrings().DefaultServiceName)
>          self.service_name_example_label.setText(translate('OpenLP.AdvancedTab', 'Example:'))
>          self.hide_mouse_group_box.setTitle(translate('OpenLP.AdvancedTab', 'Mouse Cursor'))
> @@ -337,7 +337,7 @@
>          self.slide_label.setText(translate('OpenLP.GeneralTab', 'Behavior of next/previous on the last/first slide:'))
>          self.end_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Remain on Slide'))
>          self.wrap_slide_radio_button.setText(translate('OpenLP.GeneralTab', '&Wrap around'))
> -        self.next_item_radio_button.setText(translate('OpenLP.GeneralTab', '&Move to next/previous service item'))
> +        self.next_item_radio_button.setText(translate('OpenLP.GeneralTab', '&Move to next/previous Service item'))

ditto

>          self.search_as_type_check_box.setText(translate('SongsPlugin.GeneralTab', 'Enable search as you type'))
>  
>      def load(self):
> 
> === modified file 'openlp/core/ui/exceptiondialog.py'
> --- openlp/core/ui/exceptiondialog.py	2015-12-31 22:46:06 +0000
> +++ openlp/core/ui/exceptiondialog.py	2016-04-13 17:12:55 +0000
> @@ -88,17 +90,21 @@
>          """
>          Translate the widgets on the fly.
>          """
> +        # Note that bugs_mail is not clicable, but it adds the blue color and underlining and makes the test copyable.
> +        bugs_mail = '<a href = "mailto:bugs@xxxxxxxxxx"; > bugs@xxxxxxxxxx</a>'
>          exception_dialog.setWindowTitle(translate('OpenLP.ExceptionDialog', 'Error Occurred'))
>          self.description_explanation.setText(
> -            translate('OpenLP.ExceptionDialog', 'Please enter a description of what you were doing to cause this error.'
> -                                                ' If possible, write in English.'
> -                                                '\n(Minimum 20 characters)'))
> +            translate('OpenLP.ExceptionDialog', '<strong>Please describe what you were trying to do.</strong> '
> +                                                '&nbsp;If possible, write in English.'))
>          self.message_label.setText(
> -            translate('OpenLP.ExceptionDialog', 'Oops! OpenLP hit a problem, and couldn\'t recover. The text in the '
> -                                                'box below contains information that might be helpful to the OpenLP '
> -                                                'developers, so please e-mail it to bugs@xxxxxxxxxx, along with a '
> -                                                'detailed description of what you were doing when the problem '
> -                                                'occurred. Also attach any files that triggered the problem.'))
> +            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 %s<br><br>'
> +                      '<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>') % bugs_mail)

Too complex to translate in one block so needs fixing.

>          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'))
> 
> === modified file 'openlp/core/ui/exceptionform.py'
> --- openlp/core/ui/exceptionform.py	2016-04-04 19:53:54 +0000
> +++ openlp/core/ui/exceptionform.py	2016-04-13 17:12:55 +0000
> @@ -199,7 +199,7 @@
>          else:
>              self.__button_state(False)
>          self.description_word_count.setText(
> -            translate('OpenLP.ExceptionDialog', 'Description characters to enter : %s') % count)
> +            translate('OpenLP.ExceptionDialog', '%s Characters from the minimum description remaining.') % count)
>  

characters

>      def on_attach_file_button_clicked(self):
>          """
> 
> === modified file 'openlp/core/ui/generaltab.py'
> --- openlp/core/ui/generaltab.py	2016-01-16 20:13:41 +0000
> +++ openlp/core/ui/generaltab.py	2016-04-13 17:12:55 +0000
> @@ -210,15 +210,15 @@
>          self.display_on_monitor_check.setText(translate('OpenLP.GeneralTab', 'Display if a single screen'))
>          self.startup_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Startup'))
>          self.warning_check_box.setText(translate('OpenLP.GeneralTab', 'Show blank screen warning'))
> -        self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the last service'))
> +        self.auto_open_check_box.setText(translate('OpenLP.GeneralTab', 'Automatically open the last Service'))

service

>          self.show_splash_check_box.setText(translate('OpenLP.GeneralTab', 'Show the splash screen'))
>          self.check_for_updates_check_box.setText(translate('OpenLP.GeneralTab', 'Check for updates to OpenLP'))
>          self.settings_group_box.setTitle(translate('OpenLP.GeneralTab', 'Application Settings'))
>          self.save_check_service_check_box.setText(translate('OpenLP.GeneralTab',
> -                                                  'Prompt to save before starting a new service'))
> -        self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new live item'))
> +                                                  'Prompt to save before starting a new Service'))

service

> +        self.auto_unblank_check_box.setText(translate('OpenLP.GeneralTab', 'Unblank display when adding new Live item'))
>          self.auto_preview_check_box.setText(translate('OpenLP.GeneralTab',
> -                                                      'Automatically preview next item in service'))
> +                                                      'Automatically preview next item in Service'))

service

>          self.timeout_label.setText(translate('OpenLP.GeneralTab', 'Timed slide interval:'))
>          self.timeout_spin_box.setSuffix(translate('OpenLP.GeneralTab', ' sec'))
>          self.ccli_group_box.setTitle(translate('OpenLP.GeneralTab', 'CCLI Details'))
> 
> === modified file 'openlp/core/ui/mainwindow.py'
> --- openlp/core/ui/mainwindow.py	2016-04-04 19:53:54 +0000
> +++ openlp/core/ui/mainwindow.py	2016-04-13 17:12:55 +0000
> @@ -425,41 +425,42 @@
>          self.formatting_tag_item.setText(translate('OpenLP.MainWindow', 'Configure &Formatting Tags...'))
>          self.settings_configure_item.setText(translate('OpenLP.MainWindow', '&Configure OpenLP...'))
>          self.settings_export_item.setStatusTip(
> -            translate('OpenLP.MainWindow', 'Export OpenLP settings to a specified *.config file'))
> +            translate('OpenLP.MainWindow', 'Export settings to a *.config file.'))
>          self.settings_export_item.setText(translate('OpenLP.MainWindow', 'Settings'))
>          self.settings_import_item.setStatusTip(
> -            translate('OpenLP.MainWindow', 'Import OpenLP settings from a specified *.config file previously '
> -                                           'exported on this or another machine'))
> +            translate('OpenLP.MainWindow', 'Import OpenLP settings from a *.config file previously exported from '
> +                                           'this or an another machine.'))
>          self.settings_import_item.setText(translate('OpenLP.MainWindow', 'Settings'))
> -        self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projector Manager'))
> -        self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Projector Manager'))
> +        self.view_projector_manager_item.setText(translate('OPenLP.MainWindow', '&Projectors'))
> +        self.view_projector_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Projectors.'))
>          self.view_projector_manager_item.setStatusTip(translate('OpenLP.MainWindow',
> -                                                                'Toggle the visibility of the Projector Manager'))
> -        self.view_media_manager_item.setText(translate('OpenLP.MainWindow', '&Media Manager'))
> -        self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Media Manager'))
> +                                                                'Toggle the visibility of the Projectors.'))
> +        self.view_media_manager_item.setText(translate('OpenLP.MainWindow', 'L&ibrary'))
> +        self.view_media_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show the Library.'))
>          self.view_media_manager_item.setStatusTip(translate('OpenLP.MainWindow',
> -                                                  'Toggle the visibility of the media manager.'))
> -        self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Theme Manager'))
> -        self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Theme Manager'))
> +                                                  'Toggle the visibility of the Library.'))
> +        self.view_theme_manager_item.setText(translate('OpenLP.MainWindow', '&Themes'))
> +        self.view_theme_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Themes'))

themes.

>          self.view_theme_manager_item.setStatusTip(translate('OpenLP.MainWindow',
> -                                                  'Toggle the visibility of the theme manager.'))
> -        self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service Manager'))
> -        self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Toggle Service Manager'))
> +                                                  'Toggle the visibility of the Themes.'))
> +        self.view_service_manager_item.setText(translate('OpenLP.MainWindow', '&Service'))
> +        self.view_service_manager_item.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Service.'))
>          self.view_service_manager_item.setStatusTip(translate('OpenLP.MainWindow',
> -                                                    'Toggle the visibility of the service manager.'))
> -        self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview Panel'))
> -        self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Preview Panel'))
> +                                                    'Toggle the visibility of the Service.'))
> +        self.view_preview_panel.setText(translate('OpenLP.MainWindow', '&Preview'))
> +        self.view_preview_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Preview.'))
>          self.view_preview_panel.setStatusTip(
> -            translate('OpenLP.MainWindow', 'Toggle the visibility of the preview panel.'))
> -        self.view_live_panel.setText(translate('OpenLP.MainWindow', '&Live Panel'))
> -        self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Toggle Live Panel'))
> -        self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock Panels'))
> -        self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Prevent the panels being moved.'))
> -        self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the live panel.'))
> +            translate('OpenLP.MainWindow', 'Toggle the visibility of the Preview.'))
> +        self.view_live_panel.setText(translate('OpenLP.MainWindow', 'Li&ve'))
> +        self.view_live_panel.setToolTip(translate('OpenLP.MainWindow', 'Hide or show Live'))
> +        self.lock_panel.setText(translate('OpenLP.MainWindow', 'L&ock visibility of the panels'))
> +        self.lock_panel.setStatusTip(translate('OpenLP.MainWindow', 'Lock visibility of the panels.'))
> +        self.view_live_panel.setStatusTip(translate('OpenLP.MainWindow', 'Toggle the visibility of the Live.'))
>          self.settings_plugin_list_item.setText(translate('OpenLP.MainWindow', '&Manage Plugins'))
> -        self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'List the Plugins'))
> +        self.settings_plugin_list_item.setStatusTip(translate('OpenLP.MainWindow', 'You can activate or disable plugins'
> +                                                                                   'from here.'))
>          self.about_item.setText(translate('OpenLP.MainWindow', '&About'))
> -        self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP'))
> +        self.about_item.setStatusTip(translate('OpenLP.MainWindow', 'More information about OpenLP.'))
>          if is_win() or is_macosx():
>              self.offline_help_item.setText(translate('OpenLP.MainWindow', '&User Guide'))
>          self.on_line_help_item.setText(translate('OpenLP.MainWindow', '&Online Help'))


-- 
https://code.launchpad.net/~suutari-olli/openlp/ui-messages-part-1/+merge/291796
Your team OpenLP Core is subscribed to branch lp:openlp.