Mercurial > hg > orthanc

comparison 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
comparison
equal deleted inserted replaced
2329:55c900a5b0e4 2330:9c7a80c87ae9
462 462
463 void OrthancInitialize(const char* configurationFile) 463 void OrthancInitialize(const char* configurationFile)
464 { 464 {
465 boost::recursive_mutex::scoped_lock lock(globalMutex_); 465 boost::recursive_mutex::scoped_lock lock(globalMutex_);
466 466
467 Toolbox::InitializeGlobalLocale();
468 HttpClient::InitializeOpenSsl(); 467 HttpClient::InitializeOpenSsl();
469 468
470 InitializeServerEnumerations(); 469 InitializeServerEnumerations();
471 470
472 // Read the user-provided configuration 471 // Read the user-provided configuration
473 ReadGlobalConfiguration(configurationFile); 472 ReadGlobalConfiguration(configurationFile);
474 ValidateGlobalConfiguration(); 473 ValidateGlobalConfiguration();
474
475 if (configuration_.isMember("Locale"))
476 {
477 std::string locale = GetGlobalStringParameterInternal("Locale", "");
478 Toolbox::InitializeGlobalLocale(configuration_["Locale"].asCString());
479 }
480 else
481 {
482 Toolbox::InitializeGlobalLocale(NULL);
483 }
475 484
476 if (configuration_.isMember("Pkcs11")) 485 if (configuration_.isMember("Pkcs11"))
477 { 486 {
478 ConfigurePkcs11(configuration_["Pkcs11"]); 487 ConfigurePkcs11(configuration_["Pkcs11"]);
479 } 488 }