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

[Rodrigo Moya]

Add patch to translate welcome message and Ubuntu One introduction message

[dobey (dobey)]

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

[Rodrigo Moya (rodrigo-moya)]

> 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]

86. By Rodrigo Moya on 2010-08-20

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

87. By Rodrigo Moya on 2010-08-20

Use new -i option for intltool merging of email translations

88. By Rodrigo Moya on 2010-08-20

Use a separate po directory for the welcome email

89. By Rodrigo Moya on 2010-08-20

More fixes after talking with Danilo

90. By Rodrigo Moya on 2010-08-23

Remove translation stuff, this will be done by hand

91. By Rodrigo Moya on 2010-08-23

Add a better commit message

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-05 20:41:20 +0000
+++ debian/changelog	2010-08-23 14:01:41 +0000
@@ -1,3 +1,10 @@
+evolution (2.30.2-0ubuntu12) maverick; urgency=low
+
+  * debian/patches/09_add_ubuntuone_email.patch:
+    - Add patch to add Ubuntu One introduction (LP: 615874)
+
+ -- Rodrigo Moya <[e-mail]>  Thu, 19 Aug 2010 17:37:22 +0200
+
 evolution (2.30.2-0ubuntu11) maverick; urgency=low
 
   * debian/patches/89_express.patch:
 
=== added file 'debian/patches/09_add_ubuntuone_email.patch'
--- debian/patches/09_add_ubuntuone_email.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/09_add_ubuntuone_email.patch	2010-08-23 14:01:41 +0000
@@ -0,0 +1,170 @@
+=== modified file 'mail/default/C/Inbox'
+--- mail/default/C/Inbox	2010-05-21 18:48:41 +0000
++++ mail/default/C/Inbox	2010-08-23 12:49:22 +0000
+@@ -311,3 +311,165 @@
+ Content-Transfer-Encoding: 8bit
+ 
+ --=-t4dRE6cqcdSBHOrMdTQ1
++
++From [e-mail] Wed Aug 11 19:19:59 2010
++Return-Path: <[e-mail]>
++X-Original-To: [e-mail]
++Delivered-To: [e-mail]
++Subject: Bring your digital life together with Ubuntu One!
++From: "The Ubuntu One Team <[e-mail]>
++To: [e-mail]
++Content-Type: multipart/related; type="multipart/alternative"; boundary="=-XU1pjbwfivhq1l/X2rI7"
++Date: Wed, 11 Aug 2010 13:07:23 -0500
++Message-ID: <1281550043.4672.22.camel@ubuntu>
++Mime-Version: 1.0
++X-Mailer: Evolution 2.30.2 
++X-Evolution-Source: imap://[e-mail]/
++
++
++--=-XU1pjbwfivhq1l/X2rI7
++Content-Type: multipart/alternative; boundary="=-8ErHXLoZh99uv2mY1ioK"
++
++
++--=-8ErHXLoZh99uv2mY1ioK
++Content-Type: text/plain; charset="UTF-8"
++Content-Transfer-Encoding: 8bit
++
++
++
++Evolution is better with Ubuntu One - the personal cloud that brings
++your digital life together.
++
++        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
++        http://one.ubuntu.com/.
++
++
++Already have an Ubuntu One account?
++
++        Add your computer to your account by launching the Ubuntu One
++        Preferences.
++        
++        All contacts in the "Ubuntu One" address book are automatically
++        synced with your personal cloud. Conveniently view and modify
++        contact information 
++        in Evolution or the Ubuntu One website. Ubuntu One will even
++        keep your Evolution contacts in sync with your mobile phone.
++        
++        For information about copying or moving your contacts into the
++        Ubuntu One address book, review our online tutorials and FAQs.
++        https://wiki.ubuntu.com/UbuntuOne/Tutorials/
++        https://wiki.ubuntu.com/UbuntuOne/FAQ/
++
++
++Need help or found a bug? Review the Ubuntu One support options.
++
++        https://one.ubuntu.com/support/
++
++
++Thank you.
++
++The Ubuntu One Team
++http://one.ubuntu.com/ 
++
++
++
++
++--=-8ErHXLoZh99uv2mY1ioK
++Content-Type: text/html; charset="utf-8"
++Content-Transfer-Encoding: 8bit
++
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 TRANSITIONAL//EN">
++<HTML>
++<HEAD>
++  <META HTTP-EQUIV="Content-Type" CONTENT="text/html; CHARSET=UTF-8">
++  <META NAME="GENERATOR" CONTENT="GtkHTML/3.30.2">
++</HEAD>
++<BODY>
++<IMG SRC="cid:1281549841.4672.17.camel@ubuntu" ALIGN="bottom" BORDER="0"><BR>
++<BR>
++<B>Evolution is better with Ubuntu One</B> - the personal cloud that brings your digital life together.<BR>
++<BR>
++<BLOCKQUOTE>
++    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>
++</BLOCKQUOTE>
++<BR>
++<B>Already have an Ubuntu One account?</B> <BR>
++<BLOCKQUOTE>
++    Add your computer to your account by launching the Ubuntu One Preferences.<BR>
++    <BR>
++    All contacts in the "Ubuntu One" address book are automatically synced with your personal cloud. Conveniently view and modify contact information <BR>
++    in Evolution or the Ubuntu One website. Ubuntu One will even keep your Evolution contacts in sync with your mobile phone.<BR>
++    <BR>
++    For information about copying or moving your contacts into the Ubuntu One address book, review our online tutorials and FAQs.<BR>
++    <A HREF="https://wiki.ubuntu.com/UbuntuOne/Tutorials/">https://wiki.ubuntu.com/UbuntuOne/Tutorials/</A><BR>
++    <A HREF="https://wiki.ubuntu.com/UbuntuOne/FAQ/">https://wiki.ubuntu.com/UbuntuOne/FAQ/</A><BR>
++</BLOCKQUOTE>
++<BR>
++<B>Need help or found a bug? Review the Ubuntu One support options.</B><BR>
++<BLOCKQUOTE>
++    <A HREF="https://one.ubuntu.com/support/">https://one.ubuntu.com/support/</A><BR>
++</BLOCKQUOTE>
++<BR>
++Thank you.<BR>
++<BR>
++The Ubuntu One Team<BR>
++<A HREF="http://one.ubuntu.com/">http://one.ubuntu.com/</A> <BR>
++<BR>
++<BR>
++<BR>
++</BODY>
++</HTML>
++
++--=-8ErHXLoZh99uv2mY1ioK--
++
++--=-XU1pjbwfivhq1l/X2rI7
++Content-ID: <1281549841.4672.17.camel@ubuntu>
++Content-Disposition: attachment; filename="h1-ubuntuone-logo.png"
++Content-Type: image/png; name="h1-ubuntuone-logo.png"
++Content-Transfer-Encoding: base64
++
++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
++DACPohGRcjh+EgAAAABJRU5ErkJggg==
++
++
++--=-XU1pjbwfivhq1l/X2rI7--
+