From 53b3120b322603c317a0ea9cd88e5a7cefe604ee Mon Sep 17 00:00:00 2001 From: Mathias Gumz Date: Wed, 4 Feb 2015 21:06:32 +0100 Subject: Move nls globals into #ifdef NLS --- src/FbTk/I18n.cc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/FbTk/I18n.cc b/src/FbTk/I18n.cc index 18eb67c..aae68ba 100644 --- a/src/FbTk/I18n.cc +++ b/src/FbTk/I18n.cc @@ -66,15 +66,14 @@ using std::string; namespace { +#if defined(NLS) + const char UTF8_SUFFIX[] = "-UTF-8.cat"; const size_t UTF8_SUFFIX_LEN = sizeof(UTF8_SUFFIX)-1; // without \0 const char DEFAULT_CATFILE[] = "fluxbox.cat"; const char ENV_CATFILE[] = "FLUXBOX_CATFILE"; const char ENV_CATDIR[] = "FLUXBOX_CATDIR"; -const nl_catd INVALID_CATALOG = (nl_catd)(-1); -nl_catd s_catalog_fd = INVALID_CATALOG; - const char* getCatalogDir() { const char* cat_dir = getenv(ENV_CATDIR); @@ -84,6 +83,12 @@ const char* getCatalogDir() { return LOCALEPATH; } +#endif + + +const nl_catd INVALID_CATALOG = (nl_catd)(-1); +nl_catd s_catalog_fd = INVALID_CATALOG; + std::string join_str(size_t n, ...) { std::string s; -- cgit v0.11.2