gettext is ready to rock and roll

diff --git a/otk/Makefile.am b/otk/Makefile.am
index b3e1076740ba6f594d2fa151b6e512f27cd598f2..075f4a412df40bace75225bc4a83765ebe12ee52 100644 (file)
--- a/otk/Makefile.am
+++ b/otk/Makefile.am
@@ -1,5 +1,4 @@
-CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@ \
--Dmultibyte\(\)=True
+CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@
 
 INCLUDES= -I../src
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 0936920b66f2c847d7d35abcbeeedd61c01ffd4c..9adefeeba4653c058d8009908a6946ee21f18c9b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,11 @@
+localedir=$(datadir)/locale
 DEFAULT_MENU=$(pkgdatadir)/menu
 DEFAULT_STYLE=$(pkgdatadir)/styles/mbdtex
 
 CPPFLAGS=`pkg-config --cflags xft` @CPPFLAGS@ \
 -DDEFAULTMENU=\"$(DEFAULT_MENU)\" \
--DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\"
+-DDEFAULTSTYLE=\"$(DEFAULT_STYLE)\" \
+-DLOCALEDIR=\"$(localedir)\"
 
 LDFLAGS=`pkg-config --libs xft`
 
@@ -11,7 +13,7 @@ INCLUDES= -I../otk
 
 bin_PROGRAMS= openbox
 
-openbox_LDADD=../otk/libotk.a
+openbox_LDADD=../otk/libotk.a @LIBINTL@
 
 openbox_SOURCES= basedisplay.cc configuration.cc screen.cc timer.cc util.cc \
                  window.cc workspace.cc xatom.cc blackbox.cc main.cc

diff --git a/src/blackbox.cc b/src/blackbox.cc
index 8e9214675383304a9d0461c573acb12365f6eb3d..8040ca36690987a84d479b2b1078b24bf3789b6a 100644 (file)
--- a/src/blackbox.cc
+++ b/src/blackbox.cc
@@ -89,6 +89,7 @@ Blackbox *blackbox;
 
 Blackbox::Blackbox(char **m_argv, char *dpy_name, char *rc)
   : BaseDisplay(m_argv[0], dpy_name) {
+
   if (! XSupportsLocale())
     fprintf(stderr, "X server does not support locale\n");
 

diff --git a/src/main.cc b/src/main.cc
index 4ea8aaf10c21715d409ae76479ff3cc0b44e1534..2bc4b3ce245348fcac5712d77cac5677db54e686 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -94,6 +94,11 @@ int main(int argc, char **argv) {
   char *rc_file = (char *) 0;
   char *menu_file = (char *) 0;
 
+  // initialize the locale
+  setlocale(LC_ALL, "");
+  bindtextdomain(PACKAGE, LOCALEDIR);
+  textdomain(PACKAGE);
+  
   for (int i = 1; i < argc; ++i) {
     if (! strcmp(argv[i], "-rc")) {
       // look for alternative rc file to use

diff --git a/src/xatom.cc b/src/xatom.cc
index 5561503adf8d97cc0992a1daad7cbcc112872b8c..0e92e471676a9f7fc26972e1f61ecfab1293cff8 100644 (file)
--- a/src/xatom.cc
+++ b/src/xatom.cc
@@ -1,7 +1,5 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#include "../config.h"
-
 #ifdef    HAVE_CONFIG_H
 #  include "../config.h"
 #endif // HAVE_CONFIG_H