refix i18n for --disable-nls

[chaz/openbox] / src / i18n.cc

diff --git a/src/i18n.cc b/src/i18n.cc
index b8aa361a45f7eec351e905e28ea39dff7b1418b9..718ee4e733474e5b6f43839214042afbeb3a899f 100644 (file)
--- a/src/i18n.cc
+++ b/src/i18n.cc
@@ -46,7 +46,6 @@ extern "C" {
 }
 
 #include <string>
-using std::string;
 
 #include "i18n.h"
 
@@ -87,9 +86,9 @@ I18n::~I18n() {
 }
 
 
-void I18n::openCatalog(const char *catalog) {
 #if defined(NLS) && defined(HAVE_CATOPEN)
-  string catalog_filename = LOCALEPATH;
+void I18n::openCatalog(const char *catalog) {
+  std::string catalog_filename = LOCALEPATH;
   catalog_filename += '/';
   catalog_filename += locale;
   catalog_filename += '/';
@@ -103,14 +102,21 @@ void I18n::openCatalog(const char *catalog) {
 
   if (catalog_fd == (nl_catd) -1)
     fprintf(stderr, "failed to open catalog, using default messages\n");
-#endif // HAVE_CATOPEN
 }
+#else
+void I18n::openCatalog(const char *) {
+}
+#endif // HAVE_CATOPEN
 
-const char* I18n::operator()(int set, int msg, const char *msgString) const {
 #if   defined(NLS) && defined(HAVE_CATGETS)
+const char* I18n::operator()(int set, int msg, const char *msgString) const {
   if (catalog_fd != (nl_catd) -1)
     return catgets(catalog_fd, set, msg, msgString);
   else
-#endif
     return msgString;
 }
+#else
+const char* I18n::operator()(int, int, const char *msgString) const {
+  return msgString;
+}
+#endif