Merge lp:~suutari-olli/openlp/remove-h-m-def-save-bug-1473670 into lp:openlp

Proposed by Azaziah
Status: Needs review
Proposed branch: lp:~suutari-olli/openlp/remove-h-m-def-save-bug-1473670
Merge into: lp:openlp
Diff against target: 12 lines (+1/-1)
1 file modified
openlp/core/common/uistrings.py (+1/-1)
To merge this branch: bzr merge lp:~suutari-olli/openlp/remove-h-m-def-save-bug-1473670
Reviewer Review Type Date Requested Status
Tim Bentley Disapprove
Review via email: mp+271566@code.launchpad.net

Description of the change

https://bugs.launchpad.net/openlp/+bug/1473670

This branch removes %H-%M from default list save name. The characters were removed from openlp/core/common/uistrings.py

If I understood correctly Transifex translations for this string need to be re-generated for all languages after merging

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote :

See bug report.

review: Disapprove

Unmerged revisions

2556. By Azaziah on 2015-09-17

remove-h-m-from-default-save-name --fixes lp:1473670

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openlp/core/common/uistrings.py'
2--- openlp/core/common/uistrings.py 2015-04-21 21:49:22 +0000
3+++ openlp/core/common/uistrings.py 2015-09-17 21:40:13 +0000
4@@ -66,7 +66,7 @@
5 self.Continuous = translate('OpenLP.Ui', 'Continuous')
6 self.Default = translate('OpenLP.Ui', 'Default')
7 self.DefaultColor = translate('OpenLP.Ui', 'Default Color:')
8- self.DefaultServiceName = translate('OpenLP.Ui', 'Service %Y-%m-%d %H-%M',
9+ self.DefaultServiceName = translate('OpenLP.Ui', 'Service %Y-%m-%d',
10 'This may not contain any of the following characters: /\\?*|<>\[\]":+\n'
11 'See http://docs.python.org/library/datetime'
12 '.html#strftime-strptime-behavior for more information.')