Hi all
I should have announced it earlier (as the repository migration went as planned), however I somehow got focused to migrating other tools meanwhile so the announcement comes now.
So yes, everything is in Git now and the Subversion repository is in read-only mode.
Please check if something is not broken, I might have missed something.
Things which should work without problems:
- demo server - daily snapshots - website, translation stats,... - creating releases [1]
For using Git, please follow instructions in wiki [2]. Especially working properly with more branches can save you lot of work.
[1]: As I added there some improvements, I also started documentation for release process (which is far from being complete right now) on wiki: http://wiki.phpmyadmin.net/pma/Devel:Releasing
[2]: http://wiki.phpmyadmin.net/pma/Devel:Git
Hi
I also set up mirroring of the repositories on repo.or.cz. It is read only mirror, but in case SF.net will have any troubles, there will be always up to date copy available:
http://repo.or.cz/w/phpmyadmin.git http://repo.or.cz/w/phpmyadmin-website.git http://repo.or.cz/w/phpmyadmin-localized-docs.git
...and so on
Hi,
how can I make new (empty) branch for template-based?
With the new branch some directrories, libraries and some new things have to been changed or added.
I'm planning to use MVC, we should programm our own, with the template-based branch, cause some things I've rewritten for this branch. I don't really want port duplicated code-snipps to the new branch.
I know it would be hard work ... but I will do.
Michael
Am 11.03.2010 22:06, schrieb Michal Čihař:
Hi
I also set up mirroring of the repositories on repo.or.cz. It is read only mirror, but in case SF.net will have any troubles, there will be always up to date copy available:
http://repo.or.cz/w/phpmyadmin.git http://repo.or.cz/w/phpmyadmin-website.git http://repo.or.cz/w/phpmyadmin-localized-docs.git
...and so on
Download Intel® Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev
Phpmyadmin-devel mailing list Phpmyadmin-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
Michael Keck a écrit :
Hi,
how can I make new (empty) branch for template-based?
With the new branch some directrories, libraries and some new things have to been changed or added.
I'm planning to use MVC, we should programm our own, with the template-based branch, cause some things I've rewritten for this branch. I don't really want port duplicated code-snipps to the new branch.
I know it would be hard work ... but I will do.
Michael
Hi Michael,
I don't think it's a good idea to start an empty branch, as the history of previous files has to follow.
What I suggest is:
git checkout master git checkout -b michael-template
This will create your local branch. I think that when you want to push this to sf.net, you would do
git push origin michael-template
Marc Delisle a écrit :
Michael Keck a écrit :
Hi,
how can I make new (empty) branch for template-based?
With the new branch some directrories, libraries and some new things have to been changed or added.
I'm planning to use MVC, we should programm our own, with the template-based branch, cause some things I've rewritten for this branch. I don't really want port duplicated code-snipps to the new branch.
Michael, however, don't you feel that you should plan this with the rest of the team, especially now that we have many things on the plate:
- the impending merge of gettext stuff by Michal - GSoC 2010 (AJAX, jQuery, etc)
At the minimum, are there other persons in the team that want to follow you *now* in this direction?
P.S. In a previous post about MVC and Rasmus's ideas, I wrote:
"I believe that we should take these ideas into account while discussing any MVC move for phpMyAdmin."
Hi Marc,
Am 22.03.2010 19:42, schrieb Marc Delisle:
Marc Delisle a écrit :
Michael Keck a écrit :
Hi,
how can I make new (empty) branch for template-based?
With the new branch some directrories, libraries and some new things have to been changed or added.
I'm planning to use MVC, we should programm our own, with the template-based branch, cause some things I've rewritten for this branch. I don't really want port duplicated code-snipps to the new branch.
Michael, however, don't you feel that you should plan this with the rest of the team,
of course ... it was only a question or a suggested plan ;) but *not* a prescribed and/or fixed plan.
especially now that we have many things on the plate:
- the impending merge of gettext stuff by Michal
okay ... I guess, and I will *not* ignore this point.
- GSoC 2010 (AJAX, jQuery, etc)
This was the point why I asked
At the minimum, are there other persons in the team that want to follow you *now* in this direction?
I hope ;)
P.S. In a previous post about MVC and Rasmus's ideas, I wrote:
"I believe that we should take these ideas into account while discussing any MVC move for phpMyAdmin."
Okay, making a template based version of phpMyAdmin is not a whole MVC but a step closer to it. Because with template based version I've a controller (the template engine), a view (the skin (template) files) and the current php-code as model. Or I'm wrong?
Michael
Michael Keck a écrit :
Hi Marc,
Am 22.03.2010 19:42, schrieb Marc Delisle:
Marc Delisle a écrit :
Michael Keck a écrit :
> Hi, > > how can I make new (empty) branch for template-based? > > With the new branch some directrories, libraries and some > new things have to been changed or added. > > I'm planning to use MVC, we should programm our own, > with the template-based branch, cause some things I've > rewritten for this branch. I don't really want port duplicated > code-snipps to the new branch.
Michael, however, don't you feel that you should plan this with the rest of the team,
of course ... it was only a question or a suggested plan ;) but *not* a prescribed and/or fixed plan.
especially now that we have many things on the plate:
- the impending merge of gettext stuff by Michal
okay ... I guess, and I will *not* ignore this point.
- GSoC 2010 (AJAX, jQuery, etc)
This was the point why I asked
At the minimum, are there other persons in the team that want to follow you *now* in this direction?
I hope ;)
P.S. In a previous post about MVC and Rasmus's ideas, I wrote:
"I believe that we should take these ideas into account while discussing any MVC move for phpMyAdmin."
Okay, making a template based version of phpMyAdmin is not a whole MVC but a step closer to it. Because with template based version I've a controller (the template engine), a view (the skin (template) files) and the current php-code as model. Or I'm wrong?
Michael
Michael,
in the previous discussion about templates, I wrote:
I would really like to see a small test -- say, just one phpMyAdmin small file translated into Twig.
and Michal wrote:
I think it is great idea to convert some simple page to use template engine. At least we will get an idea what to expect and how big amount of work it is.
Are you still planning to use Twig?
Are you preparing a small test as discussed?
Did it work well to create your branch in *your* repository?
Hi Marc,
Am 22.03.2010 21:38, schrieb Marc Delisle:
Michael,
in the previous discussion about templates, I wrote:
I would really like to see a small test -- say, just one phpMyAdmin small file translated into Twig.
and Michal wrote:
I think it is great idea to convert some simple page to use template engine. At least we will get an idea what to expect and how big amount of work it is.
Are you still planning to use Twig?
Yes. If somebody think it would be not a good idea to use Twig, please let me know. As an alternative I've learned Dwoo (nearly same syntax as smarty) too.
Are you preparing a small test as discussed?
Yes.
Did it work well to create your branch in *your* repository?
At my local development environment yes, but with a dummy template and a dummy function.
At moment I'm busy, 'cause I've to release a complete new admin-tool for my chefs. I should release next week before easter.
After easter I will commit the first, I think it's the main.php or the navigiation.php as template based into my branch.
Hi
Dne Mon, 22 Mar 2010 14:42:10 -0400 Marc Delisle marc@infomarc.info napsal(a):
however, don't you feel that you should plan this with the rest of the team, especially now that we have many things on the plate:
- the impending merge of gettext stuff by Michal
The good thing about this is that it almost does not touch the code. Also I hope to merge it this week (last week I failed to verify correctness of conversion from php to gettext translations for all languages).
Michal Čihař a écrit :
Hi
Dne Mon, 22 Mar 2010 14:42:10 -0400 Marc Delisle marc@infomarc.info napsal(a):
however, don't you feel that you should plan this with the rest of the team, especially now that we have many things on the plate:
- the impending merge of gettext stuff by Michal
The good thing about this is that it almost does not touch the code. Also I hope to merge it this week (last week I failed to verify correctness of conversion from php to gettext translations for all languages).
So this is phase 1, and there will be a phase 2 where all the $strXXX variables will be replaced, correct?
Dne Mon, 22 Mar 2010 21:06:00 -0400 Marc Delisle marc@infomarc.info napsal(a):
Michal Čihař a écrit :
Hi
Dne Mon, 22 Mar 2010 14:42:10 -0400 Marc Delisle marc@infomarc.info napsal(a):
however, don't you feel that you should plan this with the rest of the team, especially now that we have many things on the plate:
- the impending merge of gettext stuff by Michal
The good thing about this is that it almost does not touch the code. Also I hope to merge it this week (last week I failed to verify correctness of conversion from php to gettext translations for all languages).
So this is phase 1, and there will be a phase 2 where all the $strXXX variables will be replaced, correct?
Which can be done slowly and not invasively as is really not required right now.
Michal Čihař a écrit :
Dne Mon, 22 Mar 2010 21:06:00 -0400 Marc Delisle marc@infomarc.info napsal(a):
Michal Čihař a écrit :
Hi
Dne Mon, 22 Mar 2010 14:42:10 -0400 Marc Delisle marc@infomarc.info napsal(a):
however, don't you feel that you should plan this with the rest of the team, especially now that we have many things on the plate:
- the impending merge of gettext stuff by Michal
The good thing about this is that it almost does not touch the code. Also I hope to merge it this week (last week I failed to verify correctness of conversion from php to gettext translations for all languages).
So this is phase 1, and there will be a phase 2 where all the $strXXX variables will be replaced, correct?
Which can be done slowly and not invasively as is really not required right now.
This means that we have to keep (for some time) the /lang and /po directories. But how will the translators know which one to update? In the wiki you tell them to use https://l10n.cihar.com/.
Hi
Dne Tue, 23 Mar 2010 12:58:36 -0400 Marc Delisle marc@infomarc.info napsal(a):
This means that we have to keep (for some time) the /lang and /po directories. But how will the translators know which one to update? In the wiki you tell them to use https://l10n.cihar.com/.
No, the strXXX values are filled in by gettext, so the only source for translations are po files.
Michal Čihař a écrit :
Hi
Dne Tue, 23 Mar 2010 12:58:36 -0400 Marc Delisle marc@infomarc.info napsal(a):
This means that we have to keep (for some time) the /lang and /po directories. But how will the translators know which one to update? In the wiki you tell them to use https://l10n.cihar.com/.
No, the strXXX values are filled in by gettext, so the only source for translations are po files.
Ok, I just noticed libraries/messages.inc.php. So when the gettext branch is merged to master, /lang disappears.
I guess we could mechanically transform $strXXX messages into their __('XXX') equivalent, in all scripts?
Dne Wed, 24 Mar 2010 17:04:49 -0400 Marc Delisle marc@infomarc.info napsal(a):
Michal Čihař a écrit :
Hi
Dne Tue, 23 Mar 2010 12:58:36 -0400 Marc Delisle marc@infomarc.info napsal(a):
This means that we have to keep (for some time) the /lang and /po directories. But how will the translators know which one to update? In the wiki you tell them to use https://l10n.cihar.com/.
No, the strXXX values are filled in by gettext, so the only source for translations are po files.
Ok, I just noticed libraries/messages.inc.php. So when the gettext branch is merged to master, /lang disappears.
I guess we could mechanically transform $strXXX messages into their __('XXX') equivalent, in all scripts?
Yes, the problem is that in several places strXXX is constructed dynamically.
-
Marc Delisle -
Michael Keck -
Michal Čihař