Hi
it looks like Ninad's tree has broken locales, the problem is in not cleaned up merge[0].
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 (anyway the translations won't be sent out to translators or to translation server, so nobody will do the translation work anyway).
[0]:http://repo.or.cz/w/phpmyadmin/ninadsp.git/commit/47142291a1983f2a541a947b50... [1]:http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_developers#Updating_.po_fil...
Michal Čihař a écrit :
Hi
it looks like Ninad's tree has broken locales, the problem is in not cleaned up merge[0].
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 (anyway the translations won't be sent out to translators or to translation server, so nobody will do the translation work anyway).
Michal, how should a student merge origin/master into his/her tree to keep up with the ongoing changes there?
Hi,
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.
Michal, how should a student merge origin/master into his/her tree to keep up with the ongoing changes there?
+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.
Ninad S. Pundalik
Ninad Pundalik a écrit :
Hi,
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.
Michal, how should a student merge origin/master into his/her tree to keep up with the ongoing changes there?
+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.
The po files are not for English (US) but for the other languages.
Hi
Dne Wed, 7 Jul 2010 21:52:34 +0530 Ninad Pundalik ninadsp16289@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.
Fixed and pushed the changes. Thanks a lot for helping me clear this up :).
-
Marc Delisle -
Michal Čihař -
Ninad Pundalik