Merge lp:~henninge/launchpad/devel-bugjamming-1 into lp:launchpad
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Approved by: | Henning Eggers | ||||||||
Approved revision: | no longer in the source branch. | ||||||||
Merged at revision: | 12105 | ||||||||
Proposed branch: | lp:~henninge/launchpad/devel-bugjamming-1 | ||||||||
Merge into: | lp:launchpad | ||||||||
Diff against target: |
28 lines (+4/-2) 2 files modified
lib/lp/translations/interfaces/potemplate.py (+1/-1) lib/lp/translations/templates/currenttranslationmessage-translate-one.pt (+3/-1) |
||||||||
To merge this branch: | bzr merge lp:~henninge/launchpad/devel-bugjamming-1 | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Curtis Hovey (community) | ui | Approve | |
Edwin Grubbs (community) | ui* | Approve | |
Brad Crittenden (community) | code | Approve | |
Review via email: mp+44070@code.launchpad.net |
Commit message
[r=bac]
Description of the change
= Summary =
Fixes two little ui bugs, bug 619121 and bug 670821.
== Proposed fix ==
Change the title of a template's 'iscurrent' property to "Template is
active". This is consistent with templates being called "inactive" in the
UI.
Add a <pre> tag around source comments on the translate page to preserve
their formatting. This is mostly important if the comments are multilined.
== Pre-implementation notes ==
Discussed with Danilo. He would also like to normalize leading spaces on
source comments but that would take this branch beyound 'trivial' (and it is
Friday night ;). So we agreed on this solution.
== Implementation details ==
There is a screenshot in the bug that shows a rather large comment that lost
all of its formatting.
https:/
Here is one I prepared myself, before and after.
http://
http://
The <pre> tag adds some of its own formatting but the discreet class makes
it look better in my opinion.
== Tests ==
No tests affected.
== Demo and Q/A ==
Demo for bug 619121:
1. Go here: https:/
2. Click "Edit" on the first template.
3. Scroll down to find the "Template is active" checkbox.
4. Unchcheck it and click "Change"
5. The template is now "inactive"
QA for bug 670821:
Any translate page of the chromioum-browser project should show multi-line
comments.
= Launchpad lint =
Checking for conflicts and issues in changed files.
Linting changed files:
lib/lp/
lib/lp/
Code looks fine.