The branch, master has been updated via 1b1bef3e5304c9d5b509b7fa99563c07f29d2d14 (commit) via 6e056ffe05a2895e9f34da4062accc7ead4a82f3 (commit) via d4d375a63b03abc1b7b5166cc213d1527d732a09 (commit) via a99858b16a40bcfceec01667eb2814a1acf45f6d (commit) via b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d (commit) via c0b12a1eeac7b9acb46063236b772b5d5b14b3a3 (commit) via 95f6c0a13756c25fa8b98f7153324152a6db4378 (commit) from f73996ba01806c6162f2d3a998f9eca9983378ed (commit)

- Log ----------------------------------------------------------------- commit 1b1bef3e5304c9d5b509b7fa99563c07f29d2d14 Author: Michal Čihař michal@cihar.com Date: Thu Apr 8 12:41:01 2010 +0200

Update FAQ 7.2 to gettext.

commit 6e056ffe05a2895e9f34da4062accc7ead4a82f3 Author: Michal Čihař michal@cihar.com Date: Thu Apr 8 12:35:39 2010 +0200

Update devel section to mention Gettext.

commit d4d375a63b03abc1b7b5166cc213d1527d732a09 Merge: f73996ba01806c6162f2d3a998f9eca9983378ed a99858b16a40bcfceec01667eb2814a1acf45f6d Author: Michal Čihař michal@cihar.com Date: Thu Apr 8 12:33:42 2010 +0200

Merge branch 'QA_3_3'

-----------------------------------------------------------------------

Summary of changes: Documentation.html | 53 ++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/Documentation.html b/Documentation.html index 467a599..5e07feb 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1393,6 +1393,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed. </dd>

+ <dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt> + <dd>Whether to display errors from PHP or not.</dd> + + <dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt> + <dd>Whether to gather errors from PHP or not.</dd> + <dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt> <dd>Defines whether to use a select-based menu and display only the current tables in the left frame (smaller page). Only in Non-Lightmode you can @@ -1906,20 +1912,20 @@ $cfg['TrustedProxies'] = name of the field. The comment is shown as a tool-tip for that field. </dd>

- <dt id ="cfb_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> + <dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt> <dd>Whether to display an edit link to change a query in any SQL Query box.</dd>

- <dt id ="cfb_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt> + <dt id ="cfg_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt> <dd>Whether to display a link to explain a SELECT query in any SQL Query box.</dd>

- <dt id ="cfb_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt> + <dt id ="cfg_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt> <dd>Whether to display a link to wrap a query in PHP code in any SQL Query box.</dd>

- <dt id ="cfb_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt> + <dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt> <dd>Whether to display a link to validate a query in any SQL Query box. See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd>

- <dt id ="cfb_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt> + <dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt> <dd>Whether to display a link to refresh a query in any SQL Query box.</dd>

<dt id="cfg_UploadDir">$cfg['UploadDir'] string</dt> @@ -4354,20 +4360,32 @@ chmod o+rwx tmp <a href="#faq7_2">7.2 I want to translate the messages to a new language or upgrade an existing language, where do I start?</a></h4>

-<p> Always use the current SVN version of your language file. - For a new language, start from <i>english-utf-8.inc.php</i>. If you - don't know how to get the SVN version, please ask one of the developers. - <br /> +<p> Always use latest Git versoin of po file to translate. You can optionally + translate online at our <a href="http://l10n.cihar.com/">translation + server</a> where you can also get latest po files and merge them + with your translations. For creating new translation simply use + <code>po/phpmyadmin.pot</code> and generate + <code>po/LANG_CODE.po</code> for your language (you can use + <code>msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> + to do this) or ask on mailing list to add the translation to the web + interface. +</p> +<p> Please note that we try not to use HTML entities like &amp;eacute; in the translations, since we define the right character set in the file. With HTML entities, the text on JavaScript messages would not display correctly. However there are some entities that need to be there, for quotes - ,non-breakable spaces, ampersands, less than, greater than.<br /> + ,non-breakable spaces, ampersands, less than, greater than. +</p> +<p> You can then put your translations, as a zip file to avoid losing special - characters, on the sourceforge.net translation tracker.<br /> + characters, on the sourceforge.net translation tracker. +</p> +<p> It would be a good idea to subscribe to the phpmyadmin-translators mailing - list, because this is where we ask for translations of new messages.</p> + list, because this is where we ask for translations of new messages. +</p>

<h4 id="faq7_3"> <a href="#faq7_3">7.3 I would like to help out with the development of @@ -4474,11 +4492,18 @@ now synchronize your databases placed on the same server or some remote server. <abbr title="PHP Extension and Application Repository">PEAR</abbr> coding standards</a> on the other hand. Please pay attention to this.</li> + <li>Please enable showing PHP errors and warnings by the + <code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code> + configuration directive.</li> <li>Please try to keep up the file-naming conventions. Table-related stuff goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>, server-related tools to <i>server_*.php</i> and so on.</li> - <li>Please don't put message strings in your code, instead add the string - (at least) to <i>english-utf-8.inc.php</i> and print() it out.</li> + <li>Please use gettext wrappers around all messages + (<code>__('Some text')</code> or <code>_ngettext()</code> function). + To translate them, you need to call <code>scripts/update-po</code> + script. To use translated messages, call + <code>scripts/generate-mo</code>, which generates binary files read by + Gettext.</li> <li>If you want to be really helpful, write an entry for the ChangeLog.</li> <li id="developersdbg"> The DBG extension (<a href="http://dd.cron.ru/dbg/">PHP

hooks/post-receive