From 0c5ad568f698db9c00de1f9b8fe953855d41cbfd Mon Sep 17 00:00:00 2001 From: hjhun <36876573+hjhun@users.noreply.github.com> Date: Fri, 3 Feb 2023 17:25:01 +0900 Subject: [PATCH] [Applications.Common] Fix getting default locale (#4966) Signed-off-by: Hwankyu Jhun --- src/Tizen.Applications.Common/Interop/Interop.Libc.cs | 3 +++ .../Tizen.Applications/CoreApplication.cs | 7 +------ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Tizen.Applications.Common/Interop/Interop.Libc.cs b/src/Tizen.Applications.Common/Interop/Interop.Libc.cs index 55d23c9..81aacdd 100644 --- a/src/Tizen.Applications.Common/Interop/Interop.Libc.cs +++ b/src/Tizen.Applications.Common/Interop/Interop.Libc.cs @@ -26,6 +26,9 @@ internal static partial class Interop [DllImport(Libraries.Libc, EntryPoint = "free", CallingConvention = CallingConvention.Cdecl)] internal static extern int Free(IntPtr ptr); + [DllImport(Libraries.Libc, EntryPoint = "getenv")] + internal static extern IntPtr GetEnvironmentVariable(string name); + [NativeStruct("struct timespec", Include = "time.h")] [StructLayout(LayoutKind.Sequential)] internal struct TimeStamp diff --git a/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs b/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs index 3740a24..9156dbc 100644 --- a/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs +++ b/src/Tizen.Applications.Common/Tizen.Applications/CoreApplication.cs @@ -597,12 +597,7 @@ namespace Tizen.Applications internal static string GetDefaultLocale() { - IntPtr stringPtr = IntPtr.Zero; - if (Interop.BaseUtilsi18n.GetDefault(out stringPtr) != 0) - { - return string.Empty; - } - + IntPtr stringPtr = Interop.Libc.GetEnvironmentVariable("LANG"); if (stringPtr == IntPtr.Zero) { return string.Empty; -- 2.7.4