From a8bf2e9402967b912bf92923761db8cd08fb33d5 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Wed, 23 Jan 2013 16:09:10 +0000 Subject: more i18n fixes, this time removing a hack that broke i18n in bundles, and also only initializing NLS stuff if ENABLE_NLS is in effect. note that if translations are disabled by the user, we set the localedir used to look for message catalogs to a dir that is assumed to not exist (/this/cannot/exist) which should block all translation from happening. git-svn-id: svn://localhost/ardour2/branches/3.0@13975 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/globals.cc | 2 ++ libs/gtkmm2ext/utils.cc | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'libs') diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index e750792c5f..c23cb614fe 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -224,7 +224,9 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir // this really should be in PBD::init..if there was one Gio::init (); +#ifdef ENABLE_NLS (void) bindtextdomain(PACKAGE, localedir); +#endif PBD::ID::init (); SessionEvent::init_event_pool (); diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc index 14f3ba2732..4bc9113875 100644 --- a/libs/gtkmm2ext/utils.cc +++ b/libs/gtkmm2ext/utils.cc @@ -39,8 +39,9 @@ using namespace std; void Gtkmm2ext::init (const char* localedir) { - // Necessary for gettext +#ifdef ENABLE_NLS (void) bindtextdomain(PACKAGE, localedir); +#endif } void -- cgit v1.2.3