branch merge: i18n

1 view
Skip to first unread message

Jeroen Ruigrok van der Werven

unread,
Apr 30, 2008, 3:48:56 PM4/30/08
to trac...@googlegroups.com
People,

since 0.11 has been branched trunk is now 0.12-dev material.
Given the fundamental nature of a framework like i18n into any given
software project I want to merge this in as soon as possible. This will make
sure that markup and extraction can be dealt with immediately. Also more and
more users have been using the sandbox to deploy Trac in their native
language.

The patchset is reasonably small at this point:

http://trac.edgewall.org/changeset?new=6944%40sandbox%2Fi18n&old=6942%40trunk

Let me know of any objections or otherwise.

--
Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
イェルーン ラウフロック ヴァン デル ウェルヴェン
http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B
Light, a quark resolution of god...

Zoom.Quiet

unread,
Apr 30, 2008, 9:25:16 PM4/30/08
to trac...@googlegroups.com, ks...@googlegroups.com
On Thu, May 1, 2008 at 3:48 AM, Jeroen Ruigrok van der Werven
<asm...@in-nomine.org> wrote:
>
> People,
>
> since 0.11 has been branched trunk is now 0.12-dev material.
> Given the fundamental nature of a framework like i18n into any given
> software project I want to merge this in as soon as possible. This will make
> sure that markup and extraction can be dealt with immediately. Also more and
> more users have been using the sandbox to deploy Trac in their native
> language.
>
great! us team will highest focus this task,
but these day is "Labor Day"
can we checkin patch for Chinese translation at 2008-05-04 ?

> The patchset is reasonably small at this point:
>
> http://trac.edgewall.org/changeset?new=6944%40sandbox%2Fi18n&old=6942%40trunk
>
> Let me know of any objections or otherwise.
>
> --
> Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
> イェルーン ラウフロック ヴァン デル ウェルヴェン
> http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B
> Light, a quark resolution of god...
>
> >
>

--
'''过程改进乃是开始催生可促生靠谱的人的组织!
PI keeps evolving organizations which promoting people be good!
'''http://zoomquiet.org
Pls. usage OOo to replace M$ Office. http://zh.openoffice.org
Pls. usage 7-zip to replace WinRAR/WinZip. http://7-zip.org
You can get the truely Freedom 4 software.

Jeroen Ruigrok van der Werven

unread,
May 1, 2008, 2:48:41 AM5/1/08
to trac...@googlegroups.com, ks...@googlegroups.com
-On [20080501 03:25], Zoom.Quiet (zoom....@gmail.com) wrote:
>great! us team will highest focus this task,
>but these day is "Labor Day"
>can we checkin patch for Chinese translation at 2008-05-04 ?

What patch are you talking about?
I added Richard Liao's translation strings yesterday and the on-the-fly
language preference panel is in place too.

Now tracking a, perhaps, bug.

--
Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
イェルーン ラウフロック ヴァン デル ウェルヴェン
http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B

You're just like a vapor, that appears for a little while and vanishes
one day...

Zoom.Quiet

unread,
May 1, 2008, 3:24:45 AM5/1/08
to trac...@googlegroups.com, ks...@googlegroups.com
On Thu, May 1, 2008 at 2:48 PM, Jeroen Ruigrok van der Werven
<asm...@in-nomine.org> wrote:
>
> -On [20080501 03:25], Zoom.Quiet (zoom....@gmail.com) wrote:
> >great! us team will highest focus this task,
> >but these day is "Labor Day"
> >can we checkin patch for Chinese translation at 2008-05-04 ?
>
> What patch are you talking about?
sandbox/i18n @ r6930 ,of course

> I added Richard Liao's translation strings yesterday and the on-the-fly

Yes, Liao is my team guy,
but some Chinese words is not be checked, not be in better yet;

> language preference panel is in place too.
>

and noitced this reversion not include wiki page's i18N,
how to include different language default wiki page content into trac?

> Now tracking a, perhaps, bug.

sure, just some key words must be fixed in right word!

can Trac-dev wait 4 days for Chinese reversion?

Jeroen Ruigrok van der Werven

unread,
May 1, 2008, 4:12:51 AM5/1/08
to trac...@googlegroups.com
[removed kspeg since I cannot post there anyway]

-On [20080501 09:24], Zoom.Quiet (zoom....@gmail.com) wrote:
>sandbox/i18n @ r6930 ,of course

The entire sandbox will be merged into trunk.

>and noitced this reversion not include wiki page's i18N,
>how to include different language default wiki page content into trac?

As I said before, the wiki pages will *not* be localized at this point in
time because it depends on more than just the localization framework. Part
of it, or perhaps all, might be realized with Odd Simon's newhelp branch.
Ticket #1513 as well as
http://trac.edgewall.org/wiki/TracDev/Proposals/NewHelp.

>can Trac-dev wait 4 days for Chinese reversion?

There is no need to wait for that, trunk is the main development. Merging
the branch sandbox/i18n to trunk merely means that the main Trac development
will be localized. It does not mean that changes cannot be made.

--
Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
イェルーン ラウフロック ヴァン デル ウェルヴェン
http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B

In every stone sleeps a crystal...

Zoom.Quiet

unread,
May 1, 2008, 5:02:29 AM5/1/08
to trac...@googlegroups.com
On Thu, May 1, 2008 at 4:12 PM, Jeroen Ruigrok van der Werven
<asm...@in-nomine.org> wrote:
>
> [removed kspeg since I cannot post there anyway]
>
sorry that is my team's intranet mailist, so BCC into;)

>
> -On [20080501 09:24], Zoom.Quiet (zoom....@gmail.com) wrote:
> >sandbox/i18n @ r6930 ,of course
>
> The entire sandbox will be merged into trunk.
>
>
> >and noitced this reversion not include wiki page's i18N,
> >how to include different language default wiki page content into trac?
>
> As I said before, the wiki pages will *not* be localized at this point in
> time because it depends on more than just the localization framework. Part
> of it, or perhaps all, might be realized with Odd Simon's newhelp branch.
> Ticket #1513 as well as
> http://trac.edgewall.org/wiki/TracDev/Proposals/NewHelp.
>
>
> >can Trac-dev wait 4 days for Chinese reversion?
>
> There is no need to wait for that, trunk is the main development. Merging
> the branch sandbox/i18n to trunk merely means that the main Trac development
> will be localized. It does not mean that changes cannot be made.
>
all clean! thanx for all!

patch will mail u and attachment ticket also ;)

>
> --
> Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
> イェルーン ラウフロック ヴァン デル ウェルヴェン
> http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B
> In every stone sleeps a crystal...
>
>
>
> >
>

--

Jeroen Ruigrok van der Werven

unread,
May 1, 2008, 5:46:09 AM5/1/08
to trac...@googlegroups.com
-On [20080501 11:02], Zoom.Quiet (zoom....@gmail.com) wrote:
>patch will mail u and attachment ticket also ;)

The ticket is ok. Just make sure you leave a message with it and not just
attach. It seems merely adding an attachment doesn't trigger notification.

--
Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
イェルーン ラウフロック ヴァン デル ウェルヴェン
http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B

The Wheels of Life, they turn, ..., without me...

Alec Thomas

unread,
May 2, 2008, 1:13:55 AM5/2/08
to trac...@googlegroups.com
+1 for the concept of merging this. It will make people happy.


--
Evolution: Taking care of those too stupid to take care of themselves.

Noah Kantrowitz

unread,
May 2, 2008, 1:16:21 AM5/2/08
to trac...@googlegroups.com
Alec Thomas wrote:
> +1 for the concept of merging this. It will make people happy.

+1 from me too. I see no reason to not continue it in trunk. Progress!

--Noah

signature.asc

osimons

unread,
May 2, 2008, 3:55:32 AM5/2/08
to Trac Development


On Apr 30, 9:48 pm, Jeroen Ruigrok van der Werven <asmo...@in-
nomine.org> wrote:
> People,
>
> since 0.11 has been branched trunk is now 0.12-dev material.
> Given the fundamental nature of a framework like i18n into any given
> software project I want to merge this in as soon as possible.

+1. Get 0.12 rolling...

:::simon

Jonas Borgström

unread,
May 2, 2008, 3:56:07 AM5/2/08
to trac...@googlegroups.com

+1 from me as well. Proper i18n support has been high on our users' wish
list for a very long time.

/ Jonas

Christian Boos

unread,
May 2, 2008, 4:11:16 AM5/2/08
to trac...@googlegroups.com
Jeroen Ruigrok van der Werven wrote:
> People,
>
> since 0.11 has been branched trunk is now 0.12-dev material.
> Given the fundamental nature of a framework like i18n into any given
> software project I want to merge this in as soon as possible. This will make
> sure that markup and extraction can be dealt with immediately. Also more and
> more users have been using the sandbox to deploy Trac in their native
> language.
>
> The patchset is reasonably small at this point:
>
> http://trac.edgewall.org/changeset?new=6944%40sandbox%2Fi18n&old=6942%40trunk
>
> Let me know of any objections or otherwise.
>
>

Not yet another forced dependency :-(

setup_requires = [ 'Babel>=0.8',
install_requires = [
'setuptools>=0.6b1',
'Genshi>=0.4.1'
'Babel>=0.8'
],

Trac should remain usable without Babel, as 0.11 is.

I've looked at the code, and this seems perfectly doable, i.e. keep
no-ops when Babel is not installed, and use Babel stuff when it's there.
I'll look into making a patch for this later today.

I think an update to trunk shouldn't force users to have to download
Babel, do whatever extra installation step is needed to get it running,
if they're not interested in the translations.

-- Christian

Jeroen Ruigrok van der Werven

unread,
May 2, 2008, 4:27:27 AM5/2/08
to trac...@googlegroups.com
-On [20080502 10:11], Christian Boos (cb...@neuf.fr) wrote:
>Trac should remain usable without Babel, as 0.11 is.
>
>I've looked at the code, and this seems perfectly doable, i.e. keep
>no-ops when Babel is not installed, and use Babel stuff when it's there.

I got time now, lets see if I can get that done.

--
Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
イェルーン ラウフロック ヴァン デル ウェルヴェン
http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B

My name is Legion: for we are many...

Jeroen Ruigrok van der Werven

unread,
May 2, 2008, 6:42:18 AM5/2/08
to trac...@googlegroups.com
-On [20080502 10:11], Christian Boos (cb...@neuf.fr) wrote:
>I've looked at the code, and this seems perfectly doable, i.e. keep
>no-ops when Babel is not installed, and use Babel stuff when it's there.
>I'll look into making a patch for this later today.

Can you check http://trac.edgewall.org/changeset/6981 to see how you like
that? I tested it with and without Babel, at least for the setup.py case.

--
Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
イェルーン ラウフロック ヴァン デル ウェルヴェン
http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B

The superior person uses his mind like a mirror: it accepts all, it
reflects all. It receives, but it does not keep...

Christian Boos

unread,
May 2, 2008, 12:39:01 PM5/2/08
to trac...@googlegroups.com
Jeroen Ruigrok van der Werven wrote:
> -On [20080502 10:11], Christian Boos (cb...@neuf.fr) wrote:
>
>> I've looked at the code, and this seems perfectly doable, i.e. keep
>> no-ops when Babel is not installed, and use Babel stuff when it's there.
>> I'll look into making a patch for this later today.
>>
>
> Can you check http://trac.edgewall.org/changeset/6981 to see how you like
> that? I tested it with and without Babel, at least for the setup.py case.
>

Ok, based on your initial patch, I managed to get a version that worked
flawlessly with and without Babel installed.
So I went ahead and committed it (http://trac.edgewall.org/changeset/6983).

It was also a no brainer to get Trac localized in french, so I was very
favorably impressed, congratulations to the i18n team!
So count a +1 for the merge from me as well.

The i18n branch makes it even easier for to detect and fix the last few
unicode related corner cases (r6984).

-- Christian


Christian Boos

unread,
May 2, 2008, 1:07:51 PM5/2/08
to trac...@googlegroups.com
Christian Boos wrote:
> ...

> So count a +1 for the merge from me as well.
>

Oh, I just forgot to mention that when Babel is present,
threading.local() will be used, and that of course won't work on Python 2.3.
It seems that there are implementations of ThreadLocal that we could
grab for backward compatibility (e.g.
http://code.djangoproject.com/attachment/ticket/463/mysql_magic-removal_rev2360-1.diff),
but nevertheless, I think it's about time to ditch Python 2.3 support
(in 0.12dev not for 0.11 naturally). What do you think?

-- Christian

John Hampton

unread,
May 2, 2008, 1:34:20 PM5/2/08
to trac...@googlegroups.com
Christian Boos wrote:
> but nevertheless, I think it's about time to ditch Python 2.3 support
> (in 0.12dev not for 0.11 naturally). What do you think?

+1 2.3 is way old and should be dropped for 0.12

-John

Jeroen Ruigrok van der Werven

unread,
May 3, 2008, 3:01:52 AM5/3/08
to trac...@googlegroups.com
-On [20080502 19:07], Christian Boos (cb...@neuf.fr) wrote:
>I think it's about time to ditch Python 2.3 support (in 0.12dev not for
>0.11 naturally). What do you think?

+1

Genshi 0.5 is going to be the last 2.3 supporting version of Genshi anyway
the last time Alec, Armin, Christopher and me were talking about things.

A related question: 0.12 is also the version where we remove ClearSilver
support, right?

--
Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
イェルーン ラウフロック ヴァン デル ウェルヴェン
http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B

The way you're bathed in Light, reminds me of that Night, god laid me
down into your rose garden of Trust...

Jeroen Ruigrok van der Werven

unread,
May 3, 2008, 4:42:13 AM5/3/08
to trac...@googlegroups.com
The sandbox/i18n branch is now merged to trunk.

Thank you for flying International Airlines.

--
Jeroen Ruigrok van der Werven <asmodai(-at-)in-nomine.org> / asmodai
イェルーン ラウフロック ヴァン デル ウェルヴェン
http://www.in-nomine.org/ | http://www.rangaku.org/ | GPG: 2EAC625B

Even when I do things for the sake of others, no sense of amazement or
conceit arises. It is just like feeding myself: I hope for nothing in return...

Richard Liao

unread,
May 9, 2008, 4:15:55 AM5/9/08
to trac...@googlegroups.com
I have posted this message in another thread.
Please ignore above.

2008/5/9 Richard Liao <richard...@gmail.com>:
> Hi,
>
> I'm trying to make a fully translated trac 0.12 based on the trunk(r7002).
>
> What I have done:
> 1. Fully translated the messages.po file.
> 2. Fully translated the default wiki pages into our local language: zh_CN.
> (I have noticed new help branch in sandbox, but currently, I have to
> translate these wiki pages.)
>
> The problem is: the UI elements are not fully i18n-ed.
> 1. Some string is not i18n-ed in py files.
> e.g.
> trac/ticket/web_ui.py: line 308:309
> return tag('Ticket ', tag.em('#', ticket.id, title=title),
> ' (', shorten_line(summary), ') ', verb)
> those should be:
> return tag(_('Ticket '), tag.em('#', ticket.id, title=title),
> ' (', shorten_line(summary), ') ', _(verb))
> How do I submit a patch?
>
> 2. Some strings never appear not in genshi template or py files:
> e.g.
> trac/ticket/template/ticket.html: line 150
> <py:if test="field">${field.label or field.name}:</py:if>
>
> and in trac/ticket/web_ui.py: line 552:560
> the string of ticket.fields['label'] or ticket.fields['edit_label']
> or ticket.fields['name'] is not i18n-ed.
>
> Those strings in ticket fields never appears in either py file or in
> genshi template files.
> Which make those string can not be gathered into pot file, thus can
> not be i18n-ed.
> e.g. priority, severitiy, status, and so on.
>
> My suggestion is to maintain a tracterms.py file, including all
> frequently used trac terms, to enable we i18n variables in genshi
> template files as below:
> <py:if test="field">${_(field.label) or
> _(field.name)}:</py:if>
>
> 3. Since some template strings in pot file can't be displayed
> correctly by current Genshi ticket #129.
> And I want to make all template work for now. Can we make all template
> strings i18n-ed by hand?
> e.g.
> trac/ticket/template/ticket.html: line 139
> <th id="h_reporter">Reported by:</th>
> <th id="h_reporter">${_('Reported by:')}</th>
>
> If we agree with it, I can make a patch of all template files.
>
> Regards,

Reply all
Reply to author
Forward
0 new messages