Ubuntu
evolution package

Merge lp:~rodrigo-moya/ubuntu/maverick/evolution/add-u1-email into lp:~ubuntu-desktop/evolution/ubuntu

  1. Maverick (10.10)
  2. add-u1-email
  3. Merge into ubuntu
Proposed by Rodrigo Moya
Status: Merged
Merged at revision: 85
Proposed branch: lp:~rodrigo-moya/ubuntu/maverick/evolution/add-u1-email
Merge into: lp:~ubuntu-desktop/evolution/ubuntu
Diff against target: 189 lines (+177/-0)
2 files modified
debian/changelog (+7/-0)
debian/patches/09_add_ubuntuone_email.patch (+170/-0)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntu/maverick/evolution/add-u1-email
Reviewer Review Type Date Requested Status
dobey (community) Disapprove
Review via email: mp+33125@code.launchpad.net

Description of the change

Add patch to translate welcome message and Ubuntu One introduction message

To post a comment you must log in.
Revision history for this message
dobey (dobey) wrote :

Even if this were to be split up into multiple patches (one to fix translation of e-mails, and another to add the U1 e-mail), in its current state, this would break the world for the default Inbox.

1) intltool does not support this format at all. Danilo stated he would be happy to add support for translating the e-mails to intltool, to make things easier, but it's not done yet. I also don't think this is the right way to do the translations via intltool. The small issues with intltool supporting multiple po directories need to be fixed first, so that these translations don't poison the regular strings, and inflate the resulting .mo files.

2) This patch is assuming that inlttool's desktop file translation mode supports this format, which it does not. The resulting e-mails will be invalid data, and the default messages will likely not show up at all.

3) The method of translation for mbox files, should be to use the normal RFC822 message translation means in intltool, rather than a new oddball custom format.

4) Evolution should be doing a bit more magic to generate the default Inbox file. Search and replace of a @DATETIME@ or similar variable, to insert the time at build, would be a huge improvement. It would also be nice if the resulting Inbox was merely a concatenation of individual mbox files, from a subdir. This would enable adding additional new, translatable, user messages easily. The translated messages could be output into subdirectories, and those messages could be concatenated into individual translated Inbox files for installation.

review: Disapprove
Revision history for this message
Rodrigo Moya (rodrigo-moya) wrote :

> Even if this were to be split up into multiple patches (one to fix translation
> of e-mails, and another to add the U1 e-mail), in its current state, this
> would break the world for the default Inbox.
>
> 1) intltool does not support this format at all. Danilo stated he would be
> happy to add support for translating the e-mails to intltool, to make things
> easier, but it's not done yet. I also don't think this is the right way to do
> the translations via intltool. The small issues with intltool supporting
> multiple po directories need to be fixed first, so that these translations
> don't poison the regular strings, and inflate the resulting .mo files.
>
Danilo has already written a patch to do so, that's why the @intltool thing is used. We need that patch though in maverick before getting this in.

> 2) This patch is assuming that inlttool's desktop file translation mode
> supports this format, which it does not. The resulting e-mails will be invalid
> data, and the default messages will likely not show up at all.
>
again, Danilo's patch should support this

> 3) The method of translation for mbox files, should be to use the normal
> RFC822 message translation means in intltool, rather than a new oddball custom
> format.
>
I'll let Danilo comment on this, no idea

> 4) Evolution should be doing a bit more magic to generate the default Inbox
> file. Search and replace of a @DATETIME@ or similar variable, to insert the
> time at build, would be a huge improvement. It would also be nice if the
> resulting Inbox was merely a concatenation of individual mbox files, from a
> subdir. This would enable adding additional new, translatable, user messages
> easily. The translated messages could be output into subdirectories, and those
> messages could be concatenated into individual translated Inbox files for
> installation.
>
yes, that might be a good idea

lp:~rodrigo-moya/ubuntu/maverick/evolution/add-u1-email updated
86. By Rodrigo Moya

Mark smaller strings for translation, to make it easier for translators

87. By Rodrigo Moya

Use new -i option for intltool merging of email translations

88. By Rodrigo Moya

Use a separate po directory for the welcome email

89. By Rodrigo Moya

More fixes after talking with Danilo

90. By Rodrigo Moya

Remove translation stuff, this will be done by hand

91. By Rodrigo Moya

Add a better commit message

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2010-08-05 20:41:20 +0000
3+++ debian/changelog 2010-08-23 14:01:41 +0000
4@@ -1,3 +1,10 @@
5+evolution (2.30.2-0ubuntu12) maverick; urgency=low
6+
7+ * debian/patches/09_add_ubuntuone_email.patch:
8+ - Add patch to add Ubuntu One introduction (LP: 615874)
9+
10+ -- Rodrigo Moya <rodrigo.moya@canonical.com> Thu, 19 Aug 2010 17:37:22 +0200
11+
12 evolution (2.30.2-0ubuntu11) maverick; urgency=low
13
14 * debian/patches/89_express.patch:
15
16=== added file 'debian/patches/09_add_ubuntuone_email.patch'
17--- debian/patches/09_add_ubuntuone_email.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/09_add_ubuntuone_email.patch 2010-08-23 14:01:41 +0000
19@@ -0,0 +1,170 @@
20+=== modified file 'mail/default/C/Inbox'
21+--- mail/default/C/Inbox 2010-05-21 18:48:41 +0000
22++++ mail/default/C/Inbox 2010-08-23 12:49:22 +0000
23+@@ -311,3 +311,165 @@
24+ Content-Transfer-Encoding: 8bit
25+
26+ --=-t4dRE6cqcdSBHOrMdTQ1
27++
28++From ubuntuone-support@canonical.com Wed Aug 11 19:19:59 2010
29++Return-Path: <ubuntuone-support@canonical.com>
30++X-Original-To: ubuntuone-support@mail.canonical.com
31++Delivered-To: ubuntuone-support@mail.canonical.com
32++Subject: Bring your digital life together with Ubuntu One!
33++From: "The Ubuntu One Team <ubuntuone-support@canonical.com>
34++To: ubuntuone-support@canonical.com
35++Content-Type: multipart/related; type="multipart/alternative"; boundary="=-XU1pjbwfivhq1l/X2rI7"
36++Date: Wed, 11 Aug 2010 13:07:23 -0500
37++Message-ID: <1281550043.4672.22.camel@ubuntu>
38++Mime-Version: 1.0
39++X-Mailer: Evolution 2.30.2
40++X-Evolution-Source: imap://ubuntuone-support@mail.canonical.com/
41++
42++
43++--=-XU1pjbwfivhq1l/X2rI7
44++Content-Type: multipart/alternative; boundary="=-8ErHXLoZh99uv2mY1ioK"
45++
46++
47++--=-8ErHXLoZh99uv2mY1ioK
48++Content-Type: text/plain; charset="UTF-8"
49++Content-Transfer-Encoding: 8bit
50++
51++
52++
53++Evolution is better with Ubuntu One - the personal cloud that brings
54++your digital life together.
55++
56++ Ubuntu One does more than sync your files - whether you need to
57++ access your contacts, notes or bookmarks from any computer or
58++ the web, enjoy your favorite music from a cloud integrated store
59++ or stream your entire collection to iPhone and Android mobile
60++ phones - we've raised the bar on personal clouds. Learn more at
61++ http://one.ubuntu.com/.
62++
63++
64++Already have an Ubuntu One account?
65++
66++ Add your computer to your account by launching the Ubuntu One
67++ Preferences.
68++
69++ All contacts in the "Ubuntu One" address book are automatically
70++ synced with your personal cloud. Conveniently view and modify
71++ contact information
72++ in Evolution or the Ubuntu One website. Ubuntu One will even
73++ keep your Evolution contacts in sync with your mobile phone.
74++
75++ For information about copying or moving your contacts into the
76++ Ubuntu One address book, review our online tutorials and FAQs.
77++ https://wiki.ubuntu.com/UbuntuOne/Tutorials/
78++ https://wiki.ubuntu.com/UbuntuOne/FAQ/
79++
80++
81++Need help or found a bug? Review the Ubuntu One support options.
82++
83++ https://one.ubuntu.com/support/
84++
85++
86++Thank you.
87++
88++The Ubuntu One Team
89++http://one.ubuntu.com/
90++
91++
92++
93++
94++--=-8ErHXLoZh99uv2mY1ioK
95++Content-Type: text/html; charset="utf-8"
96++Content-Transfer-Encoding: 8bit
97++
98++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
99++<HTML>
100++<HEAD>
101++ <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
102++ <META NAME="GENERATOR" CONTENT="GtkHTML/3.30.2">
103++</HEAD>
104++<BODY>
105++<IMG SRC="cid:1281549841.4672.17.camel@ubuntu" ALIGN="bottom" BORDER="0"><BR>
106++<BR>
107++<B>Evolution is better with Ubuntu One</B> - the personal cloud that brings your digital life together.<BR>
108++<BR>
109++<BLOCKQUOTE>
110++ Ubuntu One does more than sync your files - whether you need to access your contacts, notes or bookmarks from any computer or the web, enjoy your favorite music from a cloud integrated store or stream your entire collection to iPhone and Android mobile phones - we've raised the bar on personal clouds. Learn more at <A HREF="http://one.ubuntu.com/">http://one.ubuntu.com/</A>.<BR>
111++</BLOCKQUOTE>
112++<BR>
113++<B>Already have an Ubuntu One account?</B> <BR>
114++<BLOCKQUOTE>
115++ Add your computer to your account by launching the Ubuntu One Preferences.<BR>
116++ <BR>
117++ All contacts in the "Ubuntu One" address book are automatically synced with your personal cloud. Conveniently view and modify contact information <BR>
118++ in Evolution or the Ubuntu One website. Ubuntu One will even keep your Evolution contacts in sync with your mobile phone.<BR>
119++ <BR>
120++ For information about copying or moving your contacts into the Ubuntu One address book, review our online tutorials and FAQs.<BR>
121++ <A HREF="https://wiki.ubuntu.com/UbuntuOne/Tutorials/">https://wiki.ubuntu.com/UbuntuOne/Tutorials/</A><BR>
122++ <A HREF="https://wiki.ubuntu.com/UbuntuOne/FAQ/">https://wiki.ubuntu.com/UbuntuOne/FAQ/</A><BR>
123++</BLOCKQUOTE>
124++<BR>
125++<B>Need help or found a bug? Review the Ubuntu One support options.</B><BR>
126++<BLOCKQUOTE>
127++ <A HREF="https://one.ubuntu.com/support/">https://one.ubuntu.com/support/</A><BR>
128++</BLOCKQUOTE>
129++<BR>
130++Thank you.<BR>
131++<BR>
132++The Ubuntu One Team<BR>
133++<A HREF="http://one.ubuntu.com/">http://one.ubuntu.com/</A> <BR>
134++<BR>
135++<BR>
136++<BR>
137++</BODY>
138++</HTML>
139++
140++--=-8ErHXLoZh99uv2mY1ioK--
141++
142++--=-XU1pjbwfivhq1l/X2rI7
143++Content-ID: <1281549841.4672.17.camel@ubuntu>
144++Content-Disposition: attachment; filename="h1-ubuntuone-logo.png"
145++Content-Type: image/png; name="h1-ubuntuone-logo.png"
146++Content-Transfer-Encoding: base64
147++
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
185++DACPohGRcjh+EgAAAABJRU5ErkJggg==
186++
187++
188++--=-XU1pjbwfivhq1l/X2rI7--
189+

Subscribers

People subscribed via source and target branches