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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-12-16 18:47:36 +01:00
commit 8f795c0128
3 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/rte/rte_events.lib.php
View File

@ -172,7 +172,13 @@ function PMA_EVN_handleEditor()
}
if (count($errors)) {
$message = PMA_Message::error(__('<b>One or more errors have occurred while processing your request:</b>'));
$message = PMA_Message::error(
'<b>'
. __(
'One or more errors have occurred while processing your request:'
)
. '</b>'
);
$message->addString('<ul>');
foreach ($errors as $string) {
$message->addString('<li>' . $string . '</li>');
@ -585,7 +591,8 @@ function PMA_EVN_getQueryFromRequest()
$query .= 'EVERY ' . intval($_REQUEST['item_interval_value']) . ' ';
$query .= $_REQUEST['item_interval_field'] . ' ';
} else {
$errors[] = __('You must provide a valid interval value for the event.');
$errors[]
= __('You must provide a valid interval value for the event.');
}
if (! empty($_REQUEST['item_starts'])) {
$query .= "STARTS '"
@ -600,7 +607,8 @@ function PMA_EVN_getQueryFromRequest()
$query .= "AT '"
. PMA_Util::sqlAddSlashes($_REQUEST['item_execute_at']) . "' ";
} else {
$errors[] = __('You must provide a valid execution time for the event.');
$errors[]
= __('You must provide a valid execution time for the event.');
}
}
} else {

8
libraries/rte/rte_triggers.lib.php
View File

@ -144,7 +144,13 @@ function PMA_TRI_handleEditor()
}
if (count($errors)) {
$message = PMA_Message::error(__('<b>One or more errors have occurred while processing your request:</b>'));
$message = PMA_Message::error(
'<b>'
. __(
'One or more errors have occurred while processing your request:'
)
. '</b>'
);
$message->addString('<ul>');
foreach ($errors as $string) {
$message->addString('<li>' . $string . '</li>');

12
libraries/rte/rte_words.lib.php
View File

@ -28,7 +28,9 @@ function PMA_RTE_getWord($index)
'docu' => 'STORED_ROUTINES',
'export' => __('Export of routine %s'),
'human' => __('routine'),
'no_create' => __('You do not have the necessary privileges to create a routine'),
'no_create' => __(
'You do not have the necessary privileges to create a routine'
),
'not_found' => __('No routine with name %1$s found in database %2$s'),
'nothing' => __('There are no routines to display.'),
'title' => __('Routines'),
@ -40,7 +42,9 @@ function PMA_RTE_getWord($index)
'docu' => 'TRIGGERS',
'export' => __('Export of trigger %s'),
'human' => __('trigger'),
'no_create' => __('You do not have the necessary privileges to create a trigger'),
'no_create' => __(
'You do not have the necessary privileges to create a trigger'
),
'not_found' => __('No trigger with name %1$s found in database %2$s'),
'nothing' => __('There are no triggers to display.'),
'title' => __('Triggers'),
@ -52,7 +56,9 @@ function PMA_RTE_getWord($index)
'docu' => 'EVENTS',
'export' => __('Export of event %s'),
'human' => __('event'),
'no_create' => __('You do not have the necessary privileges to create an event'),
'no_create' => __(
'You do not have the necessary privileges to create an event'
),
'not_found' => __('No event with name %1$s found in database %2$s'),
'nothing' => __('There are no events to display.'),
'title' => __('Events'),