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/common/i18n.h | |
| 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/common/i18n.h')
| -rw-r--r-- | src/common/i18n.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/i18n.h b/src/common/i18n.h index 2aeac2287..8a1f3cf3d 100644 --- a/src/common/i18n.h +++ b/src/common/i18n.h @@ -30,7 +30,8 @@ #define QT_TRANSLATE_NOOP(context,str) i18n_translate(str,context) -int i18n_set_language(const char *directory, const char *base); +std::string i18n_get_language(); +int i18n_set_language(const char *directory, const char *base, std::string language = std::string()); const char *i18n_translate(const char *str, const std::string &context); static inline std::string get_default_i18n_context() { return std::string(); } static inline const char *tr(const char *str) { return i18n_translate(str,get_default_i18n_context()); } |