openlp-core team mailing list archive

[Tim Bentley <tim.bentley@xxxxxxxxx>]

Review: Needs Fixing

See below

Diff comments:

> 
> === modified file 'openlp/core/ui/formattingtagcontroller.py'
> --- openlp/core/ui/formattingtagcontroller.py	2015-02-27 21:14:08 +0000
> +++ openlp/core/ui/formattingtagcontroller.py	2015-12-11 07:53:25 +0000
> @@ -166,5 +166,6 @@
>              return None, end
>          if end and end != end_html:
>              return translate('OpenLP.FormattingTagForm',
> -                             'End tag %s does not match end tag for start tag %s') % (end, start_html), None

see comment below on strings.

> +                             'End tag %(end)s does not match end tag for start tag %(start)s') % \
> +                {'end': end, 'start': start_html}, None
>          return None, None
> 
> === modified file 'openlp/plugins/bibles/forms/bibleupgradeform.py'
> --- openlp/plugins/bibles/forms/bibleupgradeform.py	2015-01-18 13:39:21 +0000
> +++ openlp/plugins/bibles/forms/bibleupgradeform.py	2015-12-11 07:53:25 +0000
> @@ -547,9 +547,9 @@
>              if self.includeWebBible:
>                  self.progress_label.setText(
>                      translate('BiblesPlugin.UpgradeWizardForm',
> -                              'Upgrading Bible(s): %s successful%s\nPlease note that verses from Web Bibles will be '
> -                              'downloaded on demand and so an Internet connection is required.') %
> -                    (successful_import, failed_import_text))
> +                              'Upgrading Bible(s): %(success)d successful%(failed_text)s\nPlease note that verses '

Could be brital and cause translation errors as text formatting is in the string.  
Could this the a couple of stings and concatenate?  See the about page in 2.4 for details.

> +                              'from Web Bibles will be downloaded on demand and so an Internet connection is required.')
> +                    % {'success': successful_import, 'failed_text': failed_import_text})
>              else:
>                  self.progress_label.setText(
>                      translate('BiblesPlugin.UpgradeWizardForm', 'Upgrading Bible(s): %s successful%s') % (
> 
> === modified file 'openlp/plugins/remotes/lib/httprouter.py'
> --- openlp/plugins/remotes/lib/httprouter.py	2015-12-05 12:44:37 +0000
> +++ openlp/plugins/remotes/lib/httprouter.py	2015-12-11 07:53:25 +0000
> @@ -315,9 +315,15 @@
>          stage = translate('RemotePlugin.Mobile', 'Stage View')
>          live = translate('RemotePlugin.Mobile', 'Live View')
>          self.template_vars = {
> +<<<<<<< TREE

OOPS

>              'app_title': "%s %s" % (UiStrings().OLPV2x, remote),
>              'stage_title': "%s %s" % (UiStrings().OLPV2x, stage),
>              'live_title': "%s %s" % (UiStrings().OLPV2x, live),
> +=======
> +            'app_title': translate('RemotePlugin.Mobile', '%s Remote' % UiStrings().OLPV2x),
> +            'stage_title': translate('RemotePlugin.Mobile', '%s Stage View' % UiStrings().OLPV2x),
> +            'live_title': translate('RemotePlugin.Mobile', '%s Live View' % UiStrings().OLPV2x),
> +>>>>>>> MERGE-SOURCE
>              'service_manager': translate('RemotePlugin.Mobile', 'Service Manager'),
>              'slide_controller': translate('RemotePlugin.Mobile', 'Slide Controller'),
>              'alerts': translate('RemotePlugin.Mobile', 'Alerts'),


-- 
https://code.launchpad.net/~sam92/openlp/fixes22/+merge/280252
Your team OpenLP Core is subscribed to branch lp:openlp.