From 95f6c0a13756c25fa8b98f7153324152a6db4378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?=
Date: Thu, 8 Apr 2010 12:31:24 +0200
Subject: [PATCH 1/5] Document Error_Handler.
---
Documentation.html | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/Documentation.html b/Documentation.html
index abe01c4af..02682b35b 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1379,6 +1379,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE
HTTP server is placed.
+ $cfg['Error_Handler']['display'] boolean
+ Whether to display errors from PHP or not.
+
+ $cfg['Error_Handler']['gather'] boolean
+ Whether to gather errors from PHP or not.
+
$cfg['LeftFrameLight'] boolean
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
From c0b12a1eeac7b9acb46063236b772b5d5b14b3a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?=
Date: Thu, 8 Apr 2010 12:31:44 +0200
Subject: [PATCH 2/5] Fix typo (cfb -> cfg).
---
Documentation.html | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 02682b35b..7ae0f8d3d 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1889,20 +1889,20 @@ $cfg['TrustedProxies'] =
name of the field. The comment is shown as a tool-tip for that field.
- $cfg['SQLQuery']['Edit'] boolean
+ $cfg['SQLQuery']['Edit'] boolean
Whether to display an edit link to change a query in any SQL Query box.
- $cfg['SQLQuery']['Explain'] boolean
+ $cfg['SQLQuery']['Explain'] boolean
Whether to display a link to explain a SELECT query in any SQL Query box.
- $cfg['SQLQuery']['ShowAsPHP'] boolean
+ $cfg['SQLQuery']['ShowAsPHP'] boolean
Whether to display a link to wrap a query in PHP code in any SQL Query box.
- $cfg['SQLQuery']['Validate'] boolean
+ $cfg['SQLQuery']['Validate'] boolean
Whether to display a link to validate a query in any SQL Query box.
See also $cfg_SQLValidator.
- $cfg['SQLQuery']['Refresh'] boolean
+ $cfg['SQLQuery']['Refresh'] boolean
Whether to display a link to refresh a query in any SQL Query box.
$cfg['UploadDir'] string
From b68b7d1cdd48d48e4b2009a1cfd24e81a09a127d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?=
Date: Thu, 8 Apr 2010 12:33:20 +0200
Subject: [PATCH 3/5] Document enabling error reporting in devel docs.
---
Documentation.html | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Documentation.html b/Documentation.html
index 7ae0f8d3d..81e12b004 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4457,6 +4457,9 @@ now synchronize your databases placed on the same server or some remote server.
PEAR
coding standards
on the other hand. Please pay attention to this.
+ Please enable showing PHP errors and warnings by the
+ $cfg['Error_Handler']['display']
+ configuration directive.
Please try to keep up the file-naming conventions. Table-related stuff
goes to tbl_*.php, db-related code to db_*.php,
server-related tools to server_*.php and so on.
From 6e056ffe05a2895e9f34da4062accc7ead4a82f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?=
Date: Thu, 8 Apr 2010 12:35:39 +0200
Subject: [PATCH 4/5] Update devel section to mention Gettext.
---
Documentation.html | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index d4bc661f3..79bfab418 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4486,8 +4486,12 @@ now synchronize your databases placed on the same server or some remote server.
Please try to keep up the file-naming conventions. Table-related stuff
goes to tbl_*.php, db-related code to db_*.php,
server-related tools to server_*.php and so on.
- Please don't put message strings in your code, instead add the string
- (at least) to english-utf-8.inc.php and print() it out.
+ Please use gettext wrappers around all messages
+ (__('Some text')
or _ngettext()
function).
+ To translate them, you need to call scripts/update-po
+ script. To use translated messages, call
+ scripts/generate-mo
, which generates binary files read by
+ Gettext.
If you want to be really helpful, write an entry for the ChangeLog.
The DBG extension (PHP
From 1b1bef3e5304c9d5b509b7fa99563c07f29d2d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?=
Date: Thu, 8 Apr 2010 12:41:01 +0200
Subject: [PATCH 5/5] Update FAQ 7.2 to gettext.
---
Documentation.html | 26 +++++++++++++++++++-------
1 file changed, 19 insertions(+), 7 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 79bfab418..5e07febcc 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4360,20 +4360,32 @@ chmod o+rwx tmp
7.2 I want to translate the messages to a new language or upgrade an
existing language, where do I start?
- Always use the current SVN version of your language file.
- For a new language, start from english-utf-8.inc.php. If you
- don't know how to get the SVN version, please ask one of the developers.
-
+
Always use latest Git versoin of po file to translate. You can optionally
+ translate online at our translation
+ server where you can also get latest po files and merge them
+ with your translations. For creating new translation simply use
+ po/phpmyadmin.pot
and generate
+ po/LANG_CODE.po
for your language (you can use
+ msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po
+ to do this) or ask on mailing list to add the translation to the web
+ interface.
+
+
Please note that we try not to use HTML entities like é 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.
+ ,non-breakable spaces, ampersands, less than, greater than.
+
+
You can then put your translations, as a zip file to avoid losing special
- characters, on the sourceforge.net translation tracker.
+ characters, on the sourceforge.net translation tracker.
+
+
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.
+ list, because this is where we ask for translations of new messages.
+