[Phpmyadmin-devel] Broken po files in Ninad's tree

[Michal Čihař]

Hi

Dne Wed, 7 Jul 2010 21:52:34 +0530
Ninad Pundalik <ninadsp16289 at gmail.com> napsal(a):

> >> The root cause is that po files are quite often changing content and
> >> doing changes in both gsoc branch and master will lead to conflicts. So
> >> please follow instructions on wiki [1] and do not update po files in
> >> your private branches, this will be done once the code is merged
> Sorry I messed it up.  Had not seen the instruction about private branches.

Well, it was written in wrong place on the wiki page, I moved it
yesterday to correct one.

> > how should a student merge origin/master into his/her tree to keep up
> > with the ongoing changes there?

The easiest way to fix it is to get po files from master and commit it:

git checkout origin/master -- po/*.po
git commit -m 'Reverted po files changes.'

> +1 to that.  If I have to use the PMA_messages array to localise the
> Ajax notifications and jQuery dialog buttons/titles, I would have to
> add the strings to js/messages.php.  If I did not update the po files,
> would the new strings still show up in the PMA_messages array?  If the
> array doesn't contain the translated string, the browsers throw
> exceptions and jQuery dialogs/notifications don't work, as we have an
> out of bounds error on the array.

You don't need to have messages in po files - these are required only
for translating.

The English messages are directly in the code and are picked up if the
translation is missing. And we don't want to handle translations right
now, simply because the code might still change quite a lot or we might
review the messages when merging your changes.

-- 
	Michal Čihař | http://cihar.com | http://blog.cihar.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20100708/ec6dd132/attachment.sig>