diff options
author | Mathias Gumz <akira@fluxbox.org> | 2015-02-04 20:06:32 (GMT) |
---|---|---|
committer | Mathias Gumz <akira@fluxbox.org> | 2015-02-04 20:06:32 (GMT) |
commit | 53b3120b322603c317a0ea9cd88e5a7cefe604ee (patch) | |
tree | de0e4b34ca6a2dec0afe5e3ac15b832d22e027fd /src | |
parent | 461d4b7dbd9bc8c651eb3cf28ffe8708dca16c5e (diff) | |
download | fluxbox-53b3120b322603c317a0ea9cd88e5a7cefe604ee.zip fluxbox-53b3120b322603c317a0ea9cd88e5a7cefe604ee.tar.bz2 |
Move nls globals into #ifdef NLS
Diffstat (limited to 'src')
-rw-r--r-- | src/FbTk/I18n.cc | 11 |
1 files 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; | |||
66 | 66 | ||
67 | namespace { | 67 | namespace { |
68 | 68 | ||
69 | #if defined(NLS) | ||
70 | |||
69 | const char UTF8_SUFFIX[] = "-UTF-8.cat"; | 71 | const char UTF8_SUFFIX[] = "-UTF-8.cat"; |
70 | const size_t UTF8_SUFFIX_LEN = sizeof(UTF8_SUFFIX)-1; // without \0 | 72 | const size_t UTF8_SUFFIX_LEN = sizeof(UTF8_SUFFIX)-1; // without \0 |
71 | const char DEFAULT_CATFILE[] = "fluxbox.cat"; | 73 | const char DEFAULT_CATFILE[] = "fluxbox.cat"; |
72 | const char ENV_CATFILE[] = "FLUXBOX_CATFILE"; | 74 | const char ENV_CATFILE[] = "FLUXBOX_CATFILE"; |
73 | const char ENV_CATDIR[] = "FLUXBOX_CATDIR"; | 75 | const char ENV_CATDIR[] = "FLUXBOX_CATDIR"; |
74 | 76 | ||
75 | const nl_catd INVALID_CATALOG = (nl_catd)(-1); | ||
76 | nl_catd s_catalog_fd = INVALID_CATALOG; | ||
77 | |||
78 | 77 | ||
79 | const char* getCatalogDir() { | 78 | const char* getCatalogDir() { |
80 | const char* cat_dir = getenv(ENV_CATDIR); | 79 | const char* cat_dir = getenv(ENV_CATDIR); |
@@ -84,6 +83,12 @@ const char* getCatalogDir() { | |||
84 | return LOCALEPATH; | 83 | return LOCALEPATH; |
85 | } | 84 | } |
86 | 85 | ||
86 | #endif | ||
87 | |||
88 | |||
89 | const nl_catd INVALID_CATALOG = (nl_catd)(-1); | ||
90 | nl_catd s_catalog_fd = INVALID_CATALOG; | ||
91 | |||
87 | 92 | ||
88 | std::string join_str(size_t n, ...) { | 93 | std::string join_str(size_t n, ...) { |
89 | std::string s; | 94 | std::string s; |