The branch, master has been updated
via a6fe6ed21636ad5a6f9f66368f93a562c4bb8316 (commit)
from c458ca6e5f39a8b1b18296f58470caa1f6c10183 (commit)
- Log -----------------------------------------------------------------
commit a6fe6ed21636ad5a6f9f66368f93a562c4bb8316
Author: Michal Čihař <[email protected]>
Date: Tue Dec 7 11:18:31 2010 +0100
Fix word order in English message.
And avoid composition of the message as it leads to problems in
translations.
-----------------------------------------------------------------------
Summary of changes:
server_replication.php | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/server_replication.php b/server_replication.php
index 17ac37a..a25fe1d 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -322,8 +322,16 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
echo ' <ul>';
echo ' <li><a href="'. $slave_control_full_link . '">' .
(($server_slave_replication[0]['Slave_IO_Running'] == 'No' ||
$server_slave_replication[0]['Slave_SQL_Running'] == 'No') ? __('Full start') :
__('Full stop')) . ' </a></li>';
echo ' <li><a href="'. $slave_control_reset_link . '">' . __('Reset
slave') . '</a></li>';
- echo ' <li><a href="' . $slave_control_sql_link . '">' .
sprintf(__('SQL Thread %s only'),
($server_slave_replication[0]['Slave_SQL_Running'] == 'No' ? __('Start') :
__('Stop'))) . '</a></li>';
- echo ' <li><a href="' . $slave_control_io_link . '">' .
sprintf(__('IO Thread %s only'),
($server_slave_replication[0]['Slave_IO_Running'] == 'No' ? __('Start') :
__('Stop'))) . '</a></li>';
+ if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
+ echo ' <li><a href="' . $slave_control_sql_link . '">' .
__('Start SQL Thread only') . '</a></li>';
+ } else {
+ echo ' <li><a href="' . $slave_control_sql_link . '">' .
__('Stop SQL Thread only') . '</a></li>';
+ }
+ if ($server_slave_replication[0]['Slave_IO_Running'] == 'No') {
+ echo ' <li><a href="' . $slave_control_io_link . '">' .
__('Start IO Thread only') . '</a></li>';
+ } else {
+ echo ' <li><a href="' . $slave_control_io_link . '">' . __('Stop
IO Thread only') . '</a></li>';
+ }
echo ' </ul>';
echo ' </div>';
echo ' </li>';
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
