Git March 2010

git@phpmyadmin.net

4 participants
212 discussions

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-915-g968f1f9

by Michal Čihař

The branch, master has been updated via 968f1f9d2da9bfcfcd7c8119222f9ebf5eba011b (commit) via a78fc120480240f8bbd7492b250215530978c396 (commit) from a5c73c5a9a9eb6e18b7aa1f9a3fe429ed80a05b8 (commit) - Log ----------------------------------------------------------------- commit 968f1f9d2da9bfcfcd7c8119222f9ebf5eba011b Merge: a5c73c5a9a9eb6e18b7aa1f9a3fe429ed80a05b8 a78fc120480240f8bbd7492b250215530978c396 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 13:27:16 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: libraries/Table.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index 9e80660..81184a9 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -248,7 +248,7 @@ class PMA_Table * @return boolean true if it is a merge table * @access public */ - public function isMerge($db = null, $table = null) + static public function isMerge($db = null, $table = null) { // if called static, with parameters if (! empty($db) && ! empty($table)) { hooks/post-receive -- phpMyAdmin

14 years, 3 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-78-ga78fc12

by Michal Čihař

The branch, QA_3_3 has been updated via a78fc120480240f8bbd7492b250215530978c396 (commit) from a4ca1638e95cb7892c878394440a103d015be6fa (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: libraries/Table.class.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libraries/Table.class.php b/libraries/Table.class.php index de2cfe2..ceed355 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -248,7 +248,7 @@ class PMA_Table * @return boolean true if it is a merge table * @access public */ - public function isMerge($db = null, $table = null) + static public function isMerge($db = null, $table = null) { // if called static, with parameters if (! empty($db) && ! empty($table)) { hooks/post-receive -- phpMyAdmin

14 years, 3 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-913-ga5c73c5

by Michal Čihař

The branch, master has been updated via a5c73c5a9a9eb6e18b7aa1f9a3fe429ed80a05b8 (commit) via a4ca1638e95cb7892c878394440a103d015be6fa (commit) from e68305febd52c7d357a02d21b273423887d2783f (commit) - Log ----------------------------------------------------------------- commit a5c73c5a9a9eb6e18b7aa1f9a3fe429ed80a05b8 Merge: e68305febd52c7d357a02d21b273423887d2783f a4ca1638e95cb7892c878394440a103d015be6fa Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 13:06:53 2010 +0200 Merge branch 'QA_3_3' ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + pdf_schema.php | 56 ++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a1717f..b1243f1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2972232 [menu] Import menu tab not present on main page - patch #2976790 [menu] Go to the upper level after table DROP, thanks to Kaarel Nummert - kaarelnu +- patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/pdf_schema.php b/pdf_schema.php index 1e81c3b..99a9b33 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -510,8 +510,19 @@ class PMA_RT_Table { var $height_cell = 6; var $x, $y; var $primary = array(); + var $show_info = false; /** + * Returns title of the current table, + * title can have the dimensions of the table + * + * @access private + */ + function getTitle() + { + return ($this->show_info ? sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->height) : '') . ' ' . $this->table_name; + } // end of the "getTitle" function + /** * Sets the width of the table * * @param integer $ The font size @@ -521,8 +532,6 @@ class PMA_RT_Table { */ function PMA_RT_Table_setWidth($ff) { - // this looks buggy to me... does it really work if - // there are fields that require wider cells than the name of the table? global $pdf; foreach ($this->fields AS $field) { @@ -530,7 +539,11 @@ class PMA_RT_Table { } $this->width += $pdf->GetStringWidth(' '); $pdf->SetFont($ff, 'B'); - $this->width = max($this->width, $pdf->GetStringWidth(' ' . $this->table_name)); + // it is unknown what value must be added, because + // table title is affected by the tabe width value + while ($this->width < $pdf->GetStringWidth($this->getTitle())) { + $this->width += 5; + } $pdf->SetFont($ff, ''); } // end of the "PMA_RT_Table_setWidth()" method /** @@ -545,7 +558,6 @@ class PMA_RT_Table { /** * Do draw the table * - * @param boolean $ Whether to display table position or not * @param integer $ The font size * @param boolean $ Whether to display color * @param integer $ The max. with among tables @@ -553,7 +565,7 @@ class PMA_RT_Table { * @access private * @see PMA_PDF */ - function PMA_RT_Table_draw($show_info, $ff, $setcolor = 0) + function PMA_RT_Table_draw($ff, $setcolor = 0) { global $pdf, $with_doc; @@ -569,11 +581,7 @@ class PMA_RT_Table { $pdf->PMA_links['doc'][$this->table_name]['-'] = ''; } - if ($show_info) { - $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->height) . ' ' . $this->table_name, 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); - } else { - $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, $this->table_name, 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); - } + $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, $this->getTitle(), 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); $pdf->PMA_PDF_setXScale($this->x); $pdf->SetFont($ff, ''); $pdf->SetTextColor(0); @@ -608,6 +616,8 @@ class PMA_RT_Table { * @param string $ The table name * @param integer $ The font size * @param integer $ The max. with among tables + * @param boolean $ Whether to display keys or not + * @param boolean $ Whether to display table position or not * @global object The current PDF document * @global integer The current page number (from the * $cfg['Servers'][$i]['table_coords'] table) @@ -617,7 +627,7 @@ class PMA_RT_Table { * @see PMA_PDF, PMA_RT_Table::PMA_RT_Table_setWidth, PMA_RT_Table::PMA_RT_Table_setHeight */ - function __construct($table_name, $ff, &$same_wide_width, $show_keys) + function __construct($table_name, $ff, &$same_wide_width, $show_keys = false, $show_info = false) { global $pdf, $pdf_page_number, $cfgRelation, $db; @@ -641,9 +651,14 @@ class PMA_RT_Table { $this->fields[] = $row[0]; } } + + $this->show_info = $show_info; + // height and width - $this->PMA_RT_Table_setWidth($ff); $this->PMA_RT_Table_setHeight(); + // setWidth must me after setHeight, because title + // can include table height which changes table width + $this->PMA_RT_Table_setWidth($ff); if ($same_wide_width < $this->width) { $same_wide_width = $this->width; } @@ -847,17 +862,18 @@ class PMA_RT { * @param string $ The relation field in the master table * @param string $ The foreign table name * @param string $ The relation field in the foreign table + * @param boolean $ Whether to display table position or not * @access private * @see PMA_RT_setMinMax */ - function PMA_RT_addRelation($master_table, $master_field, $foreign_table, $foreign_field) + function PMA_RT_addRelation($master_table, $master_field, $foreign_table, $foreign_field, $show_info) { if (!isset($this->tables[$master_table])) { - $this->tables[$master_table] = new PMA_RT_Table($master_table, $this->ff, $this->tablewidth); + $this->tables[$master_table] = new PMA_RT_Table($master_table, $this->ff, $this->tablewidth, false, $show_info); $this->PMA_RT_setMinMax($this->tables[$master_table]); } if (!isset($this->tables[$foreign_table])) { - $this->tables[$foreign_table] = new PMA_RT_Table($foreign_table, $this->ff, $this->tablewidth); + $this->tables[$foreign_table] = new PMA_RT_Table($foreign_table, $this->ff, $this->tablewidth, false, $show_info); $this->PMA_RT_setMinMax($this->tables[$foreign_table]); } $this->relations[] = new PMA_RT_Relation($this->tables[$master_table], $master_field, $this->tables[$foreign_table], $foreign_field); @@ -915,10 +931,10 @@ class PMA_RT { * @access private * @see PMA_RT_Table::PMA_RT_Table_draw() */ - function PMA_RT_drawTables($show_info, $draw_color = 0) + function PMA_RT_drawTables($draw_color = 0) { foreach ($this->tables AS $table) { - $table->PMA_RT_Table_draw($show_info, $this->ff, $draw_color); + $table->PMA_RT_Table_draw($this->ff, $draw_color); } } // end of the "PMA_RT_drawTables()" method /** @@ -1026,7 +1042,7 @@ class PMA_RT { foreach ($alltables AS $table) { if (!isset($this->tables[$table])) { - $this->tables[$table] = new PMA_RT_Table($table, $this->ff, $this->tablewidth, $show_keys); + $this->tables[$table] = new PMA_RT_Table($table, $this->ff, $this->tablewidth, $show_keys, $show_info); } if ($this->same_wide) { @@ -1071,7 +1087,7 @@ class PMA_RT { // (do not use array_search() because we would have to // to do a === FALSE and this is not PHP3 compatible) if (in_array($rel['foreign_table'], $alltables)) { - $this->PMA_RT_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field']); + $this->PMA_RT_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field'], $show_info); } } // end while } // end if @@ -1089,7 +1105,7 @@ class PMA_RT { $this->PMA_RT_drawRelations($change_color); } - $this->PMA_RT_drawTables($show_info, $change_color); + $this->PMA_RT_drawTables($change_color); $this->PMA_RT_showRt(); } // end of the "PMA_RT()" method hooks/post-receive -- phpMyAdmin

14 years, 3 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_1RC1-77-ga4ca163

by Michal Čihař

The branch, QA_3_3 has been updated via a4ca1638e95cb7892c878394440a103d015be6fa (commit) from 589504fe8a423b794797f72cf61b60fc8b770b3e (commit) - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: ChangeLog | 1 + pdf_schema.php | 56 ++++++++++++++++++++++++++++++++++++-------------------- 2 files changed, 37 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 807fe76..f4da7a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2972232 [menu] Import menu tab not present on main page - patch #2976790 [menu] Go to the upper level after table DROP, thanks to Kaarel Nummert - kaarelnu +- patch #2978815 [pdf] Fix generating PDF with table dimensions, thanks to BlinK_ 3.3.1.0 (2010-03-16) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/pdf_schema.php b/pdf_schema.php index 82a07c1..086301a 100644 --- a/pdf_schema.php +++ b/pdf_schema.php @@ -511,8 +511,19 @@ class PMA_RT_Table { var $height_cell = 6; var $x, $y; var $primary = array(); + var $show_info = false; /** + * Returns title of the current table, + * title can have the dimensions of the table + * + * @access private + */ + function getTitle() + { + return ($this->show_info ? sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->height) : '') . ' ' . $this->table_name; + } // end of the "getTitle" function + /** * Sets the width of the table * * @param integer $ The font size @@ -522,8 +533,6 @@ class PMA_RT_Table { */ function PMA_RT_Table_setWidth($ff) { - // this looks buggy to me... does it really work if - // there are fields that require wider cells than the name of the table? global $pdf; foreach ($this->fields AS $field) { @@ -531,7 +540,11 @@ class PMA_RT_Table { } $this->width += $pdf->GetStringWidth(' '); $pdf->SetFont($ff, 'B'); - $this->width = max($this->width, $pdf->GetStringWidth(' ' . $this->table_name)); + // it is unknown what value must be added, because + // table title is affected by the tabe width value + while ($this->width < $pdf->GetStringWidth($this->getTitle())) { + $this->width += 5; + } $pdf->SetFont($ff, ''); } // end of the "PMA_RT_Table_setWidth()" method /** @@ -546,7 +559,6 @@ class PMA_RT_Table { /** * Do draw the table * - * @param boolean $ Whether to display table position or not * @param integer $ The font size * @param boolean $ Whether to display color * @param integer $ The max. with among tables @@ -554,7 +566,7 @@ class PMA_RT_Table { * @access private * @see PMA_PDF */ - function PMA_RT_Table_draw($show_info, $ff, $setcolor = 0) + function PMA_RT_Table_draw($ff, $setcolor = 0) { global $pdf, $with_doc; @@ -570,11 +582,7 @@ class PMA_RT_Table { $pdf->PMA_links['doc'][$this->table_name]['-'] = ''; } - if ($show_info) { - $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, sprintf('%.0f', $this->width) . 'x' . sprintf('%.0f', $this->height) . ' ' . $this->table_name, 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); - } else { - $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, $this->table_name, 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); - } + $pdf->PMA_PDF_cellScale($this->width, $this->height_cell, $this->getTitle(), 1, 1, 'C', $setcolor, $pdf->PMA_links['doc'][$this->table_name]['-']); $pdf->PMA_PDF_setXScale($this->x); $pdf->SetFont($ff, ''); $pdf->SetTextColor(0); @@ -611,6 +619,8 @@ class PMA_RT_Table { * @param string $ The table name * @param integer $ The font size * @param integer $ The max. with among tables + * @param boolean $ Whether to display keys or not + * @param boolean $ Whether to display table position or not * @global object The current PDF document * @global integer The current page number (from the * $cfg['Servers'][$i]['table_coords'] table) @@ -620,7 +630,7 @@ class PMA_RT_Table { * @see PMA_PDF, PMA_RT_Table::PMA_RT_Table_setWidth, PMA_RT_Table::PMA_RT_Table_setHeight */ - function __construct($table_name, $ff, &$same_wide_width, $show_keys) + function __construct($table_name, $ff, &$same_wide_width, $show_keys = false, $show_info = false) { global $pdf, $pdf_page_number, $cfgRelation, $db; @@ -644,9 +654,14 @@ class PMA_RT_Table { $this->fields[] = $row[0]; } } + + $this->show_info = $show_info; + // height and width - $this->PMA_RT_Table_setWidth($ff); $this->PMA_RT_Table_setHeight(); + // setWidth must me after setHeight, because title + // can include table height which changes table width + $this->PMA_RT_Table_setWidth($ff); if ($same_wide_width < $this->width) { $same_wide_width = $this->width; } @@ -850,17 +865,18 @@ class PMA_RT { * @param string $ The relation field in the master table * @param string $ The foreign table name * @param string $ The relation field in the foreign table + * @param boolean $ Whether to display table position or not * @access private * @see PMA_RT_setMinMax */ - function PMA_RT_addRelation($master_table, $master_field, $foreign_table, $foreign_field) + function PMA_RT_addRelation($master_table, $master_field, $foreign_table, $foreign_field, $show_info) { if (!isset($this->tables[$master_table])) { - $this->tables[$master_table] = new PMA_RT_Table($master_table, $this->ff, $this->tablewidth); + $this->tables[$master_table] = new PMA_RT_Table($master_table, $this->ff, $this->tablewidth, false, $show_info); $this->PMA_RT_setMinMax($this->tables[$master_table]); } if (!isset($this->tables[$foreign_table])) { - $this->tables[$foreign_table] = new PMA_RT_Table($foreign_table, $this->ff, $this->tablewidth); + $this->tables[$foreign_table] = new PMA_RT_Table($foreign_table, $this->ff, $this->tablewidth, false, $show_info); $this->PMA_RT_setMinMax($this->tables[$foreign_table]); } $this->relations[] = new PMA_RT_Relation($this->tables[$master_table], $master_field, $this->tables[$foreign_table], $foreign_field); @@ -918,10 +934,10 @@ class PMA_RT { * @access private * @see PMA_RT_Table::PMA_RT_Table_draw() */ - function PMA_RT_drawTables($show_info, $draw_color = 0) + function PMA_RT_drawTables($draw_color = 0) { foreach ($this->tables AS $table) { - $table->PMA_RT_Table_draw($show_info, $this->ff, $draw_color); + $table->PMA_RT_Table_draw($this->ff, $draw_color); } } // end of the "PMA_RT_drawTables()" method /** @@ -1029,7 +1045,7 @@ class PMA_RT { foreach ($alltables AS $table) { if (!isset($this->tables[$table])) { - $this->tables[$table] = new PMA_RT_Table($table, $this->ff, $this->tablewidth, $show_keys); + $this->tables[$table] = new PMA_RT_Table($table, $this->ff, $this->tablewidth, $show_keys, $show_info); } if ($this->same_wide) { @@ -1075,7 +1091,7 @@ class PMA_RT { // (do not use array_search() because we would have to // to do a === FALSE and this is not PHP3 compatible) if (in_array($rel['foreign_table'], $alltables)) { - $this->PMA_RT_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field']); + $this->PMA_RT_addRelation($one_table, $master_field, $rel['foreign_table'], $rel['foreign_field'], $show_info); } } // end while } // end if @@ -1093,7 +1109,7 @@ class PMA_RT { $this->PMA_RT_drawRelations($change_color); } - $this->PMA_RT_drawTables($show_info, $change_color); + $this->PMA_RT_drawTables($change_color); $this->PMA_RT_showRt(); } // end of the "PMA_RT()" method hooks/post-receive -- phpMyAdmin

14 years, 3 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-911-ge68305f

by Michal Čihař

The branch, master has been updated via e68305febd52c7d357a02d21b273423887d2783f (commit) via 0c526a31b5a4b75ebdc023606fa5610baf0fd795 (commit) via f61c1b400afd42b95ab7b36f270e50821e2fb489 (commit) via 2329af48519891bc11471e456b4a4b27e589b86c (commit) via f28b03a66ab2c8e3dbf090c610ee9db5a22e209c (commit) via ef477e96929cca6eb0fa09f5efbd7c619757f5ea (commit) from e7f29a389bc269b72f3cf481c77ae5d15f782775 (commit) - Log ----------------------------------------------------------------- commit e68305febd52c7d357a02d21b273423887d2783f Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 12:25:24 2010 +0200 PMA_langList returns only existing languages, no need to check them again. commit 0c526a31b5a4b75ebdc023606fa5610baf0fd795 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 12:25:15 2010 +0200 Add Telugu definition. commit f61c1b400afd42b95ab7b36f270e50821e2fb489 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 12:24:08 2010 +0200 Fix handling of not defined laguanges. commit 2329af48519891bc11471e456b4a4b27e589b86c Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 12:19:06 2010 +0200 Update Czech translation. commit f28b03a66ab2c8e3dbf090c610ee9db5a22e209c Merge: ef477e96929cca6eb0fa09f5efbd7c619757f5ea e7f29a389bc269b72f3cf481c77ae5d15f782775 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Mar 30 11:32:54 2010 +0200 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin commit ef477e96929cca6eb0fa09f5efbd7c619757f5ea Merge: 6f5fe44324c8d3d6b31b4ab0800d0861ffc96ab1 ee015566416517673a8c1a0fa2bb97f20a2073a9 Author: Michal Čihař <michal(a)cihar.com> Date: Tue Mar 30 11:32:34 2010 +0200 Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin ----------------------------------------------------------------------- Summary of changes: libraries/select_lang.lib.php | 4 +++- po/cs.po | 16 ++++++++-------- setup/frames/index.inc.php | 6 ------ 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php index 50afc0d..be1ce37 100644 --- a/libraries/select_lang.lib.php +++ b/libraries/select_lang.lib.php @@ -288,6 +288,8 @@ function PMA_langDetails($lang) { return array('sr|serbian', 'serbian_cyrillic-utf-8', 'sr', 'Српски'); case 'sv': return array('sv|swedish', 'swedish-utf-8', 'sv', 'Svenska'); + case 'te': + return array('te|telugu', 'telugu-utf-8', 'te', 'తెలుగు'); case 'th': return array('th|thai', 'thai-utf-8', 'th', 'ภาษาไทย'); case 'tr': @@ -305,7 +307,7 @@ function PMA_langDetails($lang) { case 'zh_CN': return array('zh|chinese simplified', 'chinese_simplified-utf-8', 'zh', '中文'); } - return array($lang, $lang, $lang, ''); + return array("$lang|$lang", $lang, $lang); } /** diff --git a/po/cs.po b/po/cs.po index cf12e39..bfa8ada 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-19 00:28+0100\n" -"PO-Revision-Date: 2010-03-29 09:27+0200\n" +"PO-Revision-Date: 2010-03-30 12:18+0200\n" "Last-Translator: Michal <michal(a)cihar.com>\n" "Language-Team: czech <cs(a)li.org>\n" "MIME-Version: 1.0\n" @@ -3486,7 +3486,7 @@ msgstr "Přidat replikačního uživatele pro podřízený server" #: libraries/messages.inc.php:779 #, php-format msgid "Master server changed succesfully to %s" -msgstr "" +msgstr "Nadřízený server bych úspěšně změněn na %s" #: libraries/messages.inc.php:780 msgid "This server is configured as master in a replication process." @@ -5074,11 +5074,11 @@ msgstr "Povolit přihlašování uživatele root" #: libraries/messages.inc.php:1120 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth" -msgstr "" +msgstr "Název pro zobrazení při HTTP autentizace" #: libraries/messages.inc.php:1121 msgid "HTTP Realm" -msgstr "" +msgstr "HTTP doméma" #: libraries/messages.inc.php:1122 msgid "" @@ -5120,7 +5120,7 @@ msgid "" "Leave blank for no column comments/mime types, suggested: [kbd]" "pma_column_info[/kbd]" msgstr "" -"Nechte prázdné pro žádné komentaře či mime typy sloupců, výchozí nastavení: " +"Nechte prázdné pro žádné komentáře či mime typy sloupců, výchozí nastavení: " "[kbd]pma_column_info[/kbd]." #: libraries/messages.inc.php:1129 @@ -5287,7 +5287,7 @@ msgstr "" #: libraries/messages.inc.php:1161 msgid "PDF schema: pages table" -msgstr "" +msgstr "PDF schémata: tabulka stránek" #: libraries/messages.inc.php:1162 msgid "" @@ -5372,7 +5372,7 @@ msgstr "" #: libraries/messages.inc.php:1179 msgid "PDF schema: table coordinates" -msgstr "" +msgstr "PDF schéma: tabulka souřadnic" #: libraries/messages.inc.php:1180 msgid "" @@ -5382,7 +5382,7 @@ msgstr "" #: libraries/messages.inc.php:1181 msgid "Display fields table" -msgstr "" +msgstr "Tabulka s popisem sloupců" #: libraries/messages.inc.php:1183 msgid "User for config auth" diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php index 78c94cb..6282382 100644 --- a/setup/frames/index.inc.php +++ b/setup/frames/index.inc.php @@ -74,9 +74,6 @@ if (!$is_https) { // create language list $lang_list = array(); foreach ($all_languages as $each_lang_key => $each_lang) { - if (!file_exists($GLOBALS['lang_path'] . $each_lang[1] . '.inc.php')) { - continue; - } $lang_name = ucfirst(substr(strrchr($each_lang[0], '|'), 1)); // Include native name if non empty @@ -175,9 +172,6 @@ $opts = array( 'values' => array(), 'values_escaped' => true); foreach ($all_languages as $each_lang_key => $each_lang) { - if (!file_exists($GLOBALS['lang_path'] . $each_lang[1] . '.inc.php')) { - continue; - } $lang_name = ucfirst(substr(strrchr($each_lang[0], '|'), 1)); // Include native name if non empty if (!empty($each_lang[3])) { hooks/post-receive -- phpMyAdmin

14 years, 3 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-905-ge7f29a3

by Michal Čihař

The branch, master has been updated via e7f29a389bc269b72f3cf481c77ae5d15f782775 (commit) via 6f5fe44324c8d3d6b31b4ab0800d0861ffc96ab1 (commit) via cfc39726f2762600903fde6e11922e0ed7ab9f0c (commit) via 4f7c716bf0ee9155a8d39e8b6d660c7691921268 (commit) via 2e6584c4e8b68ceebbb5272380f00cb2770746af (commit) via 74b96e9875e84ed4dbf9b443d68c3554f7d41cf6 (commit) via 7b252ffdd4cb7c7cb3e4c66eb3d26e94fa56f196 (commit) via c363ea6f148374ef9aae6aaa338f91b50c4cde46 (commit) via 7e52f87f57fda02a9f5651b00b22a15f74904694 (commit) via 64bd7d132a98d592a42c721179f0c85a33c58606 (commit) via 424be87d4031ccc70e9313cb8c51cdd600e3735f (commit) via 33c736b554d70c132dd0bd54b5d5dd3f76262772 (commit) via d060f3a040b04e09ae0d381698933e7b2c5c1529 (commit) from ee015566416517673a8c1a0fa2bb97f20a2073a9 (commit) - Log ----------------------------------------------------------------- commit e7f29a389bc269b72f3cf481c77ae5d15f782775 Merge: ee015566416517673a8c1a0fa2bb97f20a2073a9 6f5fe44324c8d3d6b31b4ab0800d0861ffc96ab1 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 11:31:57 2010 +0200 Merge remote branch 'pootle/master' commit 6f5fe44324c8d3d6b31b4ab0800d0861ffc96ab1 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:04:47 2010 +0200 Translation update done using Pootle. commit cfc39726f2762600903fde6e11922e0ed7ab9f0c Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:04:28 2010 +0200 Translation update done using Pootle. commit 4f7c716bf0ee9155a8d39e8b6d660c7691921268 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:04:11 2010 +0200 Translation update done using Pootle. commit 2e6584c4e8b68ceebbb5272380f00cb2770746af Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:03:58 2010 +0200 Translation update done using Pootle. commit 74b96e9875e84ed4dbf9b443d68c3554f7d41cf6 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:02:03 2010 +0200 Translation update done using Pootle. commit 7b252ffdd4cb7c7cb3e4c66eb3d26e94fa56f196 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:01:35 2010 +0200 Translation update done using Pootle. commit c363ea6f148374ef9aae6aaa338f91b50c4cde46 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:01:28 2010 +0200 Translation update done using Pootle. commit 7e52f87f57fda02a9f5651b00b22a15f74904694 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:01:21 2010 +0200 Translation update done using Pootle. commit 64bd7d132a98d592a42c721179f0c85a33c58606 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:01:14 2010 +0200 Translation update done using Pootle. commit 424be87d4031ccc70e9313cb8c51cdd600e3735f Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:01:06 2010 +0200 Translation update done using Pootle. commit 33c736b554d70c132dd0bd54b5d5dd3f76262772 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:00:54 2010 +0200 Translation update done using Pootle. commit d060f3a040b04e09ae0d381698933e7b2c5c1529 Author: Panagiotis Papazoglou <papaz_p(a)yahoo.com> Date: Tue Mar 30 11:00:06 2010 +0200 Translation update done using Pootle. ----------------------------------------------------------------------- Summary of changes: po/el.po | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/po/el.po b/po/el.po index d53fa27..1164d87 100644 --- a/po/el.po +++ b/po/el.po @@ -4,13 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n" "POT-Creation-Date: 2010-03-19 00:28+0100\n" -"PO-Revision-Date: 2010-03-12 09:14+0100\n" -"Last-Translator: Automatically generated\n" +"PO-Revision-Date: 2010-03-30 11:04+0200\n" +"Last-Translator: Panagiotis <papaz_p(a)yahoo.com>\n" "Language-Team: greek <el(a)li.org>\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Translate Toolkit 1.5.3\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Pootle 2.0.1\n" #: libraries/auth/config.auth.lib.php:107 #, php-format @@ -36,17 +38,15 @@ msgstr "" #. l10n: Language to use for MySQL 5.1 documentation #: libraries/common.lib.php:411 -#, fuzzy msgctxt "$mysql_5_1_doc_lang" msgid "en" -msgstr "Εστάλησαν" +msgstr "el" #. l10n: Language to use for MySQL 5.0 documentation #: libraries/common.lib.php:415 -#, fuzzy msgctxt "$mysql_5_0_doc_lang" msgid "en" -msgstr "Εστάλησαν" +msgstr "el" #. l10n: Text direction, use either ltr or rtl #: libraries/messages.inc.php:15 @@ -458,7 +458,6 @@ msgstr "" "Θέλετε να απενεργοποιήσετε όλες τις αναφορές BLOB για τη βάση δεδομένων %s;" #: libraries/messages.inc.php:96 -#, fuzzy msgctxt "$strBLOBRepositoryDisabled" msgid "Disabled" msgstr "Απενεργοποιημένη" @@ -472,7 +471,6 @@ msgid "You are about to DISABLE a BLOB Repository!" msgstr "Πρόκειτε να ΑΠΕΝΕΡΓΟΠΟΙΉΣΕΤΕ μια Αποθήκη BLOB!" #: libraries/messages.inc.php:99 -#, fuzzy msgctxt "$strBLOBRepositoryEnabled" msgid "Enabled" msgstr "Ενεργοποιημένη" @@ -486,7 +484,6 @@ msgid "Remove BLOB Repository Reference" msgstr "Απομάκρυνση της Αναφοράς Αποθήκης BLOB" #: libraries/messages.inc.php:102 -#, fuzzy msgctxt "$strBLOBRepositoryRepair" msgid "Repair" msgstr "Επισκευή" @@ -930,7 +927,6 @@ msgid "Create table" msgstr "Δημιουργία πίνακα" #: libraries/messages.inc.php:200 -#, fuzzy msgctxt "$strCreateTableShort" msgid "Create table" msgstr "Δημιουργία πίνακα" @@ -945,7 +941,6 @@ msgstr "" "Δημιουργία βάσης δεδομένων με το ίδιο όνομα και με πλήρη δικαιώματα χρήσης" #: libraries/messages.inc.php:203 -#, fuzzy msgctxt "$strCreateUserDatabaseNone" msgid "None" msgstr "Καμία" @@ -1980,7 +1975,7 @@ msgstr "Ταυτότητα εισερχόμενης εγγραφής: %1$d" #: libraries/messages.inc.php:440 msgid "Insert as new row and ignore errors" -msgstr "" +msgstr "Εισαγωγή ως νέα γραμμή και παράβλεψη σφαλμάτων" #: libraries/messages.inc.php:441 msgid "Insert" @@ -2085,6 +2080,9 @@ msgid "" "functionality will be missing. For example navigation frame will not refresh " "automatically." msgstr "" +"Η υποστήριξη Javascript λείπει ή είναι απενεργοποιημένη στον φυλλομετρητή " +"σας. Μερικές λειτουργίες του phpMyAdmin δεν θα υφίσταται. Για παράδειγμα το " +"πλαίσιο πλοήγησης δεν θα ανανεώνεται αυτόματα." #: libraries/messages.inc.php:464 msgid "Joins" @@ -2520,9 +2518,8 @@ msgid "Filter" msgstr "Φίλτρο" #: libraries/messages.inc.php:555 -#, fuzzy msgid "New table" -msgstr "Δεν υπάρχουν πίνακες" +msgstr "Νέος πίνακας" #: libraries/messages.inc.php:556 msgid "Next" @@ -2977,13 +2974,12 @@ msgid "No tables" msgstr "Δεν υπάρχουν πίνακες" #: libraries/messages.inc.php:651 -#, fuzzy msgid "Page has been created" -msgstr "Ο πίνακας %1$s έχει δημιουργηθεί." +msgstr "Η σελίδα δημιουργήθηκε" #: libraries/messages.inc.php:652 msgid "Page creation failed" -msgstr "" +msgstr "Η δημιουργία σελίδας απέτυχε" #: libraries/messages.inc.php:653 msgid "PDF" hooks/post-receive -- phpMyAdmin

14 years, 3 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_1RC1-892-gee01556

by Michal Čihař

The branch, master has been updated via ee015566416517673a8c1a0fa2bb97f20a2073a9 (commit) from e9909a244126164605d1cfb35f6e483bdffc74db (commit) - Log ----------------------------------------------------------------- commit ee015566416517673a8c1a0fa2bb97f20a2073a9 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 11:23:00 2010 +0200 Add quiet mode. ----------------------------------------------------------------------- Summary of changes: scripts/generate-mo | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scripts/generate-mo b/scripts/generate-mo index 323ee74..e26575b 100755 --- a/scripts/generate-mo +++ b/scripts/generate-mo @@ -1,7 +1,15 @@ #!/bin/sh +if [ x$1 = x--quiet ] ; then + stats="" +else + stats="--statistics" +fi + for x in po/*.po ; do lang=`echo $x | sed 's@po/$.*$\.po@\1@'` - echo -n "$lang: " + if [ ! -z "$stas" ] ; then + echo -n "$lang: " + fi mkdir -p locale/$lang/LC_MESSAGES - msgfmt --statistics --check -o locale/$lang/LC_MESSAGES/phpmyadmin.mo $x + msgfmt $stats --check -o locale/$lang/LC_MESSAGES/phpmyadmin.mo $x done hooks/post-receive -- phpMyAdmin

14 years, 3 months

[Phpmyadmin-git] [SCM] phpMyAdmin website branch, master, updated. 5fc76a8f5a83c2561ac7725cfa0e819ec98afc83

by Michal Čihař

The branch, master has been updated via 5fc76a8f5a83c2561ac7725cfa0e819ec98afc83 (commit) via 735539fbc4324baa6c79457bfc929028823cea8c (commit) via 344d5a458c89fca389c3b48a49b7bb782b07a187 (commit) via 9bdf025ec3a463f33292c91274784bb7aa291336 (commit) via 0551fde89e117b0b5cab42770c72d001db5d82ae (commit) from e69384948a6f73edbd1b06de626590171a5d8825 (commit) - Log ----------------------------------------------------------------- commit 5fc76a8f5a83c2561ac7725cfa0e819ec98afc83 Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 11:19:38 2010 +0200 Adjust to work wit gettext. commit 735539fbc4324baa6c79457bfc929028823cea8c Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 10:58:14 2010 +0200 Update description of translations. commit 344d5a458c89fca389c3b48a49b7bb782b07a187 Merge: 9bdf025ec3a463f33292c91274784bb7aa291336 e69384948a6f73edbd1b06de626590171a5d8825 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Mar 29 09:05:46 2010 +0200 Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/website commit 9bdf025ec3a463f33292c91274784bb7aa291336 Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Mar 15 14:03:39 2010 +0100 Better description. commit 0551fde89e117b0b5cab42770c72d001db5d82ae Author: Michal Čihař <mcihar(a)novell.com> Date: Mon Mar 15 14:03:09 2010 +0100 Add translators list to overview. ----------------------------------------------------------------------- Summary of changes: README | 2 + data/langnames.py | 119 ++++++++++++++++++++++---------------------- helper/cache.py | 2 +- render.py | 35 ++++++------- templates/support.tpl | 5 +- templates/translations.tpl | 24 ++++----- 6 files changed, 92 insertions(+), 95 deletions(-) diff --git a/README b/README index 12c4747..b2e49ff 100644 --- a/README +++ b/README @@ -16,6 +16,8 @@ python-feedparser - http://www.feedparser.org (4.1 tested) GitPython - http://gitorious.org/projects/git-python/ (0.1.6 tested) +polib - http://bitbucket.org/izi/polib/src/ +(0.5.1 tested) Security announcements diff --git a/data/langnames.py b/data/langnames.py index e3f612d..eb1559f 100644 --- a/data/langnames.py +++ b/data/langnames.py @@ -17,64 +17,65 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. MAP = { - 'afrikaans' : 'af', - 'afrikaans' : 'af', - 'arabic' : 'ar', - 'azerbaijani' : 'az', - 'bangla' : 'bn', - 'belarusian_cyrillic' : 'be', - 'belarusian_latin' : 'belat', - 'bulgarian' : 'bg', - 'bosnian' : 'bs', - 'catalan' : 'ca', - 'czech' : 'cs', - 'danish' : 'da', - 'german' : 'de', - 'greek' : 'el', - 'english' : 'en', - 'english-gb' : 'engb', - 'spanish' : 'es', - 'estonian' : 'et', - 'basque' : 'eu', - 'persian' : 'fa', - 'finnish' : 'fi', - 'french' : 'fr', - 'galician' : 'gl', - 'hebrew' : 'he', - 'hindi' : 'hi', - 'croatian' : 'hr', - 'hungarian' : 'hu', - 'indonesian' : 'id', - 'italian' : 'it', - 'japanese' : 'ja', - 'korean' : 'ko', - 'georgian' : 'ka', - 'lithuanian' : 'lt', - 'latvian' : 'lv', - 'macedonian_cyrillic' : 'mk', - 'mongolian' : 'mn', - 'malay' : 'ms', - 'dutch' : 'nl', - 'norwegian' : 'no', - 'polish' : 'pl', - 'brazilian_portuguese' : 'ptbr', - 'portuguese' : 'pt', - 'romanian' : 'ro', - 'russian' : 'ru', - 'slovak' : 'sk', - 'slovenian' : 'sl', - 'sinhala' : 'si', - 'albanian' : 'sq', - 'serbian_latin' : 'srlat', - 'serbian_cyrillic' : 'sr', - 'swedish' : 'sv', - 'thai' : 'th', - 'turkish' : 'tr', - 'tatarish' : 'tt', - 'ukrainian' : 'uk', - 'uzbek_cyrillic': 'uz', - 'uzbek_latin': 'uzlat', - 'chinese_traditional' : 'zhtw', - 'chinese_simplified' : 'zh', + 'af' : 'afrikaans', + 'af' : 'afrikaans', + 'ar' : 'arabic', + 'az' : 'azerbaijani', + 'bn' : 'bangla', + 'be' : 'belarusian_cyrillic', + 'be@latin' : 'belarusian_latin', + 'bg' : 'bulgarian', + 'bs' : 'bosnian', + 'ca' : 'catalan', + 'cs' : 'czech', + 'da' : 'danish', + 'de' : 'german', + 'el' : 'greek', + 'en' : 'english', + 'en_GB' : 'english-gb', + 'es' : 'spanish', + 'et' : 'estonian', + 'eu' : 'basque', + 'fa' : 'persian', + 'fi' : 'finnish', + 'fr' : 'french', + 'gl' : 'galician', + 'he' : 'hebrew', + 'hi' : 'hindi', + 'hr' : 'croatian', + 'hu' : 'hungarian', + 'id' : 'indonesian', + 'it' : 'italian', + 'ja' : 'japanese', + 'ko' : 'korean', + 'ka' : 'georgian', + 'lt' : 'lithuanian', + 'lv' : 'latvian', + 'mk' : 'macedonian_cyrillic', + 'mn' : 'mongolian', + 'ms' : 'malay', + 'nl' : 'dutch', + 'nb' : 'norwegian', + 'pl' : 'polish', + 'pt_BR' : 'brazilian_portuguese', + 'pt' : 'portuguese', + 'ro' : 'romanian', + 'ru' : 'russian', + 'sk' : 'slovak', + 'sl' : 'slovenian', + 'si' : 'sinhala', + 'sq' : 'albanian', + 'sr@latin' : 'serbian_latin', + 'sr' : 'serbian_cyrillic', + 'sv' : 'swedish', + 'te' : 'telugu', + 'th' : 'thai', + 'tr' : 'turkish', + 'tt' : 'tatarish', + 'uk' : 'ukrainian', + 'uz' : 'uzbek_cyrillic', + 'uz@latin' : 'uzbek_latin', + 'zh_TW' : 'chinese_traditional', + 'zh_CN' : 'chinese_simplified', } diff --git a/helper/cache.py b/helper/cache.py index 3cd3dd8..c7dc626 100644 --- a/helper/cache.py +++ b/helper/cache.py @@ -188,4 +188,4 @@ class GitCache(Cache): os.system('cd %s ; git pull -q' % self.dirname) self.repo = git.Repo(self.dirname) self.tree = self.repo.tree() - self.langtree = self.tree['lang'] + self.langtree = self.tree['po'] diff --git a/render.py b/render.py index faf85cc..3e81c8e 100755 --- a/render.py +++ b/render.py @@ -27,6 +27,7 @@ import shutil import csv import traceback import datetime +import polib from genshi.template import TemplateLoader from genshi.template import NewTextTemplate from genshi.input import XML @@ -57,7 +58,7 @@ BRANCH_REGEXP = re.compile('^([0-9]+\.[0-9]+)\.') MAJOR_BRANCH_REGEXP = re.compile('^([0-9]+)\.') TESTING_REGEXP = re.compile('.*(beta|alpha|rc).*') SIZE_REGEXP = re.compile('.*\(([0-9]+) bytes, ([0-9]+) downloads to date') -LANG_REGEXP ='((translation|lang|%s).*update|update.*(translation|lang|%s)|^updated?$|new lang|better word|fix.*translation)' +LANG_REGEXP ='((translation|lang|%s).*update|update.*(translation|lang|%s)|^updated?$|new lang|better word|fix.*translation|Translation update done using Pootle)' # Base URL (including trailing /) SERVER = 'http://www.phpmyadmin.net' @@ -914,26 +915,21 @@ class SFGenerator: list = self.git.langtree.keys() list.sort() translators = XML(self.git.tree['translators.html'].data) - english = self.git.langtree['english-utf-8.inc.php'].data - allmessages = len(re.compile('\n\$str').findall(english)) for name in list: - if name[-14:] != '-utf-8.inc.php': + if name[-3:] != '.po': continue - lang = name[:-14] - try: - baselang, ignore = lang.split('_') - except: - baselang = lang - translator = translators.select('tr[@id="%s"]/td[2]/text()' % lang) + lang = name[:-3] + longlang = data.langnames.MAP[lang] + po = polib.pofile('cache/git___phpmyadmin.git.sourceforge.net_gitroot_phpmyadmin_phpmyadmin/po/%s' % name) + translator = translators.select('tr[@id="%s"]/td[2]/text()' % longlang) translator = unicode(translator).strip() if translator == '': - translator = translators.select('tr[@id="%s"]/td[2]/text()' % baselang) + translator = translators.select('tr[@id="%s"]/td[2]/text()' % longlang.split('_')[0]) translator = unicode(translator).strip() translator = self.fmt_translator(translator) - short = data.langnames.MAP[lang] - helper.log.dbg(' - %s [%s]' % (lang, short)) + helper.log.dbg(' - %s [%s]' % (lang, longlang)) gitlog = self.git.repo.log(path = 'lang/english-utf-8.inc.php') - langs = '%s|%s|%s' % (lang, short, baselang) + langs = '%s|%s' % (lang, longlang) regexp = re.compile(LANG_REGEXP % (langs, langs), re.IGNORECASE) found = None if lang == 'english': @@ -943,10 +939,9 @@ class SFGenerator: if regexp.findall(x.message) != []: found = x break - content = self.git.langtree[name].data - missing = len(re.compile('\n\$str.*to translate').findall(content)) - translated = allmessages - missing - percent = 100.0 * translated / allmessages + + percent = po.percent_translated() + translated = len(po.translated_entries()) if percent < 50: css = ' b50' elif percent < 80: @@ -958,8 +953,8 @@ class SFGenerator: except TypeError: dt = '' self.data['translations'].append({ - 'name': lang, - 'short': short, + 'name': longlang, + 'short': lang, 'translated': translated, 'translator': translator, 'percent': '%0.1f' % percent, diff --git a/templates/support.tpl b/templates/support.tpl index 56b894b..2f7ebbb 100644 --- a/templates/support.tpl +++ b/templates/support.tpl @@ -25,8 +25,9 @@ <h2>Mailing Lists</h2> <ul> <li>For news/announcements: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-news">phpmyadmin-news(a)lists.sourceforge.net</a></li> - <li>For user questions: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-users">phpmyadmin-users(a)lists.sourceforge.net</a></li> - <li>For developer questions: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-devel">phpmyadmin-devel(a)lists.sourceforge.net</a></li> + <li>For users: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-users">phpmyadmin-users(a)lists.sourceforge.net</a></li> + <li>For developers: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-devel">phpmyadmin-devel(a)lists.sourceforge.net</a></li> + <li>For translators: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-translators">phpmyadmin-translators(a)lists.sourceforge.net</a></li> <li>Git commit notifications: <a href="https://lists.sourceforge.net/mailman/listinfo/phpmyadmin-git">phpmyadmin-git(a)lists.sourceforge.net</a></li> <li><a href="http://sourceforge.net/mail/?group_id=23067">Mailing lists overview</a></li> </ul> diff --git a/templates/translations.tpl b/templates/translations.tpl index 3dc0d49..2203021 100644 --- a/templates/translations.tpl +++ b/templates/translations.tpl @@ -6,23 +6,21 @@ <h2>Translations</h2> <p> -Translations inside phpMyAdmin are in various states. The ones that have less -than 80% translated strings are shown in dark red, the ones below 50% in more -intensive red (those are considered orphaned and the phpMyAdmin project would -appreciate any help in updating them). Translators contacts are available on -our <a href="http://www.phpmyadmin.net/documentation/translators.html">translators -list</a>. -</p> -<p> -If you want to help improving a translation, please follow intructions on <a -href="${base_url}improve.${file_ext}#translate">how to improve page</a>. +Translations of phpMyAdmin are handled using Gettext. It is used for both +translating phpMyAdmin as well as the documentation (where Po4a is being +used). </p> + <p> -Documentation translation is kept separately, you can see it's summary on our -<a href="https://l10n.cihar.com/projects/pmadoc/">translation server</a>. +You are welcome to contribute to any translations, you can follow instructions +on <a href="${base_url}improve.${file_ext}#translate">how to improve page</a>. +Or simply go to the <a href="https://l10n.cihar.com/">translation server</a> +and translate there projects <a +href="https://l10n.cihar.com/projects/phpmyadmin/">phpMyAdmin</a> or <a +href="https://l10n.cihar.com/projects/pmadoc/">phpMyAdmin documentation</a>. +The translation server also provides you overview of translation status. </p> - <table class="graph sortable" id="sorttable"> <thead> <tr> hooks/post-receive -- phpMyAdmin website

14 years, 3 months

[Phpmyadmin-git] [SCM] phpMyAdmin branch, gettext, deleted. RELEASE_3_3_1RC1-888-g9a26625

by Michal Čihař

The branch, gettext has been deleted was 9a26625560c3bcbeb0169bff625f09bcc8bcfe46 ----------------------------------------------------------------------- 9a26625560c3bcbeb0169bff625f09bcc8bcfe46 Merge branch 'master' into gettext ----------------------------------------------------------------------- hooks/post-receive -- phpMyAdmin

14 years, 3 months

[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. e6908a5c24550625f8622a7fafe2daccc887d5ae

by Michal Čihař

The branch, master has been updated via e6908a5c24550625f8622a7fafe2daccc887d5ae (commit) from a24c6574bcdb49e671470e8b2cfbf41eda0951bd (commit) - Log ----------------------------------------------------------------- commit e6908a5c24550625f8622a7fafe2daccc887d5ae Author: Michal Čihař <mcihar(a)novell.com> Date: Tue Mar 30 10:34:16 2010 +0200 Mention master document. ----------------------------------------------------------------------- Summary of changes: README | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/README b/README index 51d7123..ab47b57 100644 --- a/README +++ b/README @@ -1,7 +1,8 @@ phpMyAdmin - localized documentation ==================================== -This repository contains localized documentation for phpMyAdmin. +This repository contains localized documentation for phpMyAdmin. It +is based on master document placed in phpmyadmin repository. To translate edit your language file in po directory, changes will be propagated to generated documents. You can also translate online at hooks/post-receive -- phpMyAdmin localized documentation

14 years, 3 months

← Newer
1
2
3
4
5
6
7
8
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Git March 2010