The branch, master has been updated via 0c4bdbd6a365aabd25e010b489618b2fd291c684 (commit) via 8362f239d3ee646b1436214a1a9feb050ea503dd (commit) via 8ebf6a84a611f84d36e2622e9e09b96915856b2a (commit) via 776fcb5e92f44ff2eb7cd91277aea4ce819cb1a7 (commit) via e86406b07704b42cdb43e6d74c31c0ec1f709cb2 (commit) via 9ed8cac1e86ed2045e064337ebcf201f9544f515 (commit) via 95c6b73e93b9a835cd4b5f231eca6baf1555a030 (commit) via e7449bf03105ba264de79619e67d6f94e7ac659e (commit) via 6c163b387a31e6c42d2c8144277b91a0ffe19d7d (commit) via c47e4b094e5f7fec8ac622c3e1f635264d48a724 (commit) via 0f2e7523626ceb3c94fd65ee2e191d5c317f2617 (commit) via 3231dea753e942da47ced42cbba39d3b2b1d9866 (commit) via e68a073c1352a6ba727d3fb94dcaf9b494e5e811 (commit) via bed81090ba6f24986db33316273a9d041af3aab1 (commit) from f61497f9f6edb9538385a09e729bb9fcfae1d7c4 (commit) - Log ----------------------------------------------------------------- commit 0c4bdbd6a365aabd25e010b489618b2fd291c684 Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 19:22:02 2012 +0100 Move git RSS link to github commit 8362f239d3ee646b1436214a1a9feb050ea503dd Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 19:08:46 2012 +0100 It seems we have even more po files commit 8ebf6a84a611f84d36e2622e9e09b96915856b2a Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 19:04:55 2012 +0100 Explicitely mention that phpmyadmin is the repository most people want commit 776fcb5e92f44ff2eb7cd91277aea4ce819cb1a7 Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 19:03:50 2012 +0100 Replace sf.net git stats with the ones from github commit e86406b07704b42cdb43e6d74c31c0ec1f709cb2 Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 18:46:26 2012 +0100 Use github for checking out the sources commit 9ed8cac1e86ed2045e064337ebcf201f9544f515 Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 18:45:27 2012 +0100 Use github in link for translators commit 95c6b73e93b9a835cd4b5f231eca6baf1555a030 Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 18:43:13 2012 +0100 Make DOAP point to github commit e7449bf03105ba264de79619e67d6f94e7ac659e Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 18:41:59 2012 +0100 Make links on security announcements point to github commit 6c163b387a31e6c42d2c8144277b91a0ffe19d7d Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 18:40:02 2012 +0100 Fix clone command commit c47e4b094e5f7fec8ac622c3e1f635264d48a724 Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 18:39:07 2012 +0100 Add missing .git suffix commit 0f2e7523626ceb3c94fd65ee2e191d5c317f2617 Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 18:38:57 2012 +0100 Fix vcs-* headers commit 3231dea753e942da47ced42cbba39d3b2b1d9866 Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 18:37:48 2012 +0100 Avoid hardcoding path to git repo commit e68a073c1352a6ba727d3fb94dcaf9b494e5e811 Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 18:35:13 2012 +0100 Fix git template for github commit bed81090ba6f24986db33316273a9d041af3aab1 Author: Michal Čihař <michal@cihar.com> Date: Mon Feb 6 18:26:43 2012 +0100 Cache results of translation stats ----------------------------------------------------------------------- Summary of changes: render.py | 19 ++++++++++++++----- templates/_gitdl.tpl | 4 ++-- templates/_page.tpl | 4 ++-- templates/devel.tpl | 10 +++++++--- templates/index.tpl | 2 +- templates/phpmyadmin-doap.xml.tpl | 4 ++-- templates/security/_page.tpl | 6 +++--- templates/translate.tpl | 2 +- 8 files changed, 32 insertions(+), 19 deletions(-) diff --git a/render.py b/render.py index b630e84..c075dbe 100755 --- a/render.py +++ b/render.py @@ -85,9 +85,9 @@ PROJECT_FILES_RSS = 'https://sourceforge.net/api/file/index/project-id/%d/rss' % PROJECT_NEWS_RSS = 'https://sourceforge.net/export/rss2_projnews.php?group_id=%d&rss_fulltext=1&...' % PROJECT_ID PROJECT_SUMMARY_RSS = 'https://sourceforge.net/export/rss2_projsummary.php?group_id=%d' % PROJECT_ID DONATIONS_RSS = 'https://sourceforge.net/export/rss2_projdonors.php?group_id=%d&limit=20' % PROJECT_ID -PROJECT_VCS_RSS = 'http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin...' +PROJECT_VCS_RSS = 'https://github.com/phpmyadmin/phpmyadmin/commits/master.atom' PROJECT_DL = 'http://prdownloads.sourceforge.net/%s/%%s' % PROJECT_NAME -PROJECT_GIT = 'git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin' +PROJECT_GIT = 'git://github.com/phpmyadmin/phpmyadmin.git' PLANET_RSS = 'http://planet.phpmyadmin.net/rss20.xml' RSS_CZ = 'http://phpmyadmin.cz/rss.xml' RSS_RU = 'http://php-myadmin.ru/rss/news.xml' @@ -906,6 +906,7 @@ class SFGenerator: Receives translation stats from external server and parses it. ''' helper.log.dbg('Processing translation stats...') + storage = helper.cache.Cache() self.data['translations'] = [] list = self.git.langtree.keys() list.sort() @@ -913,8 +914,14 @@ class SFGenerator: if name[-3:] != '.po': continue lang = name[:-3] + cache_key = 'trans-%s' % lang + try: + self.data['translations'].append(storage.get(cache_key)) + continue + except: + pass longlang = data.langnames.MAP[lang] - po = polib.pofile('cache/git___phpmyadmin.git.sourceforge.net_gitroot_phpmyadmin_phpmyadmin/po/%s' % name) + po = polib.pofile(os.path.join(self.git.dirname, 'po', name)) helper.log.dbg(' - %s [%s]' % (lang, longlang)) gitlog = self.git.repo.log(path = 'po/%s' % name) langs = '%s|%s' % (lang, longlang) @@ -937,14 +944,16 @@ class SFGenerator: dt = datetime.datetime(*found.committed_date[:6]) except (TypeError, AttributeError): dt = '' - self.data['translations'].append({ + translation = { 'name': longlang, 'short': lang, 'translated': translated, 'percent': '%0.1f' % percent, 'updated': dt, 'css': css, - }) + } + storage.set(cache_key, translation) + self.data['translations'].append(translation) def fetch_data(self): ''' diff --git a/templates/_gitdl.tpl b/templates/_gitdl.tpl index e3b48c4..ac9af74 100644 --- a/templates/_gitdl.tpl +++ b/templates/_gitdl.tpl @@ -2,9 +2,9 @@ <p> Git repositories are located at -<code>git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/REPONAME</code> and you +<code>git://github.com/phpmyadmin/REPONAME.git</code> and you can browse them online using <a -href="http://phpmyadmin.git.sourceforge.net/">Git web</a>. +href="http://github.com/phpmyadmin/">github</a>. </p> </html> diff --git a/templates/_page.tpl b/templates/_page.tpl index 48755d1..82102c5 100644 --- a/templates/_page.tpl +++ b/templates/_page.tpl @@ -14,8 +14,8 @@ <link rel="stylesheet" type="text/css" href="${base_url}css/slimbox.css" media="screen" /> <link rel="shortcut icon" href="${base_url}favicon.ico" type="image/x-icon" /> <link rel="icon" href="${base_url}favicon.ico" type="image/x-icon" /> - <link rel="vcs-git" href="git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin" title="phpMyAdmin Git repository" /> - <link rel="vcs-browse" href="http://phpmyadmin.git.sourceforge.net/" title="phpMyAdmin Git repository browser" /> + <link rel="vcs-git" href="git://github.com/phpmyadmin/phpmyadmin.git" title="phpMyAdmin Git repository" /> + <link rel="vcs-browse" href="http://github.com/phpmyadmin/" title="phpMyAdmin Git repository browser" /> <link href="https://plus.google.com/112870346549275765217/" rel="publisher" /> <script src="${base_url}js/mootools.js" type="text/javascript"></script> <script src="${base_url}js/mootools-more.js" type="text/javascript"></script> diff --git a/templates/devel.tpl b/templates/devel.tpl index 7e18f9d..4176b2a 100644 --- a/templates/devel.tpl +++ b/templates/devel.tpl @@ -46,7 +46,11 @@ jobs</a> where you can find some tips where to look. <xi:include href="_gitdl.tpl" /> <p> -You want to start with the <code>phpmyadmin</code> repository. +You are most likely interested in the <code>phpmyadmin</code> repository, which +contains phpMyAdmin itself. +</p> + +<p> Full list of repositories include: </p> @@ -66,7 +70,7 @@ Examples of how to checkout phpMyAdmin code: <pre> # Latest development version: -git clone git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin +git clone git://github.com/phpmyadmin/phpmyadmin.git </pre> <h3>Repository Statistics</h3> @@ -74,7 +78,7 @@ git clone git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin <ul> <li><a href="http://cia.vc/stats/project/phpmyadmin/">CIA.vc</a></li> <li><a href="http://www.ohloh.net/projects/phpmyadmin">Ohloh</a></li> -<li><a href="https://sourceforge.net/project/stats/detail.php?group_id=23067&ugn=phpmyadmin&type=git">SourceForge.net</a></li> +<li><a href="https://github.com/phpmyadmin/">github</a></li> </ul> <h3>Coding Standards</h3> diff --git a/templates/index.tpl b/templates/index.tpl index b9d9ba8..dd63846 100644 --- a/templates/index.tpl +++ b/templates/index.tpl @@ -46,7 +46,7 @@ Effective MySQL Management</a>, which is available in English, Czech and Spanish <p> To ease usage to a wide range of people, phpMyAdmin is translated into <a -href="${base_url}translations.${file_ext}">62 languages</a> and supports both LTR +href="${base_url}translations.${file_ext}">65 languages</a> and supports both LTR and RTL languages. </p> diff --git a/templates/phpmyadmin-doap.xml.tpl b/templates/phpmyadmin-doap.xml.tpl index 916c3c9..baa3ece 100644 --- a/templates/phpmyadmin-doap.xml.tpl +++ b/templates/phpmyadmin-doap.xml.tpl @@ -30,8 +30,8 @@ </developer> <repository> <GitRepository> - <location rdf:resource="git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin" /> - <browse rdf:resource="http://phpmyadmin.git.sourceforge.net/" /> + <location rdf:resource="git://github.com/phpmyadmin/phpmyadmin.git" /> + <browse rdf:resource="http://github.com/phpmyadmin/" /> </GitRepository> </repository> <py:for each="release in releases_featured"> diff --git a/templates/security/_page.tpl b/templates/security/_page.tpl index 30e202f..da97e42 100644 --- a/templates/security/_page.tpl +++ b/templates/security/_page.tpl @@ -73,7 +73,7 @@ <p>Following commits have been made to fix this issue:</p> <ul> <py:for each="hash in announcement_commits().next()[1].strip().split('\n')"> - <li><a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin;a=commitdiff;h=${hash}">${hash}</a></li> + <li><a href="https://github.com/phpmyadmin/phpmyadmin/commit/${hash}">${hash}</a></li> </py:for> </ul> </py:if> @@ -82,7 +82,7 @@ <p>Following commits have been made on 3.3 branch to fix this issue:</p> <ul> <py:for each="hash in announcement_commits_3_3().next()[1].strip().split('\n')"> - <li><a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin;a=commitdiff;h=${hash}">${hash}</a></li> + <li><a href="https://github.com/phpmyadmin/phpmyadmin/commit/${hash}">${hash}</a></li> </py:for> </ul> </py:if> @@ -91,7 +91,7 @@ <p>Following commits have been made on 2.11 branch to fix this issue:</p> <ul> <py:for each="hash in announcement_commits_2_11().next()[1].strip().split('\n')"> - <li><a href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/phpmyadmin;a=commitdiff;h=${hash}">${hash}</a></li> + <li><a href="https://github.com/phpmyadmin/phpmyadmin/commit/{hash}">${hash}</a></li> </py:for> </ul> </py:if> diff --git a/templates/translate.tpl b/templates/translate.tpl index 1d4f2e0..80916dc 100644 --- a/templates/translate.tpl +++ b/templates/translate.tpl @@ -20,7 +20,7 @@ detailed documentation can be found on our <a href="http://wiki.phpmyadmin.net/p Documentation is being translated using po4a and gettext (see <a href="${base_url}docs.${file_ext}">documentation</a> for existing translations). To start, checkout <code><a -href="http://phpmyadmin.git.sourceforge.net/git/gitweb.cgi?p=phpmyadmin/localized_docs;a=tree;f=po">localized_docs/po</a></code> from Git, or +href="http://github.com/phpmyadmin/localized_docs/tree/master/po">localized_docs/po</a></code> from Git, or just go to <a href="https://l10n.cihar.com/projects/pmadoc/">translation server</a> and translate it online. If your language is missing, just contact <a href="mailto:michal@cihar.com">Michal Čihař</a>, he will add it. If you hooks/post-receive -- phpMyAdmin website