10 May
2010
10 May
'10
5:47 p.m.
The branch, master has been updated
via 9bb46c6fb5439c047f0de238c00ea196063ceaf8 (commit)
via 8835c9249b50780fcb70fcf3023fffa0ff040127 (commit)
from 355b4c97bdc9c4afb6c900e3f2761aa91e532a4f (commit)
- Log -----------------------------------------------------------------
commit 9bb46c6fb5439c047f0de238c00ea196063ceaf8
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 10 16:46:53 2010 +0200
Load datepicker translations only if it is used.
commit 8835c9249b50780fcb70fcf3023fffa0ff040127
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon May 10 16:46:41 2010 +0200
Whitespace cleanup.
-----------------------------------------------------------------------
Summary of changes:
js/messages.php | 48 +++++++++++++++++++++++++-----------------------
1 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/js/messages.php b/js/messages.php
index 1653ceb..30969d6 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -22,45 +22,45 @@ require_once './libraries/common.inc.php';
// But this one is needed for PMA_escapeJsString()
require_once './libraries/js_escape.lib.php';
-$js_messages['strClickToSelect'] = __('Click to select');
-$js_messages['strClickToUnselect'] = __('Click to unselect');
-$js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements
are disabled.');
+$js_messages['strClickToSelect'] = __('Click to select');
+$js_messages['strClickToUnselect'] = __('Click to unselect');
+$js_messages['strNoDropDatabases'] = __('"DROP DATABASE" statements
are disabled.');
/* For confirmations */
-$js_messages['strDoYouReally'] = __('Do you really want to ');
-$js_messages['strDropDatabaseStrongWarning'] = __('You are about to DESTROY a
complete database!');
+$js_messages['strDoYouReally'] = __('Do you really want to ');
+$js_messages['strDropDatabaseStrongWarning'] = __('You are about to DESTROY a
complete database!');
/* For blobstreaming */
-$js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to
DISABLE a BLOB Repository!');
+$js_messages['strBLOBRepositoryDisableStrongWarning'] = __('You are about to
DISABLE a BLOB Repository!');
$js_messages['strBLOBRepositoryDisableAreYouSure'] = sprintf(__('Are you sure
you want to disable all BLOB references for database %s?'), $GLOBALS['db']);
/* For indexes */
-$js_messages['strFormEmpty'] = __('Missing value in the form!');
-$js_messages['strNotNumber'] = __('This is not a number!');
+$js_messages['strFormEmpty'] = __('Missing value in the form!');
+$js_messages['strNotNumber'] = __('This is not a number!');
/* For server_privileges.js */
-$js_messages['strHostEmpty'] = __('The host name is empty!');
-$js_messages['strUserEmpty'] = __('The user name is empty!');
-$js_messages['strPasswordEmpty'] = __('The password is empty!');
-$js_messages['strPasswordNotSame'] = __('The passwords aren\'t the
same!');
+$js_messages['strHostEmpty'] = __('The host name is empty!');
+$js_messages['strUserEmpty'] = __('The user name is empty!');
+$js_messages['strPasswordEmpty'] = __('The password is empty!');
+$js_messages['strPasswordNotSame'] = __('The passwords aren\'t the
same!');
/* For inline query editing */
$js_messages['strGo'] = __('Go');
$js_messages['strCancel'] = __('Cancel');
/* Designer */
-$js_messages['strModifications'] = __('Modifications have been saved');
-$js_messages['strRelationDeleted'] = __('Relation deleted');
-$js_messages['strForeignKeyRelationAdded'] = __('FOREIGN KEY relation
added');
-$js_messages['strInternalRelationAdded'] = __('Internal relation added');
-$js_messages['strErrorRelationAdded'] = __('Error: Relation not added.');
-$js_messages['strErrorRelationExists'] = __('Error: relation already
exists.');
-$js_messages['strErrorSaveTable'] = __('Error saving coordinates for
Designer.');
+$js_messages['strModifications'] = __('Modifications have been saved');
+$js_messages['strRelationDeleted'] = __('Relation deleted');
+$js_messages['strForeignKeyRelationAdded'] = __('FOREIGN KEY relation
added');
+$js_messages['strInternalRelationAdded'] = __('Internal relation
added');
+$js_messages['strErrorRelationAdded'] = __('Error: Relation not
added.');
+$js_messages['strErrorRelationExists'] = __('Error: relation already
exists.');
+$js_messages['strErrorSaveTable'] = __('Error saving coordinates for
Designer.');
$js_messages['strGeneralRelationFeat:strDisabled'] = __('General relation
features') . ': ' . __('Disabled');
-$js_messages['strSelectReferencedKey'] = __('Select referenced key');
-$js_messages['strSelectForeignKey'] = __('Select Foreign Key');
-$js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the
primary key or a unique key');
-$js_messages['strChangeDisplay'] = __('Choose field to display');
+$js_messages['strSelectReferencedKey'] = __('Select referenced key');
+$js_messages['strSelectForeignKey'] = __('Select Foreign Key');
+$js_messages['strPleaseSelectPrimaryOrUniqueKey'] = __('Please select the
primary key or a unique key');
+$js_messages['strChangeDisplay'] = __('Choose field to display');
echo "var PMA_messages = new Array();\n";
foreach ($js_messages as $name => $js_message) {
@@ -68,6 +68,7 @@ foreach ($js_messages as $name => $js_message) {
}
/* Calendar */
+echo "if ($.datepicker) {\n";
/* l10n: Display text for calendar close link */
PMA_printJsValue("$.datepicker.regional['']['closeText']",
__('Done'));
/* l10n: Display text for previous month link in calendar */
@@ -165,3 +166,4 @@
PMA_printJsValue("$.datepicker.regional['']['minuteText']",
__('Minute'));
PMA_printJsValue("$.datepicker.regional['']['secondText']",
__('Second'));
?>
$.extend($.datepicker._defaults, $.datepicker.regional['']);
+} /* if ($.datepicker) */
hooks/post-receive
--
phpMyAdmin