jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

plugins: avoid getting system language every time

Browse Source 
GitLab: #780

Change-Id: I50e5dff097c4573f24f9ba6c25fa38e2857479ae
This commit is contained in:
Aline Gondim Santos
2022-10-19 12:06:24 -03:00
parent 8e0c09256a
commit c0afc3ab8d
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugin/pluginpreferencesutils.cpp
View File

@ -163,7 +163,7 @@ PluginPreferencesUtils::getPreferences(const std::string& rootPath, const std::s
if (auto envLang = std::getenv("JAMI_LANG"))
lang = envLang;
else
JAMI_ERR() << "Error getting JAMI_LANG env, trying to get system language";
JAMI_INFO() << "Error getting JAMI_LANG env, trying to get system language";
// If language preference is empty, try to get from the system.
if (lang.empty()) {
#ifdef WIN32
@ -182,9 +182,22 @@ PluginPreferencesUtils::getPreferences(const std::string& rootPath, const std::s
lang.append(utf8Buffer);
string_replace(lang, "-", "_");
}
// Even though we default to the system variable in windows, technically this
// part of the code should not be reached because the client-qt must define that
// variable and we cannot run the client and the daemon in diferent processes in Windows.
#else
// For Android this should not work since std::locale is not supported by the NDK.
lang = std::locale("").name();
// The same way described in the comment just above, the android should not reach this
// part of the code given the client-android must define "JAMI_LANG" system variable.
// And even if this part is reached, it should not work since std::locale is not
// supported by the NDK.
// LC_COLLATE is used to grab the locale for the case when the system user has set different
// values for the preferred Language and Format.
lang = setlocale(LC_COLLATE, "");
// We set the environment to avoid checking from system everytime.
// This is the case when running daemon and client in different processes
// like with dbus.
setenv("JAMI_LANG", lang.c_str(), 1);
#endif // WIN32
}
auto locales = getLocales(rootPath, std::string(string_remove_suffix(lang, '.')));