summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-03-25 22:58:15 +0000
committerCarl Hetherington <cth@carlh.net>2013-03-25 22:58:15 +0000
commitfed8744100ee8e58c09b0394d05ac908f2c4e15f (patch)
treee2e95f04adeb38ff11c871724056d82531f5bb13 /src/lib
parentbe4a3a2bf0ed227f57fbe0e5efc4d47eff43216a (diff)
Improve language setup.
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/config.h4
-rw-r--r--src/lib/util.cc5
2 files changed, 8 insertions, 1 deletions
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);