Merge lp://staging/~leonardolemos/pantheon-greeter/fix-1624217 into lp://staging/~elementary-pantheon/pantheon-greeter/trunk

Proposed by Leonardo Lemos
Status: Work in progress
Proposed branch: lp://staging/~leonardolemos/pantheon-greeter/fix-1624217
Merge into: lp://staging/~elementary-pantheon/pantheon-greeter/trunk
Diff against target: 103 lines (+16/-30)
2 files modified
po/pantheon-greeter.pot (+14/-19)
src/TimeLabel.vala (+2/-11)
To merge this branch: bzr merge lp://staging/~leonardolemos/pantheon-greeter/fix-1624217
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+314298@code.staging.launchpad.net

Commit message

* Remove AM/PM label;
* Move AM/PM label content to Time label;
* Update translation template.

Description of the change

This branch removes the AM/PM label and moves that label content to time's label to introduce a better translation and internationalization support.

To post a comment you must log in.
Revision history for this message
Danielle Foré (danrabbit) wrote :

there's a problem here because we're using style classes for the AM/PM label. So we'll have to figure out how we're going to handle those styles

Unmerged revisions

521. By Leonardo Lemos

Update translation template

520. By Leonardo Lemos

Remove pm label; Move pm label content to time label

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches