Skip to content

Commit

Permalink
Use correct name for motranslator call
Browse files Browse the repository at this point in the history
We're not using php gettext, so using _ is mistake.

Issue #13436

Signed-off-by: Michal Čihař <michal@cihar.com>
  • Loading branch information
nijel authored and ibennetch committed Dec 1, 2017
1 parent f425eb2 commit b7ae7d3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion libraries/dbi/DBIMysqli.php
Expand Up @@ -157,7 +157,7 @@ public function connect(
(($error_number == 2001 || $error_number == 9002) && stripos($error_message, 'SSL Connection is required') !== false))
) {
trigger_error(
_('SSL connection enforced by server, automatically enabling it.'),
__('SSL connection enforced by server, automatically enabling it.'),
E_USER_WARNING
);
$server['ssl'] = true;
Expand Down
4 changes: 2 additions & 2 deletions prefs_manage.php
Expand Up @@ -49,8 +49,8 @@
$filename = 'phpMyAdmin-config-' . urlencode(PMA_getenv('HTTP_HOST')) . '.php';
PMA_downloadHeader($filename, 'application/php');
$settings = PMA_loadUserprefs();
echo '/* ' . _('phpMyAdmin configuration snippet') . " */\n\n";
echo '/* ' . _('Paste it to your config.inc.php') . " */\n\n";
echo '/* ' . __('phpMyAdmin configuration snippet') . " */\n\n";
echo '/* ' . __('Paste it to your config.inc.php') . " */\n\n";
foreach ($settings['config_data'] as $key => $val) {
echo '$cfg[\'' . str_replace('/', '\'][\'', $key) . '\'] = ';
echo var_export($val, true) . ";\n";
Expand Down

0 comments on commit b7ae7d3

Please sign in to comment.