Mercurial > hg > orthanc

diff OrthancServer/OrthancInitialization.cpp @ 2330:9c7a80c87ae9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
"Locale" configuration option
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 14 Jul 2017 16:34:16 +0200
parents 423d3b692bb9
children 3ab96768d144
line wrap: on
line diff
--- a/OrthancServer/OrthancInitialization.cpp	Fri Jul 14 16:17:02 2017 +0200
+++ b/OrthancServer/OrthancInitialization.cpp	Fri Jul 14 16:34:16 2017 +0200
@@ -464,7 +464,6 @@
   {
     boost::recursive_mutex::scoped_lock lock(globalMutex_);
 
-    Toolbox::InitializeGlobalLocale();
     HttpClient::InitializeOpenSsl();
 
     InitializeServerEnumerations();
@@ -473,6 +472,16 @@
     ReadGlobalConfiguration(configurationFile);
     ValidateGlobalConfiguration();
 
+    if (configuration_.isMember("Locale"))
+    {
+      std::string locale = GetGlobalStringParameterInternal("Locale", "");
+      Toolbox::InitializeGlobalLocale(configuration_["Locale"].asCString());
+    }
+    else
+    {
+      Toolbox::InitializeGlobalLocale(NULL);
+    }
+
     if (configuration_.isMember("Pkcs11"))
     {
       ConfigurePkcs11(configuration_["Pkcs11"]);