Gwibber

Merge lp:~kelemeng/gwibber/bug863039 into lp:gwibber

  1. bug863039
  2. Merge into trunk
Proposed by Gabor Kelemen
Status: Merged
Merged at revision: 1229
Proposed branch: lp:~kelemeng/gwibber/bug863039
Merge into: lp:gwibber
Diff against target: 60 lines (+9/-16)
3 files modified
libgwibber-gtk/stream-view-tile.vala (+4/-6)
libgwibber/utils.vala (+4/-10)
po/POTFILES.in (+1/-0)
To merge this branch: bzr merge lp:~kelemeng/gwibber/bug863039
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+77811@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Looks great, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libgwibber-gtk/stream-view-tile.vala'
2--- libgwibber-gtk/stream-view-tile.vala 2011-08-31 21:00:15 +0000
3+++ libgwibber-gtk/stream-view-tile.vala 2011-10-02 08:15:28 +0000
4@@ -654,12 +654,10 @@
5 likes_count.set_markup("");
6 likes_hbox.set_no_show_all (false);
7 likes_hbox.show_all();
8- } else if ((int)_likes == 1) {
9- likes_count.set_markup("<span font_size='small'>" + _likes.to_string() + " " + _("person liked this") + "</span>");
10- likes_hbox.set_no_show_all (false);
11- likes_hbox.show_all();
12- } else if ((int)_likes > 1) {
13- likes_count.set_markup("<span font_size='small'>" + _likes.to_string() + " " + _("people liked this") + "</span>");
14+ } else {
15+ likes_count.set_markup("<span font_size='small'>" +
16+ ngettext("%i person liked this", "%i people liked this", (int) _likes).printf((int) _likes) +
17+ "</span>");
18 likes_hbox.set_no_show_all (false);
19 likes_hbox.show_all();
20 }
21
22=== modified file 'libgwibber/utils.vala'
23--- libgwibber/utils.vala 2011-08-24 08:04:57 +0000
24+++ libgwibber/utils.vala 2011-10-02 08:15:28 +0000
25@@ -81,19 +81,13 @@
26 {
27 var now = (int)Time.gm (time_t ()).mktime() - 3600;
28 var d = (int)(now - t);
29- if(d < 30)
30+ if(d < 60)
31 return _("a few seconds ago");
32- if(d < 120)
33- return _("1 minute ago");
34 if(d < 3600)
35- return _("%i minutes ago").printf(d/60);
36- if(d < 7200)
37- return _("1 hour ago");
38+ return ngettext("%i minute ago", "%i minutes ago", (int) d/60).printf(d/60);
39 if(d < 86400)
40- return _("%i hours ago").printf(d/3600);
41- if(d >= 86400 && d < 172800)
42- return _("%i day ago").printf(d/86400);
43- return _("%i days ago").printf(d/86400);
44+ return ngettext("%i hour ago", "%i hours ago", (int) d/3600).printf(d/3600);
45+ return ngettext("%i day ago", "%i days ago", (int) d/86400).printf(d/86400);
46 }
47
48 public string? avatar_path(string url)
49
50=== modified file 'po/POTFILES.in'
51--- po/POTFILES.in 2011-09-09 21:31:23 +0000
52+++ po/POTFILES.in 2011-10-02 08:15:28 +0000
53@@ -17,6 +17,7 @@
54 client/searches-item.vala
55 client/tab-bar.vala
56 client/users-item.vala
57+libgwibber/utils.vala
58 libgwibber-gtk/entry.vala
59 libgwibber-gtk/stream-view-tile.vala
60 libgwibber-gtk/stream-view.vala