Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #1132 Set the LanguageCode when client is creating a client.cfg

Browse source
This commit is contained in:
kervala 2010-10-16 14:34:09 +02:00
parent 03db06e0c6
commit ce33eb213a
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
code/ryzom/client/src/client_cfg.cpp
View file

@ -24,6 +24,7 @@
// Misc. // Misc.
#include "nel/misc/config_file.h" #include "nel/misc/config_file.h"
#include "nel/misc/bit_mem_stream.h" #include "nel/misc/bit_mem_stream.h"
#include "nel/misc/i18n.h"
// Client. // Client.
#include "client_cfg.h" #include "client_cfg.h"
#include "entities.h" #include "entities.h"
@ -44,6 +45,8 @@
# include "config.h" # include "config.h"
#endif // HAVE_CONFIG_H #endif // HAVE_CONFIG_H
#include <locale.h>
/////////// ///////////
// MACRO // // MACRO //
/////////// ///////////
@ -1895,15 +1898,34 @@ void CClientConfig::init(const string &configFileName)
{ {
// create the basic .cfg that link the default one // create the basic .cfg that link the default one
FILE *fp = fopen(configFileName.c_str(), "w"); FILE *fp = fopen(configFileName.c_str(), "w");
if (fp == NULL)
if (fp == NULL)
{
nlerror("CFG::init: Can't create config file '%s'", configFileName.c_str());
}
else
{
nlwarning("CFG::init: creating '%s' with default values", configFileName.c_str ());
}
fprintf(fp, "RootConfigFilename = \"%s\";\n", defaultConfigFileName.c_str());
// get current locale
std::string lang = toLower(std::string(setlocale(LC_CTYPE, "")));
lang = lang.substr(0, 2);
const std::vector<std::string> &languages = CI18N::getLanguageCodes();
// search if current locale is defined in language codes
for(uint i = 0; i < languages.size(); ++i)
{ {
nlerror ("CFG::init: Can't create config file '%s'", configFileName.c_str()); if (lang == languages[i])
{
fprintf(fp, "LanguageCode = \"%s\";\n", lang.c_str());
break;
}
} }
else
{
nlwarning("CFG::init: creating '%s' with default values", configFileName.c_str ());
}
fprintf(fp, "RootConfigFilename = \"%s\";\n", defaultConfigFileName.c_str());
fclose(fp); fclose(fp);
} }
else else