[Phpmyadmin-devel] Merging translations in git

Hi all I've just updated our wiki to include more detailed guide how to deal with merging po files: https://wiki.phpmyadmin.net/pma/Git#Merging_translations Please use that, otherwise po files in master will get corrupted as seen quite often recently. It is nearly impossible to do proper merge with them as the branches diverge. -- Michal Čihař | http://cihar.com | http://phpmyadmin.net

Le 2013-05-09 02:28, Michal Čihař a écrit :
Hi all
I've just updated our wiki to include more detailed guide how to deal with merging po files:
https://wiki.phpmyadmin.net/pma/Git#Merging_translations
Please use that, otherwise po files in master will get corrupted as seen quite often recently. It is nearly impossible to do proper merge with them as the branches diverge.
Thanks, I'll try that next time :) But I'm wondering: could we permit changes just in master? -- Marc Delisle http://infomarc.info

Dne Thu, 09 May 2013 02:35:42 -0400 Marc Delisle <marc@infomarc.info> napsal(a):
Le 2013-05-09 02:28, Michal Čihař a écrit :
Hi all
I've just updated our wiki to include more detailed guide how to deal with merging po files:
https://wiki.phpmyadmin.net/pma/Git#Merging_translations
Please use that, otherwise po files in master will get corrupted as seen quite often recently. It is nearly impossible to do proper merge with them as the branches diverge.
Thanks, I'll try that next time :)
But I'm wondering: could we permit changes just in master?
We want translation updates in future 4.0.x releases as well. Many translators did not manage to complete in time translations for 4.0.0... -- Michal Čihař | http://cihar.com | http://phpmyadmin.net

Hey Michal, I see that phpmyadmin has no translation file in urdu. Having proper support can be quite helpful and will promote the product in countries like Pakistan and India a lot. Should I take the responsibility of developing the .po file for urdu? On Thu, May 9, 2013 at 12:46 PM, Michal Čihař <michal@cihar.com> wrote:
Dne Thu, 09 May 2013 02:35:42 -0400 Marc Delisle <marc@infomarc.info> napsal(a):
Le 2013-05-09 02:28, Michal Čihař a écrit :
Hi all
I've just updated our wiki to include more detailed guide how to deal with merging po files:
https://wiki.phpmyadmin.net/pma/Git#Merging_translations
Please use that, otherwise po files in master will get corrupted as seen quite often recently. It is nearly impossible to do proper merge with them as the branches diverge.
Thanks, I'll try that next time :)
But I'm wondering: could we permit changes just in master?
We want translation updates in future 4.0.x releases as well. Many translators did not manage to complete in time translations for 4.0.0...
-- Michal Čihař | http://cihar.com | http://phpmyadmin.net
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel

Hi Dne Thu, 9 May 2013 12:53:12 +0500 Talha Masood <masoodtalha7@gmail.com> napsal(a):
I see that phpmyadmin has no translation file in urdu. Having proper support can be quite helpful and will promote the product in countries like Pakistan and India a lot. Should I take the responsibility of developing the .po file for urdu?
It's there, unfortunately it not translated enough to be included in the release: https://l10n.cihar.com/projects/phpmyadmin/master/ur/ So you are welcome to improve that :-). -- Michal Čihař | http://cihar.com | http://phpmyadmin.net

Hey Michal, I have successfully developed my first patch for the PMA. But unfortunately I am unable to push the commit to github owing to some proxy issue. Can I send you the updated code in zip and then you can take a look at the patch. I know I am causing trouble but I have no other way right now :( On Thu, May 9, 2013 at 12:56 PM, Michal Čihař <michal@cihar.com> wrote:
Hi
Dne Thu, 9 May 2013 12:53:12 +0500 Talha Masood <masoodtalha7@gmail.com> napsal(a):
I see that phpmyadmin has no translation file in urdu. Having proper support can be quite helpful and will promote the product
in
countries like Pakistan and India a lot. Should I take the responsibility of developing the .po file for urdu?
It's there, unfortunately it not translated enough to be included in the release:
https://l10n.cihar.com/projects/phpmyadmin/master/ur/
So you are welcome to improve that :-).
-- Michal Čihař | http://cihar.com | http://phpmyadmin.net
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel

Talha Masood a écrit :
Hey Michal, I have successfully developed my first patch for the PMA. But unfortunately I am unable to push the commit to github owing to some proxy issue. Can I send you the updated code in zip and then you can take a look at the patch. I know I am causing trouble but I have no other way right now :(
Hi, at the very least, please produce a patch with "git diff" or equivalent. I assume you have read http://wiki.phpmyadmin.net/pma/Git#Obtaining_code. Not being able to push to github, does not speak in your favor when it's time to rank your proposal! -- Marc Delisle http://infomarc.info

Ya I am aware of that. I am going to sort out this problem now. Thanks a lot for your guidance :) On Thu, May 9, 2013 at 7:21 PM, Marc Delisle <marc@infomarc.info> wrote:
Talha Masood a écrit :
Hey Michal, I have successfully developed my first patch for the PMA. But unfortunately I am unable to push the commit to github owing to some proxy issue. Can I send you the updated code in zip and then you can take a look at the patch. I know I am causing trouble but I have no other way right now :(
Hi, at the very least, please produce a patch with "git diff" or equivalent. I assume you have read http://wiki.phpmyadmin.net/pma/Git#Obtaining_code.
Not being able to push to github, does not speak in your favor when it's time to rank your proposal!
-- Marc Delisle http://infomarc.info
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel

Hi Dne Thu, 9 May 2013 19:12:10 +0500 Talha Masood <masoodtalha7@gmail.com> napsal(a):
I have successfully developed my first patch for the PMA. But unfortunately I am unable to push the commit to github owing to some proxy issue. Can I send you the updated code in zip and then you can take a look at the patch. I know I am causing trouble but I have no other way right now :(
You can also upload patches to our patch tracker on sourceforge, ideally use git format-patch for exporting them, see http://wiki.phpmyadmin.net/pma/Git#Exporting_patches -- Michal Čihař | http://cihar.com | http://phpmyadmin.net

Michal, I have forked the phpmyadmin repo and am going to update changes there. How do I make sure that you people can see that I have contributed? A little help here on git will definitely be great and will give me a jump start. On Fri, May 10, 2013 at 11:22 AM, Michal Čihař <michal@cihar.com> wrote:
Hi
Dne Thu, 9 May 2013 19:12:10 +0500 Talha Masood <masoodtalha7@gmail.com> napsal(a):
I have successfully developed my first patch for the
PMA.
But unfortunately I am unable to push the commit to github owing to some proxy issue. Can I send you the updated code in zip and then you can take a look at the patch. I know I am causing trouble but I have no other way right now :(
You can also upload patches to our patch tracker on sourceforge, ideally use git format-patch for exporting them, see http://wiki.phpmyadmin.net/pma/Git#Exporting_patches
-- Michal Čihař | http://cihar.com | http://phpmyadmin.net
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel

Hi,
Michal, I have forked the phpmyadmin repo and am going to update changes there. How do I make sure that you people can see that I have contributed? A little help here on git will definitely be great and will give me a jump start.
You can send a pull request to commitee for code review. Check github "pull request". xmujay (Bin Zu)

I have made a commit. Kindly check it out On Fri, May 10, 2013 at 12:03 PM, xmujay@gmail.com <xmujay@gmail.com> wrote:
Hi,
Michal, I have forked the phpmyadmin repo and am going to update changes there. How do I make sure that you people can see that I have contributed? A little help here on git will definitely be great and will give me a jump start.
You can send a pull request to commitee for code review. Check github "pull request".
xmujay (Bin Zu)
------------------------------------------------------------------------------ Learn Graph Databases - Download FREE O'Reilly Book "Graph Databases" is the definitive new guide to graph databases and their applications. This 200-page book is written by three acclaimed leaders in the field. The early access version is available now. Download your free book today! http://p.sf.net/sfu/neotech_d2d_may _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel

2013/5/9 Michal Čihař <michal@cihar.com>:
Hi all
I've just updated our wiki to include more detailed guide how to deal with merging po files:
https://wiki.phpmyadmin.net/pma/Git#Merging_translations
Please use that, otherwise po files in master will get corrupted as seen quite often recently. It is nearly impossible to do proper merge with them as the branches diverge.
So, to be sure, this means that this guidelines needs to be followed on every merge from QA_* to master? I guess it only applies if there are changed po files, but to be sure there, you would have to check anyway with the first part of the guidelines? -- Kind regards, Dieter Adriaenssens

Dieter Adriaenssens a écrit :
2013/5/9 Michal Čihař <michal@cihar.com>:
Hi all
I've just updated our wiki to include more detailed guide how to deal with merging po files:
https://wiki.phpmyadmin.net/pma/Git#Merging_translations
Please use that, otherwise po files in master will get corrupted as seen quite often recently. It is nearly impossible to do proper merge with them as the branches diverge.
So, to be sure, this means that this guidelines needs to be followed on every merge from QA_* to master? I guess it only applies if there are changed po files, but to be sure there, you would have to check anyway with the first part of the guidelines?
Yes, that's what I concluded too. -- Marc Delisle http://infomarc.info

Hi all, I make pull request about adding Unit test case for libraries/ServerStatusData.class.php https://github.com/phpmyadmin/phpmyadmin/pull/394 but a build error if I don't change the "require" to "require _once" on libraries/common.inc.php https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/7221724 it is: Fatal error: Cannot redeclare class PMA_Error_Handler in /home/travis/build/phpmyadmin/phpmyadmin/libraries/Error_Handler.class.php on line 20 I want to know that Any special reason that "require" but not "require _once" on libraries/common.inc.php thanks, Adam

Hi, Although I changed the "require" to "require _once" on libraries/common.inc.php other redefine error still existed: https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/7223416 so I think to test the files which requires "libraries/common.inc.php", the problem will exist. Any advice? thanks Adam
Hi all,
I make pull request about adding Unit test case for libraries/ServerStatusData.class.php https://github.com/phpmyadmin/phpmyadmin/pull/394
but a build error if I don't change the "require" to "require _once" on libraries/common.inc.php https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/7221724
it is: Fatal error: Cannot redeclare class PMA_Error_Handler in /home/travis/build/phpmyadmin/phpmyadmin/libraries/Error_Handler.class.php on line 20
I want to know that Any special reason that "require" but not "require _once" on libraries/common.inc.php
thanks, Adam ------------------------------------------------------------------------------ AlienVault Unified Security Management (USM) platform delivers complete security visibility with the essential security capabilities. Easily and efficiently configure, manage, and operate all of your security controls from a single console and one unified framework. Download a free trial. http://p.sf.net/sfu/alienvault_d2d _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel

2013/5/16 adam <adamgsoc2013@gmail.com>:
Hi,
Although I changed the "require" to "require _once" on libraries/common.inc.php other redefine error still existed: https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/7223416
so I think to test the files which requires "libraries/common.inc.php", the problem will exist.
Any advice? thanks
Using require_once, will only include the file if it wasn't included before, see [0]. If you use require, it will include the file, regardless if it was included at another place or in another included file. If a function or class is defined in a file that was included before, you get the error that you mention. Because keeping track of where which files were included, is too complicated, using require_once is the best option. Hope this helps. [0] http://www.php.net/manual/en/function.require-once.php
Adam
Hi all,
I make pull request about adding Unit test case for libraries/ServerStatusData.class.php https://github.com/phpmyadmin/phpmyadmin/pull/394
but a build error if I don't change the "require" to "require _once" on libraries/common.inc.php https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/7221724
it is: Fatal error: Cannot redeclare class PMA_Error_Handler in /home/travis/build/phpmyadmin/phpmyadmin/libraries/Error_Handler.class.php on line 20
I want to know that Any special reason that "require" but not "require _once" on libraries/common.inc.php
thanks, Adam ------------------------------------------------------------------------------ AlienVault Unified Security Management (USM) platform delivers complete security visibility with the essential security capabilities. Easily and efficiently configure, manage, and operate all of your security controls from a single console and one unified framework. Download a free trial. http://p.sf.net/sfu/alienvault_d2d _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
AlienVault Unified Security Management (USM) platform delivers complete security visibility with the essential security capabilities. Easily and efficiently configure, manage, and operate all of your security controls from a single console and one unified framework. Download a free trial. http://p.sf.net/sfu/alienvault_d2d _______________________________________________ Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
-- Kind regards, Dieter Adriaenssens

Hi Dieter,
2013/5/16 adam <adamgsoc2013@gmail.com>:
Hi,
Although I changed the "require" to "require _once" on libraries/common.inc.php other redefine error still existed: https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/7223416
so I think to test the files which requires "libraries/common.inc.php", the problem will exist.
Any advice? thanks
Using require_once, will only include the file if it wasn't included before, see [0]. If you use require, it will include the file, regardless if it was included at another place or in another included file. If a function or class is defined in a file that was included before, you get the error that you mention. Because keeping track of where which files were included, is too complicated, using require_once is the best option.
I agree with you about that. But I don't know why the file libraries/common.inc.php use "require" but not "require _once". this file will be used frequently, so use "require _once" is better. I was thinking that there must be some special reason. thanks for your information. Adam

Hi Dne Fri, 17 May 2013 22:30:03 +0800 adam <adamgsoc2013@gmail.com> napsal(a):
I agree with you about that. But I don't know why the file libraries/common.inc.php use "require" but not "require _once". this file will be used frequently, so use "require _once" is better. I was thinking that there must be some special reason.
It is normally included just once, so there is no reason to check this. However with testsuite this gets more complicated... The original motivation for using just require instead of require_once was performance, because require_once was pretty inefficient before some of the more recent versions of PHP. -- Michal Čihař | http://cihar.com | http://phpmyadmin.net

HI,
Dne Fri, 17 May 2013 22:30:03 +0800 adam <adamgsoc2013@gmail.com> napsal(a):
I agree with you about that. But I don't know why the file libraries/common.inc.php use "require" but not "require _once". this file will be used frequently, so use "require _once" is better. I was thinking that there must be some special reason.
It is normally included just once, so there is no reason to check this. However with testsuite this gets more complicated...
The original motivation for using just require instead of require_once was performance, because require_once was pretty inefficient before some of the more recent versions of PHP.
Thanks Michal. I agree with you that using "require" is for performance. and it is working for most cases. On our page (server_status.php), It is working well, so it is not a problem here. require_once 'libraries/common.inc.php'; require_once 'libraries/server_common.inc.php'; require_once 'libraries/ServerStatusData.class.php'; but you also mentioned that "However with testsuite this gets more complicated...". I think there must be somewhere include the file: 'libraries/common.inc.php' so the testing of pages which include 'libraries/common.inc.php'; will fail due to require_once issue. I will dig into this issue deeper. thanks Adam

Hi Dne Sat, 18 May 2013 01:08:28 +0800 adam <adamgsoc2013@gmail.com> napsal(a):
HI,
Dne Fri, 17 May 2013 22:30:03 +0800 adam <adamgsoc2013@gmail.com> napsal(a):
I agree with you about that. But I don't know why the file libraries/common.inc.php use "require" but not "require _once". this file will be used frequently, so use "require _once" is better. I was thinking that there must be some special reason.
It is normally included just once, so there is no reason to check this. However with testsuite this gets more complicated...
The original motivation for using just require instead of require_once was performance, because require_once was pretty inefficient before some of the more recent versions of PHP.
Thanks Michal. I agree with you that using "require" is for performance. and it is working for most cases. On our page (server_status.php), It is working well, so it is not a problem here.
Indeed it i, because it loads common.inc.php just once.
but you also mentioned that "However with testsuite this gets more complicated...". I think there must be somewhere include the file: 'libraries/common.inc.php' so the testing of pages which include 'libraries/common.inc.php'; will fail due to require_once issue.
I'd just go with replacing require with require_once everywhere and it should be safe and reportedly there is almost no performance gap in current PHP versions. -- Michal Čihař | http://cihar.com | http://blog.cihar.com

Hi Michal,
Dne Fri, 17 May 2013 22:30:03 +0800 adam <adamgsoc2013@gmail.com> napsal(a):
I agree with you about that. But I don't know why the file libraries/common.inc.php use "require" but not "require _once". this file will be used frequently, so use "require _once" is better. I was thinking that there must be some special reason.
It is normally included just once, so there is no reason to check this. However with testsuite this gets more complicated...
Is there some tips that we can overcome the "Redefine error" in order to add test case for some classes requires libraries/common.inc.php https://travis-ci.org/phpmyadmin/phpmyadmin/jobs/7223416 https://github.com/phpmyadmin/phpmyadmin/pull/394 I think I should have more investigations into it.
The original motivation for using just require instead of require_once was performance, because require_once was pretty inefficient before some of the more recent versions of PHP.
Adam

Hi Dne Thu, 16 May 2013 15:50:32 +0200 Dieter Adriaenssens <dieter.adriaenssens@gmail.com> napsal(a):
2013/5/9 Michal Čihař <michal@cihar.com>:
Hi all
I've just updated our wiki to include more detailed guide how to deal with merging po files:
https://wiki.phpmyadmin.net/pma/Git#Merging_translations
Please use that, otherwise po files in master will get corrupted as seen quite often recently. It is nearly impossible to do proper merge with them as the branches diverge.
So, to be sure, this means that this guidelines needs to be followed on every merge from QA_* to master? I guess it only applies if there are changed po files, but to be sure there, you would have to check anyway with the first part of the guidelines?
Yes, to be safe, always check :-). -- Michal Čihař | http://cihar.com | http://phpmyadmin.net

On Thu, May 9, 2013 at 8:28 AM, Michal Čihař <michal@cihar.com> wrote:
Hi all
I've just updated our wiki to include more detailed guide how to deal with merging po files:
https://wiki.phpmyadmin.net/pma/Git#Merging_translations
Please use that, otherwise po files in master will get corrupted as seen quite often recently. It is nearly impossible to do proper merge with them as the branches diverge.
from what I understand you are just discarding any changes to the po files in the qa branches right?

Hi Dne Sun, 19 May 2013 14:25:03 +0200 Mohamed Ashraf <mohamed.ashraf.213@gmail.com> napsal(a):
On Thu, May 9, 2013 at 8:28 AM, Michal Čihař <michal@cihar.com> wrote:
Hi all
I've just updated our wiki to include more detailed guide how to deal with merging po files:
https://wiki.phpmyadmin.net/pma/Git#Merging_translations
Please use that, otherwise po files in master will get corrupted as seen quite often recently. It is nearly impossible to do proper merge with them as the branches diverge.
from what I understand you are just discarding any changes to the po files in the qa branches right?
Yes and no. The translation changes are done in both branches by Weblate (tool we use for translations), but the po files are quite different, so it's not easy to merge them. -- Michal Čihař | http://cihar.com | http://blog.cihar.com
participants (7)
-
adam
-
Dieter Adriaenssens
-
Marc Delisle
-
Michal Čihař
-
Mohamed Ashraf
-
Talha Masood
-
xmujay@gmail.com