From fed8744100ee8e58c09b0394d05ac908f2c4e15f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 25 Mar 2013 22:58:15 +0000 Subject: Improve language setup. --- src/lib/config.h | 4 ++++ src/lib/util.cc | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src/lib') diff --git a/src/lib/config.h b/src/lib/config.h index ee46166e6..011ca716f 100644 --- a/src/lib/config.h +++ b/src/lib/config.h @@ -165,6 +165,10 @@ public: void set_language (std::string l) { _language = l; } + + void unset_language () { + _language = boost::none; + } void write () const; diff --git a/src/lib/util.cc b/src/lib/util.cc index 593d0e760..2e4671251 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -271,7 +271,10 @@ dvdomatic_setup_i18n (string lang) putenv (e.c_str()); bindtextdomain ("libdvdomatic", mo_path().string().c_str()); -#endif +#else + /* Hack to silence warning */ + lang.clear (); +#endif #ifdef DVDOMATIC_POSIX bindtextdomain ("libdvdomatic", POSIX_LOCALE_PREFIX); -- cgit v1.2.3