From 73fefb860369ce660eb4b04d304d63d048935b83 Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Wed, 2 Apr 2025 15:15:23 +0530 Subject: [PATCH] Fixed an issue where query tool is crashing on macOS 15.4 due to a locale issue. #8623 --- docs/en_US/release_notes_9_2.rst | 3 ++- web/pgadmin/browser/__init__.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/en_US/release_notes_9_2.rst b/docs/en_US/release_notes_9_2.rst index 6373d5f70..721c9caa5 100644 --- a/docs/en_US/release_notes_9_2.rst +++ b/docs/en_US/release_notes_9_2.rst @@ -50,4 +50,5 @@ Bug fixes | `Issue #8577 `_ - Fixed an issue where the upgrade_check API returned an unexpected keyword argument 'cafile' due to changes in the urllib package supporting Python v3.13. | `Issue #8597 `_ - Fixed an issue where delete/rename was done on wrong file after sorting in Storage Manager. | `Issue #8602 `_ - Fixed an XSS vulnerability issue in the Query Tool and View/Edit Data (CVE-2025-2946). - | `Issue #8603 `_ - Fixed a remote code execution issue in the Query Tool and Cloud Deployment (CVE-2025-2945). \ No newline at end of file + | `Issue #8603 `_ - Fixed a remote code execution issue in the Query Tool and Cloud Deployment (CVE-2025-2945). + | `Issue #8623 `_ - Fixed an issue where query tool is crashing on macOS 15.4 due to a locale issue. diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py index d32277354..866d468ca 100644 --- a/web/pgadmin/browser/__init__.py +++ b/web/pgadmin/browser/__init__.py @@ -516,8 +516,8 @@ def utils(): if current_app.PGADMIN_RUNTIME: import locale try: - locale_info = locale.getdefaultlocale() - if len(locale_info) > 0: + locale_info = locale.getlocale() + if len(locale_info) > 0 and locale_info[0] != 'C': default_locale = locale_info[0].replace('_', '-') except Exception: current_app.logger.debug('Failed to get the default locale.')