Unity 8

Merge lp:~ricsipontaz/unity8/fixed-comment-for-translators into lp:unity8

  1. fixed-comment-for-translators
  2. Merge into trunk
Proposed by Richard Somlói on 2015-09-21
Status: Merged
Approved by: Nick Dedekind on 2015-09-21
Approved revision: 1970
Merged at revision: 1983
Proposed branch: lp:~ricsipontaz/unity8/fixed-comment-for-translators
Merge into: lp:unity8
Diff against target: 25 lines (+4/-4)
1 file modified
plugins/Utils/relativetimeformatter.cpp (+4/-4)
To merge this branch: bzr merge lp:~ricsipontaz/unity8/fixed-comment-for-translators
Reviewer Review Type Date Requested Status
Nick Dedekind (community) 2015-09-21 Approve on 2015-09-21
Review via email: mp+271808@code.launchpad.net

Commit Message

Fix translator comments in time formatter

Description of the Change

Two variables in the comment for translators are mixed.

The %d and the %b (strftime(3))

To post a comment you must log in.
Nick Dedekind (nick-dedekind) wrote :

Looks fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/Utils/relativetimeformatter.cpp'
2--- plugins/Utils/relativetimeformatter.cpp 2015-07-21 10:05:55 +0000
3+++ plugins/Utils/relativetimeformatter.cpp 2015-09-21 13:19:06 +0000
4@@ -185,8 +185,8 @@
5 /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
6 This format string is used for showing, on a 12-hour clock, times that happened before a week from now.
7 (\u2003 is a unicode em space which is slightly wider than a normal space.)
8- en_US example: "%a %d %b\u2003%l:%M %p" --> "Fri Oct 31 1:00 PM"
9- en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM" */
10+ en_US example: "%a %b %d\u2003%l:%M %p" --> "Fri Oct 31 1:00 PM"
11+ en_GB example: "%a %d %b\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM" */
12 g_string_assign (ret, dgettext_datetime("%a %d %b\u2003%l:%M %p"));
13 break;
14 }
15@@ -229,8 +229,8 @@
16 /* Translators, please edit/rearrange these strftime(3) tokens to suit your locale!
17 This format string is used for showing, on a 24-hour clock, times that happened before a week from now.
18 (\u2003 is a unicode em space which is slightly wider than a normal space.)
19- en_US example: "%a %d %b\u2003%H:%M" --> "Fri Oct 31 13:00"
20- en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00" */
21+ en_US example: "%a %b %d\u2003%H:%M" --> "Fri Oct 31 13:00"
22+ en_GB example: "%a %d %b\u2003%H:%M" --> "Fri 31 Oct 13:00" */
23 g_string_assign (ret, dgettext_datetime("%a %d %b\u2003%H:%M"));
24 break;
25 }

Subscribers

People subscribed via source and target branches