poll-daemon

Merge lp:~popey/account-polld/fix-1365206 into lp:~ubuntu-push-hackers/account-polld/trunk

  1. fix-1365206
  2. Merge into trunk
Proposed by Alan Pope 🍺🐧🐱 🦄 on 2014-09-04
Status: Needs review
Proposed branch: lp:~popey/account-polld/fix-1365206
Merge into: lp:~ubuntu-push-hackers/account-polld/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
plugins/gmail/gmail.go (+2/-2)
To merge this branch: bzr merge lp:~popey/account-polld/fix-1365206
Reviewer Review Type Date Requested Status
John Lenton 2014-09-04 Needs Fixing on 2014-10-31
PS Jenkins bot continuous-integration Approve on 2014-09-04
Review via email: mp+233294@code.launchpad.net

Commit Message

Suggested re-wording.

Description of the Change

Suggested re-wording.

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Reply
Sergio Schvezov (sergiusens) wrote :

You need to run the update_translations script in the root and change the msgid in all the po files so the translations don't get reset.

I can piggyback on this MP if you want me to do that instead.

Reply
Alan Pope 🍺🐧🐱 🦄 (popey) wrote :

Ah sorry, didn't realise. Feel free.

Reply
John Lenton (chipaca) wrote :

Marking as needs fixing as per sergio's comment.

The update_translations script might need fixing, however; chasing sergio down wrt that.

review: Needs Fixing
Reply

Unmerged revisions

80. By Alan Pope 🍺🐧🐱 🦄 on 2014-09-04

change approximate mail text

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/gmail/gmail.go'
2--- plugins/gmail/gmail.go 2014-08-23 20:00:19 +0000
3+++ plugins/gmail/gmail.go 2014-09-04 01:11:17 +0000
4@@ -180,8 +180,8 @@
5 summary := gettext.Gettext("More unread emails available")
6 // TODO it would probably be better to grab the estimate that google returns in the message list.
7 approxUnreadMessages := len(pushMsgMap) - individualNotificationsLimit
8- // TRANSLATORS: the first %d refers to approximate additionl email message count
9- body := fmt.Sprintf(gettext.Gettext("You have an approximate of %d additional unread messages"), approxUnreadMessages)
10+ // TRANSLATORS: the first %d refers to approximate additional email message count
11+ body := fmt.Sprintf(gettext.Gettext("You have about %d more unread messages"), approxUnreadMessages)
12 // fmt with label personal and no threadId
13 action := fmt.Sprintf(gmailDispatchUrl, "personal")
14 epoch := time.Now().Unix()

Subscribers

People subscribed via source and target branches