Merge lp:~rodrigo-moya/ubuntu/maverick/evolution/add-u1-email into lp:~ubuntu-desktop/evolution/ubuntu
| 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 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| dobey (community) | 2010-08-19 | Disapprove on 2010-08-19 | |
|
Review via email:
|
|||
Description of the Change
Add patch to translate welcome message and Ubuntu One introduction 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
- 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
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.