From 407d5d22698e65738efcec812df08a636e6700a2 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 5 Nov 2011 10:28:33 +0100 Subject: gettext is in i18n now, has nothing to do with porting --- .gitignore | 2 +- include/GNUmakefile | 8 ++++++++ include/wolf/log/log.h | 2 +- src/GNUmakefile | 14 +++++++++++--- src/daemon/daemon.c | 3 ++- src/daemon/pidfile.c | 2 +- src/daemon/signals.c | 2 +- src/errors.c | 2 +- src/i18n/gettext.c | 2 +- src/library/loader.c | 3 ++- src/log/log.c | 3 ++- src/service/service.c | 2 +- tests/GNUmakefile | 2 +- tests/daemon/testd.c | 3 ++- tests/i18n/test_gettext.c | 2 +- tests/i18n/test_gettext.pot | 3 ++- tests/i18n/test_gettext_de.po | 3 ++- tests/i18n/test_gettext_de_CH.po | 3 ++- 18 files changed, 42 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index fc16c3e..e210c31 100644 --- a/.gitignore +++ b/.gitignore @@ -39,7 +39,7 @@ tests/log/test.log tests/port/test_itoa tests/port/test_strlcat tests/port/test_strlcpy -tests/gettext/test_gettext +tests/i18n/test_gettext tests/port/test_getaddrinfo tests/port/test_gai_strerror_r tests/threads/test_create_join diff --git a/include/GNUmakefile b/include/GNUmakefile index f8ccbc0..606ec83 100644 --- a/include/GNUmakefile +++ b/include/GNUmakefile @@ -9,10 +9,14 @@ local_clean: -@rm -f wolf/*~ -@rm -f wolf/port/*.bak -@rm -f wolf/port/*~ + -@rm -f wolf/i18n/*.bak + -@rm -f wolf/i18n/*~ -@rm -f wolf/log/*.bak -@rm -f wolf/log/*~ -@rm -f wolf/daemon/*.bak -@rm -f wolf/daemon/*~ + -@rm -f wolf/threads/*.bak + -@rm -f wolf/threads/*~ -@rm -f wolf/library/*.bak -@rm -f wolf/library/*~ @@ -21,6 +25,10 @@ local_install: $(INSTALL) -m 644 wolf/*.h $(includedir)/wolf $(INSTALL) -d -m 755 $(includedir)/wolf/port $(INSTALL) -m 644 wolf/port/*.h $(includedir)/wolf/port +ifeq "$(ENABLE_NLS)" "1" + $(INSTALL) -d -m 755 $(includedir)/wolf/i18n + $(INSTALL) -m 644 wolf/threads/*.h $(includedir)/wolf/i18n +endif $(INSTALL) -d -m 755 $(includedir)/wolf/log $(INSTALL) -m 644 wolf/log/*.h $(includedir)/wolf/log $(INSTALL) -d -m 755 $(includedir)/wolf/daemon diff --git a/include/wolf/log/log.h b/include/wolf/log/log.h index e8f1878..cc3e376 100644 --- a/include/wolf/log/log.h +++ b/include/wolf/log/log.h @@ -19,8 +19,8 @@ #define WOLF_LOG_H #include "port/stdbool.h" /* for bool */ -#include "port/gettext.h" /* for _ */ #include "port/string.h" /* for strlcpy */ +#include "i18n/gettext.h" /* for _ */ /** * @addtogroup wolf_log Logging diff --git a/src/GNUmakefile b/src/GNUmakefile index f333dc3..363a30d 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -25,8 +25,10 @@ PORT_OBJS = \ port/netdb.o ifeq "$(ENABLE_NLS)" "1" -PORT_OBJS += \ - port/gettext.o +I18N_OBJS = \ + i18n/gettext.o +else +I18N_OBJS = endif LOG_OBJS = \ @@ -50,6 +52,7 @@ OBJS = \ errors.o \ $(THREADING_OBJS) \ $(PORT_OBJS) \ + $(I18N_OBJS) \ $(LOG_OBJS) \ $(DAEMON_OBJS) \ $(NETWORK_OBJS) \ @@ -78,6 +81,11 @@ local_clean: -@rm -f port/*.bak -@rm -f port/*~ -@rm -f port/*.d +ifeq "$(ENABLE_NLS)" "1" + -@rm -f i18n/*.bak + -@rm -f i18n/*~ + -@rm -f i18n/*.d +endif -@rm -f log/*.bak -@rm -f log/*~ -@rm -f log/*.d @@ -86,9 +94,9 @@ local_clean: -@rm -f daemon/*.d ifeq "$(ENABLE_THREADS)" "1" -@rm -f threads/*.bak -endif -@rm -f threads/*~ -@rm -f threads/*.d +endif -@rm -f library/*.bak -@rm -f library/*~ -@rm -f library/*.d diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c index f3118ae..f2ab746 100644 --- a/src/daemon/daemon.c +++ b/src/daemon/daemon.c @@ -20,8 +20,9 @@ #include "port/string.h" /* for strdup */ #include "port/limits.h" /* for PATH_MAX */ #include "port/noreturn.h" /* for NORETURN */ + #define DEFAULT_TEXT_DOMAIN "libwolf" -#include "port/gettext.h" /* for i18n */ +#include "i18n/gettext.h" /* for i18n */ #include "errors.h" #include "log/log.h" diff --git a/src/daemon/pidfile.c b/src/daemon/pidfile.c index 2b3818a..4f51b1b 100644 --- a/src/daemon/pidfile.c +++ b/src/daemon/pidfile.c @@ -22,7 +22,7 @@ #include "port/unistd.h" /* for getpid, open, write, read, * unlink, lockf */ #define DEFAULT_TEXT_DOMAIN "libwolf" -#include "port/gettext.h" /* for i18n */ +#include "i18n/gettext.h" /* for i18n */ #include "daemon/pidfile.h" diff --git a/src/daemon/signals.c b/src/daemon/signals.c index 2362b6c..fdd8f24 100644 --- a/src/daemon/signals.c +++ b/src/daemon/signals.c @@ -25,7 +25,7 @@ #include "port/unused.h" #define DEFAULT_TEXT_DOMAIN "libwolf" -#include "port/gettext.h" /* for i18n */ +#include "i18n/gettext.h" /* for i18n */ #include /* for getpid, pipe, write, read */ #include /* for errno */ diff --git a/src/errors.c b/src/errors.c index 9914b51..6b71548 100644 --- a/src/errors.c +++ b/src/errors.c @@ -18,7 +18,7 @@ #include "port/string.h" /* for strncpy, strerror_r */ #include "errors.h" -#include "port/gettext.h" /* for localization */ +#include "i18n/gettext.h" /* for localization */ #if defined _WIN32 diff --git a/src/i18n/gettext.c b/src/i18n/gettext.c index 5ab5b49..ddb1e01 100644 --- a/src/i18n/gettext.c +++ b/src/i18n/gettext.c @@ -15,7 +15,7 @@ along with this program. If not, see . */ -#include "port/gettext.h" +#include "i18n/gettext.h" #include "port/unused.h" #include /* for getenv */ diff --git a/src/library/loader.c b/src/library/loader.c index dbf0fe5..195653b 100644 --- a/src/library/loader.c +++ b/src/library/loader.c @@ -23,9 +23,10 @@ #include "port/stdlib.h" /* for malloc, free */ #include "port/stdio.h" /* for snprintf */ -#include "port/gettext.h" /* for i18n */ #include "port/string.h" /* for strncpy */ +#include "i18n/gettext.h" /* for i18n */ + /* check for type of dynamic loading interface */ #if !defined _WIN32 #if !defined HAVE_DLFCN diff --git a/src/log/log.c b/src/log/log.c index f1621b9..3199014 100644 --- a/src/log/log.c +++ b/src/log/log.c @@ -26,8 +26,9 @@ * time_t, struct tm */ #include "port/stdlib.h" /* for abort, itoa */ #include "port/unused.h" /* for WOLF_UNUSED */ + #define DEFAULT_TEXT_DOMAIN "libwolf" -#include "port/gettext.h" /* for i18n */ +#include "i18n/gettext.h" /* for i18n */ #include /* for variable arguments */ #include /* for errno */ diff --git a/src/service/service.c b/src/service/service.c index e63ce11..6a03036 100644 --- a/src/service/service.c +++ b/src/service/service.c @@ -20,7 +20,7 @@ #include "log/log.h" /* for logging */ #include "log/messages.h" /* for i18n */ -#include "port/gettext.h" /* for i18n */ +#include "i18n/gettext.h" /* for i18n */ #include /* for service functions */ diff --git a/tests/GNUmakefile b/tests/GNUmakefile index a09236b..4ad5ebb 100644 --- a/tests/GNUmakefile +++ b/tests/GNUmakefile @@ -9,7 +9,7 @@ SUBDIRS += threads endif ifeq "$(ENABLE_NLS)" "1" -SUBDIRS += gettext +SUBDIRS += i18n endif -include $(TOPDIR)/makefiles/gmake/sub.mk diff --git a/tests/daemon/testd.c b/tests/daemon/testd.c index 1da707d..f4bf8a6 100644 --- a/tests/daemon/testd.c +++ b/tests/daemon/testd.c @@ -17,8 +17,9 @@ #include "port/string.h" /* for strdup, memset */ #include "port/stdio.h" /* for fprintf */ + #define DEFAULT_TEXT_DOMAIN CMDLINE_PARSER_PACKAGE -#include "port/gettext.h" /* for i18n */ +#include "i18n/gettext.h" /* for i18n */ #include "errors.h" /* global error codes */ #include "log/log.h" /* logging facility */ diff --git a/tests/i18n/test_gettext.c b/tests/i18n/test_gettext.c index d5cb4c5..3aec0e3 100644 --- a/tests/i18n/test_gettext.c +++ b/tests/i18n/test_gettext.c @@ -22,7 +22,7 @@ #include /* for exit, EXIT_SUCCESS, free */ #include /* for errno */ -#include "port/gettext.h" /* for i18n */ +#include "i18n/gettext.h" /* for i18n */ int main( void ) { char *loc; diff --git a/tests/i18n/test_gettext.pot b/tests/i18n/test_gettext.pot index 16cbc9a..feaf747 100644 --- a/tests/i18n/test_gettext.pot +++ b/tests/i18n/test_gettext.pot @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-04-18 11:37+0200\n" +"POT-Creation-Date: 2011-11-05 10:20+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/tests/i18n/test_gettext_de.po b/tests/i18n/test_gettext_de.po index ca13feb..315d664 100644 --- a/tests/i18n/test_gettext_de.po +++ b/tests/i18n/test_gettext_de.po @@ -6,10 +6,11 @@ msgid "" msgstr "Project-Id-Version: WolfBones 0.0.1\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-04-18 11:37+0200\n" + "POT-Creation-Date: 2011-11-05 10:20+0100\n" "PO-Revision-Date: 2009-03-09 09:33+0100\n" "Last-Translator: \n" "Language-Team: German\n" + "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ASCII\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/tests/i18n/test_gettext_de_CH.po b/tests/i18n/test_gettext_de_CH.po index ca13feb..315d664 100644 --- a/tests/i18n/test_gettext_de_CH.po +++ b/tests/i18n/test_gettext_de_CH.po @@ -6,10 +6,11 @@ msgid "" msgstr "Project-Id-Version: WolfBones 0.0.1\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2010-04-18 11:37+0200\n" + "POT-Creation-Date: 2011-11-05 10:20+0100\n" "PO-Revision-Date: 2009-03-09 09:33+0100\n" "Last-Translator: \n" "Language-Team: German\n" + "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ASCII\n" "Content-Transfer-Encoding: 8bit\n" -- cgit v1.2.3-54-g00ecf