gnucash maint: Let override AppleLanguages on Macs.

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/35a64ffa (commit)
	from  https://github.com/Gnucash/gnucash/commit/c87870f9 (commit)



commit 35a64ffaf81edaf59d224648501a2ee5ef01b6de
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Jul 11 09:21:40 2020 -0700

    Let  override AppleLanguages on Macs.

diff --git a/gnucash/gnucash-core-app.cpp b/gnucash/gnucash-core-app.cpp
index a2c05e1ad..913edb35a 100644
--- a/gnucash/gnucash-core-app.cpp
+++ b/gnucash/gnucash-core-app.cpp
@@ -258,10 +258,13 @@ set_mac_locale()
  * before another call to setlocale messes it up. */
     gnc_localeconv ();
     /* Process the languages, including the one from the Apple locale. */
-    if ([languages count] > 0)
-        mac_set_languages(languages, lang_str);
-    else
-        g_setenv("LANGUAGE", [lang_str UTF8String], TRUE);
+    if (g_getenv("LANGUAGE") == NULL)
+    {
+        if ([languages count] > 0)
+            mac_set_languages(languages, lang_str);
+        else
+            g_setenv("LANGUAGE", [lang_str UTF8String], TRUE);
+    }
     [languages release];
     [pool drain];
 }



Summary of changes:
 gnucash/gnucash-core-app.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)