From 9c4cc220332a42f8f2045cafd4fc1bb1fdd84858 Mon Sep 17 00:00:00 2001 From: Binrui Dong Date: Wed, 17 Mar 2021 18:05:33 -0400 Subject: [PATCH] Detect iOS system language --- src/translations.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/translations.cpp b/src/translations.cpp index d92a05a9d0c7b..f28acc3ac0113 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -38,7 +38,7 @@ #include "cata_utility.h" -std::string getOSXSystemLang(); +std::string getAppleSystemLang(); #endif #if defined(__ANDROID__) @@ -214,8 +214,8 @@ void set_language() std::string system_lang; #if defined(_WIN32) system_lang = getLangFromLCID( GetUserDefaultLCID() ); -#elif defined(MACOSX) - system_lang = getOSXSystemLang(); +#elif defined(__APPLE__) + system_lang = getAppleSystemLang(); // macOS and iOS #elif defined(__ANDROID__) system_lang = getAndroidSystemLang(); #endif @@ -288,8 +288,8 @@ void set_language() } while( current_language_version == INVALID_LANGUAGE_VERSION ); } -#if defined(MACOSX) -std::string getOSXSystemLang() +#if defined(__APPLE__) +std::string getAppleSystemLang() { // Get the user's language list (in order of preference) CFArrayRef langs = CFLocaleCopyPreferredLanguages();