diff options
| author | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-06-11 07:38:37 +0300 |
|---|---|---|
| committer | Maurício Meneghini Fauth <mauricio@fauth.dev> | 2022-06-11 07:38:37 +0300 |
| commit | a176b8555c1613d3183a0c3f724ecf2042322267 (patch) | |
| tree | 1b3e4c95802b78af5b90a21fc78610eaf00ee812 | |
| parent | a7a7490e1509db76957ce959afe68bfe7deab129 (diff) | |
| parent | e62995bad01ff0412acb6ca5f5695b159b5d873f (diff) | |
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | js/src/server/status/monitor.js | 2 | ||||
| -rw-r--r-- | libraries/classes/Core.php | 8 |
3 files changed, 8 insertions, 3 deletions
@@ -14,6 +14,7 @@ phpMyAdmin - ChangeLog - issue #17271 Fix database names not showing on Processes tab - issue #17424 Fix export limit size calculation - issue #17366 Fix refresh rate popup on Monitor page +- issue #17577 Fix monitor charts size on RTL languages 5.2.0 (2022-05-10) - issue #16521 Upgrade Bootstrap to version 5 diff --git a/js/src/server/status/monitor.js b/js/src/server/status/monitor.js index d6d04eee60..2cae0927e6 100644 --- a/js/src/server/status/monitor.js +++ b/js/src/server/status/monitor.js @@ -1106,7 +1106,7 @@ AJAX.registerOnload('server/status/monitor.js', function () { var windowWidth = $(window).width(); if (windowWidth > 768) { - wdt = (panelWidth - monitorSettings.columns * chartSpacing.width) / monitorSettings.columns; + wdt = (panelWidth - monitorSettings.columns * Math.abs(chartSpacing.width)) / monitorSettings.columns; } chartSize = { diff --git a/libraries/classes/Core.php b/libraries/classes/Core.php index 0a076aec33..2ecff03c31 100644 --- a/libraries/classes/Core.php +++ b/libraries/classes/Core.php @@ -160,7 +160,7 @@ class Core /* List of PHP documentation translations */ $php_doc_languages = [ 'pt_BR', - 'zh', + 'zh_CN', 'fr', 'de', 'ja', @@ -171,7 +171,11 @@ class Core $lang = 'en'; if (isset($GLOBALS['lang']) && in_array($GLOBALS['lang'], $php_doc_languages)) { - $lang = $GLOBALS['lang']; + if ($GLOBALS['lang'] === 'zh_CN') { + $lang = 'zh'; + } else { + $lang = $GLOBALS['lang']; + } } return self::linkURL('https://www.php.net/manual/' . $lang . '/' . $target); |