nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

default language should be en-iso-8859-1

Browse Source
This commit is contained in:
Alexander M. Turek
2002-08-04 09:25:03 +00:00
parent ceb299777b
commit f5ee240b53
2 changed files with 43 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ChangeLog
View File

@@ -5,11 +5,15 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-08-04 Alexander M. Turek <rabus@users.sourceforge.net>
* libraries/common.lib.php3, line 88: default language should be
en-iso-8859-1.
2002-08-03 Marc Delisle <lem9@users.sourceforge.net> 2002-08-03 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: remove unneeded GRANT * Documentation.html: remove unneeded GRANT
* lang/turkish: update, thanks to Bora Alioglu * lang/turkish: update, thanks to Bora Alioglu
* lang/french: update * lang/french: update
2002-08-03 Robin Johnson <robbat2@users.sourceforge.net> 2002-08-03 Robin Johnson <robbat2@users.sourceforge.net>
* lang/*: * lang/*:
- Strings for SQL Validator - Strings for SQL Validator
@@ -68,7 +72,7 @@ $Source$
* lang/spanish: remove control m * lang/spanish: remove control m
2002-07-31 Robin Johnson <robbat2@users.sourceforge.net> 2002-07-31 Robin Johnson <robbat2@users.sourceforge.net>
* tbl_properties_structure.php3 +40: Fix for a warning notice * tbl_properties_structure.php3 +40: Fix for a warning notice
* libraries/sqlparser.lib.php3: Fix for another minor formatting quirk * libraries/sqlparser.lib.php3: Fix for another minor formatting quirk
2002-07-31 Marc Delisle <lem9@users.sourceforge.net> 2002-07-31 Marc Delisle <lem9@users.sourceforge.net>
@@ -87,7 +91,7 @@ $Source$
* lang/albanian: update, thanks to Laurent Dhima. * lang/albanian: update, thanks to Laurent Dhima.
* lang/czech: update, thanks to Michal Cihar * lang/czech: update, thanks to Michal Cihar
* lang/slovak-iso: update, thanks to Lubos Klokner * lang/slovak-iso: update, thanks to Lubos Klokner
2002-07-30 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-07-30 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* Documentation.html: coding standards (line size <= 80). * Documentation.html: coding standards (line size <= 80).
* db_details_structure.php3:, 456-460, beautified generated page. * db_details_structure.php3:, 456-460, beautified generated page.
@@ -95,9 +99,9 @@ $Source$
2002-07-29 Marc Delisle <lem9@users.sourceforge.net> 2002-07-29 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: auto-detect, dot in dbname, CGI and cookie auth * Documentation.html: auto-detect, dot in dbname, CGI and cookie auth
* lang/turkish: update, thanks to Bora Alioglu * lang/turkish: update, thanks to Bora Alioglu
2002-07-29 Robin Johnson <robbat2@users.sourceforge.net> 2002-07-29 Robin Johnson <robbat2@users.sourceforge.net>
* lang/galician*: Merged update from #588154 * lang/galician*: Merged update from #588154
* lang/estonian*: Merged update from Alvar Soome * lang/estonian*: Merged update from Alvar Soome
* lang/indonesian*: Merged update from Rachim Tamsjadi * lang/indonesian*: Merged update from Rachim Tamsjadi
* lang/*: ran sync_lang.sh * lang/*: ran sync_lang.sh
@@ -119,18 +123,18 @@ $Source$
* lang/lithuanian: update, thanks to Vilius Zigmantas * lang/lithuanian: update, thanks to Vilius Zigmantas
* lang/dutch: update, thanks to Ivo Teel. * lang/dutch: update, thanks to Ivo Teel.
2.3.0-rc4 released 2.3.0-rc4 released
2002-07-27 Marc Delisle <lem9@users.sourceforge.net> 2002-07-27 Marc Delisle <lem9@users.sourceforge.net>
* lang/italian: update, thanks to Pietro Danesi * lang/italian: update, thanks to Pietro Danesi
* lang/*: fix a typo * lang/*: fix a typo
2002-07-26 Robin Johnson <robbat2@users.sourceforge.net> 2002-07-26 Robin Johnson <robbat2@users.sourceforge.net>
* libraries/sqlparser.lib.php3: * libraries/sqlparser.lib.php3:
- Fixed ANSI type string escaping - Fixed ANSI type string escaping
- Fixed formatting wrt. whitespace in FormatHTML - Fixed formatting wrt. whitespace in FormatHTML
- PHP3 fix for gzcompress() bug code - PHP3 fix for gzcompress() bug code
- Fix for ob_flush() bug code - Fix for ob_flush() bug code
2002-07-26 Marc Delisle <lem9@users.sourceforge.net> 2002-07-26 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: numbers for faq entries * Documentation.html: numbers for faq entries
* russian: updates, from an anonymous contributor * russian: updates, from an anonymous contributor
@@ -171,9 +175,9 @@ $Source$
* new lang: slovenian, thanks to Kositer Uros (urosh) * new lang: slovenian, thanks to Kositer Uros (urosh)
2002-07-24 Robin Johnson <robbat2@users.sourceforge.net> 2002-07-24 Robin Johnson <robbat2@users.sourceforge.net>
* libraries/string.lib.php3: * libraries/string.lib.php3:
- optimizations/PHP3 fixes (thanks Lo<4C>c) - optimizations/PHP3 fixes (thanks Lo<4C>c)
* libraries/sqlparser.lib.php3: * libraries/sqlparser.lib.php3:
- Merged - Merged
- Spacing around if statements - Spacing around if statements
- Added require statements for parser - Added require statements for parser
@@ -181,17 +185,17 @@ $Source$
- Added CSS creation rules - Added CSS creation rules
- Cleaned up CSS creation functions - Cleaned up CSS creation functions
- Formatting fixes - Formatting fixes
* libraries/sqlparser.data.php3: * libraries/sqlparser.data.php3:
- Merged - Merged
- Added 'ANALYSE' reserved word (note spelling) - Added 'ANALYSE' reserved word (note spelling)
* config.inc.php3: * config.inc.php3:
- Added SQL Parser variables - Added SQL Parser variables
- Remove old SQL Parser variables - Remove old SQL Parser variables
* header.inc.php3: * header.inc.php3:
- Added CSS for SQL Parser - Added CSS for SQL Parser
* libraries/common.lib.php3: * libraries/common.lib.php3:
- Change of PMA_format_sql to use new SQL Parser - Change of PMA_format_sql to use new SQL Parser
2002-07-24 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-07-24 Lo<4C>c Chapeaux <lolo@phpheaven.net>
* libraries/string.lib.php3: Function documentation * libraries/string.lib.php3: Function documentation
@@ -545,7 +549,7 @@ $Source$
- Reordered Strings. - Reordered Strings.
* arabic.inc.php3, brazilian_portuguese.inc.php3, bulgarian_*.php3, * arabic.inc.php3, brazilian_portuguese.inc.php3, bulgarian_*.php3,
croatian-*.php3, danish.inc.php3, korean.inc.php3, russian_*.inc.php3, croatian-*.php3, danish.inc.php3, korean.inc.php3, russian_*.inc.php3,
serbian-win1250.inc.php3: serbian-win1250.inc.php3:
- Synchronized the untranslated string - Synchronized the untranslated string
$strSplitWordsWithSpace with the English translation. $strSplitWordsWithSpace with the English translation.
@@ -808,7 +812,7 @@ $Source$
* lang/english.inc.php3: Reordered strings. * lang/english.inc.php3: Reordered strings.
2002-06-09 Robin Johnson <robbat2@users.sourceforge.net> 2002-06-09 Robin Johnson <robbat2@users.sourceforge.net>
* libraries/common.lib.php3: * libraries/common.lib.php3:
- Initial checkin of base DB-Config code - Initial checkin of base DB-Config code
2002-06-08 Alexander M. Turek <rabus@users.sourceforge.net> 2002-06-08 Alexander M. Turek <rabus@users.sourceforge.net>
@@ -873,7 +877,7 @@ $Source$
* sql.php3, lines 509-522: do print the page in "printview" mode. * sql.php3, lines 509-522: do print the page in "printview" mode.
* scripts/check_lang.php3: added this script which goal is to ensure * scripts/check_lang.php3: added this script which goal is to ensure
all languages files are valid. all languages files are valid.
* Documentation.html; main.php3; translators.html: * Documentation.html; main.php3; translators.html:
- Feature request #539644 (Translation feedback link). - Feature request #539644 (Translation feedback link).
2002-06-01 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-06-01 Lo<4C>c Chapeaux <lolo@phpheaven.net>
@@ -1001,7 +1005,7 @@ $Source$
pdf_schema.php3, libraries/display_tbl.lib.php3: PMA_pdf_table_position pdf_schema.php3, libraries/display_tbl.lib.php3: PMA_pdf_table_position
renamed to PMA_table_info, "foreign_display_field" moved from renamed to PMA_table_info, "foreign_display_field" moved from
PMA_relation to PMA_table_info (once per table) PMA_relation to PMA_table_info (once per table)
* lang/indonesian.inc.php3: * lang/indonesian.inc.php3:
- updates thanks to Rachim Tamsjadi (tamsjadi at icqmail.com) - updates thanks to Rachim Tamsjadi (tamsjadi at icqmail.com)
2002-05-21 Lo<4C>c Chapeaux <lolo@phpheaven.net> 2002-05-21 Lo<4C>c Chapeaux <lolo@phpheaven.net>
@@ -1074,9 +1078,9 @@ $Source$
2002-05-14 Marc Delisle <lem9@users.sourceforge.net> 2002-05-14 Marc Delisle <lem9@users.sourceforge.net>
* pdf_schema.php3, db_details_structure.php3, lang/*, fpdf/*, * pdf_schema.php3, db_details_structure.php3, lang/*, fpdf/*,
Documentation.html: Documentation.html:
- new feature: pdf schema output, - new feature: pdf schema output,
- thanks to Maxime Delorme (delorme.maxime at free.fr) - thanks to Maxime Delorme (delorme.maxime at free.fr)
- and to Olivier Plathey (www.fpdf.org) - and to Olivier Plathey (www.fpdf.org)
- (todo: scaling choice) - (todo: scaling choice)
@@ -1260,7 +1264,7 @@ $Source$
- Patch #548696 (DB/Table titles should be links), thanks to - Patch #548696 (DB/Table titles should be links), thanks to
Ray Black <allah03@users.sourceforge.net>. Ray Black <allah03@users.sourceforge.net>.
- lines: 161-164: Undefined variable. - lines: 161-164: Undefined variable.
* common.lib.php3, lines 162, 163, 435-437: * common.lib.php3, lines 162, 163, 435-437:
- Fixed bug #549570 - Fixed bug #549570
- (Strange error if controluser is invalid). - (Strange error if controluser is invalid).

36
libraries/common.lib.php3
View File

@@ -85,7 +85,7 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
// Include failed // Include failed
if (!isset($cfgServers) && !isset($cfg['Servers'])) { if (!isset($cfgServers) && !isset($cfg['Servers'])) {
// Creates fake settings // Creates fake settings
$cfg = array('DefaultLang' => 'en'); $cfg = array('DefaultLang' => 'en-iso-8859-1');
// Loads the language file // Loads the language file
include('./libraries/select_lang.lib.php3'); include('./libraries/select_lang.lib.php3');
// Sends the Content-Type header // Sends the Content-Type header
@@ -1144,38 +1144,38 @@ if (typeof(document.getElementById) != 'undefined'
} else { } else {
$edit_target = ''; $edit_target = '';
} }
if (isset($cfg['SQLQuery']['Edit']) if (isset($cfg['SQLQuery']['Edit'])
&& ($cfg['SQLQuery']['Edit'] == TRUE ) && ($cfg['SQLQuery']['Edit'] == TRUE )
&& (!empty($edit_target))) { && (!empty($edit_target))) {
$edit_link = '&nbsp;[<a href="' $edit_link = '&nbsp;[<a href="'
. $edit_target . $edit_target
. $url_qpart . $url_qpart
. '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=1#querybox">' . $GLOBALS['strEdit'] . '</a>]'; . '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;show_query=1#querybox">' . $GLOBALS['strEdit'] . '</a>]';
} else { } else {
$edit_link = ''; $edit_link = '';
} }
// Want to have the query explained (Mike Beck 2002-05-22) // Want to have the query explained (Mike Beck 2002-05-22)
// but only explain a SELECT (that has not been explained) // but only explain a SELECT (that has not been explained)
/* SQL-Parser-Analyzer */ /* SQL-Parser-Analyzer */
if (isset($cfg['SQLQuery']['Explain']) if (isset($cfg['SQLQuery']['Explain'])
&& $cfg['SQLQuery']['Explain'] == TRUE) { && $cfg['SQLQuery']['Explain'] == TRUE) {
// Detect if we are validating as well // Detect if we are validating as well
// To preserve the validate uRL data // To preserve the validate uRL data
if (!empty($GLOBALS['validatequery'])) { if (!empty($GLOBALS['validatequery'])) {
$explain_link_validate = '&amp;validatequery=1'; $explain_link_validate = '&amp;validatequery=1';
} else { } else {
$explain_link_validate = ''; $explain_link_validate = '';
} }
$explain_link = '&nbsp;[<a href="sql.php3' $explain_link = '&nbsp;[<a href="sql.php3'
. $url_qpart . $url_qpart
. $explain_link_validate . $explain_link_validate
. '&amp;sql_query='; . '&amp;sql_query=';
if (eregi('^SELECT[[:space:]]+', $GLOBALS['sql_query'])) { if (eregi('^SELECT[[:space:]]+', $GLOBALS['sql_query'])) {
$explain_link .= urlencode('EXPLAIN ' . $GLOBALS['sql_query']) . '">' . $GLOBALS['strExplain']; $explain_link .= urlencode('EXPLAIN ' . $GLOBALS['sql_query']) . '">' . $GLOBALS['strExplain'];
} else if (eregi('^EXPLAIN[[:space:]]+SELECT[[:space:]]+', $GLOBALS['sql_query'])) { } else if (eregi('^EXPLAIN[[:space:]]+SELECT[[:space:]]+', $GLOBALS['sql_query'])) {
@@ -1189,15 +1189,15 @@ if (typeof(document.getElementById) != 'undefined'
} else { } else {
$explain_link = ''; $explain_link = '';
} //show explain } //show explain
// Also we would like to get the SQL formed in some nice // Also we would like to get the SQL formed in some nice
// php-code (Mike Beck 2002-05-22) // php-code (Mike Beck 2002-05-22)
if (isset($cfg['SQLQuery']['ShowAsPHP']) if (isset($cfg['SQLQuery']['ShowAsPHP'])
&& $cfg['SQLQuery']['ShowAsPHP'] == TRUE) { && $cfg['SQLQuery']['ShowAsPHP'] == TRUE) {
$php_link = '&nbsp;[<a href="sql.php3' $php_link = '&nbsp;[<a href="sql.php3'
. $url_qpart . $url_qpart
. '&amp;show_query=1' . '&amp;show_query=1'
. '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query'])
. '&amp;show_as_php='; . '&amp;show_as_php=';
if (!empty($GLOBALS['show_as_php'])) { if (!empty($GLOBALS['show_as_php'])) {
@@ -1210,14 +1210,14 @@ if (typeof(document.getElementById) != 'undefined'
$php_link = ''; $php_link = '';
} //show as php } //show as php
if (isset($cfg['SQLValidator']['use']) if (isset($cfg['SQLValidator']['use'])
&& $cfg['SQLValidator']['use'] == TRUE && $cfg['SQLValidator']['use'] == TRUE
&& isset($cfg['SQLQuery']['Validate']) && isset($cfg['SQLQuery']['Validate'])
&& $cfg['SQLQuery']['Validate'] == TRUE) { && $cfg['SQLQuery']['Validate'] == TRUE) {
$validate_link = '&nbsp;[<a href="sql.php3' $validate_link = '&nbsp;[<a href="sql.php3'
. $url_qpart . $url_qpart
. '&amp;show_query=1' . '&amp;show_query=1'
. '&amp;sql_query=' . urlencode($GLOBALS['sql_query']) . '&amp;sql_query=' . urlencode($GLOBALS['sql_query'])
. '&amp;validatequery='; . '&amp;validatequery=';
if (!empty($GLOBALS['validatequery'])) { if (!empty($GLOBALS['validatequery'])) {
$validate_link .= '0">' . $GLOBALS['strNoValidateSQL'] ; $validate_link .= '0">' . $GLOBALS['strNoValidateSQL'] ;
@@ -1233,7 +1233,7 @@ if (typeof(document.getElementById) != 'undefined'
echo ' ' . $GLOBALS['strSQLQuery'] . '&nbsp;:'; echo ' ' . $GLOBALS['strSQLQuery'] . '&nbsp;:';
if (!empty($edit_target)) { if (!empty($edit_target)) {
echo $edit_link . $explain_link . $php_link . $validate_link; echo $edit_link . $explain_link . $php_link . $validate_link;
} }
echo '<br />' . "\n"; echo '<br />' . "\n";
echo ' ' . $query_base; echo ' ' . $query_base;
// If a 'LIMIT' clause has been programatically added to the query // If a 'LIMIT' clause has been programatically added to the query