Merge pull request #493

f3724ae Fix startup crash when using a locale boost does not like (moneromooo-monero)
0c1dae3 i18n: allow language to be passed as a parameter (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2015-11-21 13:08:39 +02:00
commit 9276233b9e
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
9 changed files with 40 additions and 6 deletions

View file

@ -538,6 +538,8 @@ int main(int argc, char* argv[])
std::string m_config_folder;
std::string db_arg_str;
tools::sanitize_locale();
boost::filesystem::path default_data_path {tools::get_default_data_dir()};
boost::filesystem::path default_testnet_data_path {default_data_path / "testnet"};
std::string import_file_path;