diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-11-21 13:08:39 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-11-21 13:08:42 +0200 |
| commit | 9276233b9ea58a19a5c1490b70cbec90ebcc3147 (patch) | |
| tree | 8eb1cef8eadd62c4bebb4ee026eba0ab0f58fd49 /src/simplewallet | |
| parent | Merge pull request #492 (diff) | |
| parent | Fix startup crash when using a locale boost does not like (diff) | |
| download | monero-9276233b9ea58a19a5c1490b70cbec90ebcc3147.tar.xz | |
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)
Diffstat (limited to 'src/simplewallet')
| -rw-r--r-- | src/simplewallet/simplewallet.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/simplewallet/simplewallet.cpp b/src/simplewallet/simplewallet.cpp index 3d7a23d5e..3e1ca4210 100644 --- a/src/simplewallet/simplewallet.cpp +++ b/src/simplewallet/simplewallet.cpp @@ -2164,6 +2164,9 @@ int main(int argc, char* argv[]) //TRY_ENTRY(); + std::string lang = i18n_get_language(); + tools::sanitize_locale(); + string_tools::set_module_name_and_folder(argv[0]); po::options_description desc_general(sw::tr("General options")); @@ -2212,7 +2215,7 @@ int main(int argc, char* argv[]) po::positional_options_description positional_options; positional_options.add(arg_command.name, -1); - i18n_set_language("translations", "monero"); + i18n_set_language("translations", "monero", lang); po::options_description desc_all; desc_all.add(desc_general).add(desc_params); |