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

Use correct name for motranslator call

Browse Source 
We're not using php gettext, so using _ is mistake.

Issue #13436

Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2017-11-27 08:57:17 +01:00 committed by Isaac Bennetch
parent f425eb2394
commit b7ae7d3c04
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/dbi/DBIMysqli.php
View File

@ -157,7 +157,7 @@ class DBIMysqli implements DBIExtension
(($error_number == 2001 || $error_number == 9002) && stripos($error_message, 'SSL Connection is required') !== false)) (($error_number == 2001 || $error_number == 9002) && stripos($error_message, 'SSL Connection is required') !== false))
) { ) {
trigger_error( trigger_error(
_('SSL connection enforced by server, automatically enabling it.'), __('SSL connection enforced by server, automatically enabling it.'),
E_USER_WARNING E_USER_WARNING
); );
$server['ssl'] = true; $server['ssl'] = true;

4
prefs_manage.php
View File

@ -49,8 +49,8 @@ if (isset($_POST['submit_export'])
$filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.php'; $filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.php';
PMA_downloadHeader($filename, 'application/php'); PMA_downloadHeader($filename, 'application/php');
$settings = PMA_loadUserprefs(); $settings = PMA_loadUserprefs();
echo '/* ' . _('phpMyAdmin configuration snippet') . " */\n\n"; echo '/* ' . __('phpMyAdmin configuration snippet') . " */\n\n";
echo '/* ' . _('Paste it to your config.inc.php') . " */\n\n"; echo '/* ' . __('Paste it to your config.inc.php') . " */\n\n";
foreach ($settings['config_data'] as $key => $val) { foreach ($settings['config_data'] as $key => $val) {
echo '$cfg[\'' . str_replace('/', '\'][\'', $key) . '\'] = '; echo '$cfg[\'' . str_replace('/', '\'][\'', $key) . '\'] = ';
echo var_export($val, true) . ";\n"; echo var_export($val, true) . ";\n";