From c495ab4a42ee74205ede3342d2e8d9df1d60fc45 Mon Sep 17 00:00:00 2001
From: Laurent Monin <github@norz.org>
Date: Sun, 11 Jun 2023 11:30:56 +0200
Subject: [PATCH] macos: return set locale if possible, and just return
 set_locale_from_env() if not

---
 picard/i18n.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/picard/i18n.py b/picard/i18n.py
index 691e45e00..92c373989 100644
--- a/picard/i18n.py
+++ b/picard/i18n.py
@@ -93,11 +93,10 @@ elif IS_MACOS:
         current_locale = defaults.objectForKey_('AppleLanguages')[0]
         current_locale = current_locale.replace('-', '_')
         try:
-            locale.setlocale(locale.LC_ALL, current_locale)
-            return current_locale
+            return locale.setlocale(locale.LC_ALL, current_locale)
         except locale.Error:
-            _logger("Defaulting to C locale")
-            return locale.setlocale(locale.LC_ALL, 'C')
+            _logger("Failed to set locale: %r", current_locale)
+            return set_locale_from_env()
 
 else:
     def _init_default_locale():