From d7ce09ff15235db1a059e3de14f7eaa63a0dcade Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 13 May 2014 08:56:30 +0100 Subject: [PATCH] Tweaks to SystemStats::getDisplayLanguage() on android/linux to return a two-part identifier in the same way as other platforms. --- modules/juce_core/native/juce_android_SystemStats.cpp | 2 +- modules/juce_core/native/juce_linux_SystemStats.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/juce_core/native/juce_android_SystemStats.cpp b/modules/juce_core/native/juce_android_SystemStats.cpp index 51a76ad674..8223b892c5 100644 --- a/modules/juce_core/native/juce_android_SystemStats.cpp +++ b/modules/juce_core/native/juce_android_SystemStats.cpp @@ -273,7 +273,7 @@ String SystemStats::getComputerName() String SystemStats::getUserLanguage() { return AndroidStatsHelpers::getLocaleValue (false); } String SystemStats::getUserRegion() { return AndroidStatsHelpers::getLocaleValue (true); } -String SystemStats::getDisplayLanguage() { return getUserLanguage(); } +String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } //============================================================================== void CPUInformation::initialise() noexcept diff --git a/modules/juce_core/native/juce_linux_SystemStats.cpp b/modules/juce_core/native/juce_linux_SystemStats.cpp index a98c490593..939edb47bc 100644 --- a/modules/juce_core/native/juce_linux_SystemStats.cpp +++ b/modules/juce_core/native/juce_linux_SystemStats.cpp @@ -139,7 +139,7 @@ static String getLocaleValue (nl_item key) String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); } String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); } -String SystemStats::getDisplayLanguage() { return getUserLanguage(); } +String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } //============================================================================== void CPUInformation::initialise() noexcept