1 files changed, 36 insertions, 32 deletions

diff --git a/src/i18n.hh b/src/i18n.hh
index a2b97b9..5e6bfa4 100644
--- a/src/i18n.hh
+++ b/src/i18n.hh
@@ -1,3 +1,6 @@
+// i18n.hh for Fluxbox Window Manager
+// Copyright (c) 2001 - 2002 Henrik Kinnunen (fluxgen@linuxmail.org)
+//
 // i18n.hh for Blackbox - an X11 Window manager
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -19,53 +22,54 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-#ifndef   __i18n_h
-#define   __i18n_h
+// $Id: i18n.hh,v 1.9 2002/08/15 10:52:16 fluxgen Exp $
+
+#ifndef  I18N_HH
+#define  I18N_HH
+
+#include "../nls/blackbox-nls.hh"
 
-#ifdef    NLS
-#  include "../nls/blackbox-nls.hh"
-#endif // NLS
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif // HAVE_CONFIG_H
 
-#ifdef    HAVE_LOCALE_H
-#  include <locale.h>
+#ifdef          HAVE_LOCALE_H
+#       include <locale.h>
 #endif // HAVE_LOCALE_H
 
-#ifdef    HAVE_NL_TYPES_H
+#ifdef          HAVE_NL_TYPES_H
 // this is needed for linux libc5 systems
 extern "C" {
-#  include <nl_types.h>
+#       include <nl_types.h>
 }
+#else // HAVE_NL_TYPES_H
+#include "nl_types_cygnus.h"
 #endif // HAVE_NL_TYPES_H
 
+#ifdef __CYGWIN32__
+#       include "nl_types_cygnus.h"
+#endif
 
-class I18n {
-private:
-  char *locale, *catalog_filename;
-  int mb;
-  nl_catd catalog_fd;
+#include <string>
 
-
-protected:
-  I18n(void);
- 
+class I18n {
 public:
-        //so old compilators dont complain
-        ~I18n(void);
-        
         static I18n *instance();
-  inline const char *getLocale(void) const { return locale; }
-  inline const char *getCatalogFilename(void) const { return catalog_filename; }
-  
-  inline const int &multibyte(void) const { return mb; }
+        inline const char *getLocale(void) const { return m_locale.c_str(); }
+        inline bool multibyte(void) const { return m_multibyte; }
+        inline const nl_catd &getCatalogFd(void) const { return m_catalog_fd; }
 
-  inline const nl_catd &getCatalogFd(void) const { return catalog_fd; }
+        const char *getMessage(int set_number, int message_number, const char *default_messsage = 0);
+        void openCatalog(const char *);
+private:
+        I18n();
+        ~I18n();
+        std::string m_locale;
+        bool m_multibyte;
+        nl_catd m_catalog_fd;
 
-  const char *getMessage(int, int, const char * = 0);
-  void openCatalog(const char *);
 };
 
+void NLSInit(const char *);
 
-//extern I18n *i18n;
-extern void NLSInit(const char *);
-
-#endif // __i18n_h
+#endif // I18N_HH