Merge branch 'QA_5_2'

MauricioFauth · MauricioFauth · commit a176b8555c16 · 2022-06-11T01:38:37.000-03:00
Signed-off-by: Maurício Meneghini Fauth &lt;mauricio@fauth.dev&gt;
diff --git a/ChangeLog b/ChangeLog
@@ -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
@@ -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
@@ -160,7 +160,7 @@ public static function getPHPDocLink(string $target): string
         /* List of PHP documentation translations */
         $php_doc_languages = [
             'pt_BR',
-            'zh',
+            'zh_CN',
             'fr',
             'de',
             'ja',
@@ -171,7 +171,11 @@ public static function getPHPDocLink(string $target): string
 
         $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);

Original file line number	Diff line number	Diff line change
`@@ -1106,7 +1106,7 @@ AJAX.registerOnload('server/status/monitor.js', function () {`
`1106`	`1106`	`var windowWidth = $(window).width();`
`1107`	`1107`
`1108`	`1108`	`if (windowWidth > 768) {`
`1109`		`- wdt = (panelWidth - monitorSettings.columns * chartSpacing.width) / monitorSettings.columns;`
	`1109`	`+ wdt = (panelWidth - monitorSettings.columns * Math.abs(chartSpacing.width)) / monitorSettings.columns;`
`1110`	`1110`	`}`
`1111`	`1111`
`1112`	`1112`	`chartSize = {`