From 57aad9888cf59e7f06e9cdcbc6041877b363734b Mon Sep 17 00:00:00 2001 From: Mathieu Schroeter Date: Wed, 15 Feb 2017 22:13:58 +0100 Subject: [PATCH] Remove useless context stuff with gettext --- src/decor.cpp | 12 +-- src/decstat.cpp | 6 +- src/event.cpp | 2 +- src/gettext.h | 5 +- src/gettext/gettext.h | 236 ------------------------------------------ 5 files changed, 11 insertions(+), 250 deletions(-) delete mode 100644 src/gettext/gettext.h diff --git a/src/decor.cpp b/src/decor.cpp index 52ad536..efb01b8 100644 --- a/src/decor.cpp +++ b/src/decor.cpp @@ -3041,17 +3041,17 @@ const char *CDecor::GetResHili (POINT posMouse) { 72, { false, translate ("Bridge") } }, { 73, { false, translate ("Bridge") } }, { 80, { true, translate ("Medical potion") } }, - { 81, { false, ptranslate ("Flower|1|", "Flowers") } }, - { 82, { true, ptranslate ("Flower|1|", "Bunch of flowers") } }, - { 83, { false, ptranslate ("Flower|2|", "Flowers") } }, - { 84, { true, ptranslate ("Flower|2|", "Bunch of flowers") } }, + { 81, { false, translate ("Flowers") } }, + { 82, { true, translate ("Bunch of flowers") } }, + { 83, { false, translate ("Flowers") } }, + { 84, { true, translate ("Bunch of flowers") } }, { 85, { true, translate ("Dynamite") } }, { 86, { true, translate ("Dynamite") } }, { 87, { true, translate ("Dynamite") } }, { 92, { true, translate ("Poison") } }, { 93, { true, translate ("Sticky trap") } }, - { 94, { false, ptranslate ("Flower|3|", "Flowers") } }, - { 95, { true, ptranslate ("Flower|3|", "Bunch of flowers") } }, + { 94, { false, translate ("Flowers") } }, + { 95, { true, translate ("Bunch of flowers") } }, { 96, { true, translate ("Trapped enemy") } }, { 97, { true, translate ("Trapped enemy") } }, { 98, { true, translate ("Trapped enemy") } }, diff --git a/src/decstat.cpp b/src/decstat.cpp index ff6f15d..e5f0c27 100644 --- a/src/decstat.cpp +++ b/src/decstat.cpp @@ -198,7 +198,7 @@ static Statistic table_statistic[] = 82, 82, // fleurs1 72, false, - ptranslate ("Flower|1|", "Flowers"), + translate ("Flowers"), 0, 0, }, { // 18 @@ -207,7 +207,7 @@ static Statistic table_statistic[] = 84, 84, // fleurs2 73, false, - ptranslate ("Flower|2|", "Flowers"), + translate ("Flowers"), 0, 0, }, { // 19 @@ -216,7 +216,7 @@ static Statistic table_statistic[] = 95, 95, // fleurs3 74, false, - ptranslate ("Flower|3|", "Flowers"), + translate ("Flowers"), 0, 0, }, { // 20 diff --git a/src/event.cpp b/src/event.cpp index c6e5bc2..39da9e1 100644 --- a/src/event.cpp +++ b/src/event.cpp @@ -840,7 +840,7 @@ static Phase table[] = translate ("Delete item"), translate ("Decorative plants"), translate ("Tree"), - ptranslate ("Flower|1|", "Flowers") + translate ("Flowers") }, }, { diff --git a/src/gettext.h b/src/gettext.h index 3d395b2..f9cac8e 100644 --- a/src/gettext.h +++ b/src/gettext.h @@ -1,9 +1,6 @@ + #pragma once -#define ENABLE_NLS 1 -#include #include -#include "gettext/gettext.h" #define translate(msgid) msgid -#define ptranslate(msgctx, msgid) msgctx GETTEXT_CONTEXT_GLUE msgid diff --git a/src/gettext/gettext.h b/src/gettext/gettext.h deleted file mode 100644 index 242b226..0000000 --- a/src/gettext/gettext.h +++ /dev/null @@ -1,236 +0,0 @@ -/* Convenience header for conditional use of GNU . - Copyright (C) 1995-1998, 2000-2002, 2004-2006 Free Software Foundation, Inc. - - This program is free software; you can redistribute it and/or modify it - under the terms of the GNU Library General Public License as published - by the Free Software Foundation; either version 2, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - -#ifndef _LIBGETTEXT_H -#define _LIBGETTEXT_H 1 - -/* NLS can be disabled through the configure --disable-nls option. */ -#if ENABLE_NLS - -/* Get declarations of GNU message catalog functions. */ -# include - -#else - -/* Solaris /usr/include/locale.h includes /usr/include/libintl.h, which - chokes if dcgettext is defined as a macro. So include it now, to make - later inclusions of a NOP. We don't include - as well because people using "gettext.h" will not include , - and also including would fail on SunOS 4, whereas - is OK. */ -#if defined(__sun) -# include -#endif - -/* Many header files from the libstdc++ coming with g++ 3.3 or newer include - , which chokes if dcgettext is defined as a macro. So include - it now, to make later inclusions of a NOP. */ -#if defined(__cplusplus) && defined(__GNUG__) && (__GNUC__ >= 3) -# include -# if (__GLIBC__ >= 2) || _GLIBCXX_HAVE_LIBINTL_H -# include -# endif -#endif - -/* Disabled NLS. - The casts to 'const char *' serve the purpose of producing warnings - for invalid uses of the value returned from these functions. - On pre-ANSI systems without 'const', the config.h file is supposed to - contain "#define const". */ -# define gettext(Msgid) ((const char *) (Msgid)) -# define dgettext(Domainname, Msgid) ((const char *) (Msgid)) -# define dcgettext(Domainname, Msgid, Category) ((const char *) (Msgid)) -# define ngettext(Msgid1, Msgid2, N) \ - ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define dngettext(Domainname, Msgid1, Msgid2, N) \ - ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define dcngettext(Domainname, Msgid1, Msgid2, N, Category) \ - ((N) == 1 ? (const char *) (Msgid1) : (const char *) (Msgid2)) -# define textdomain(Domainname) ((const char *) (Domainname)) -# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname)) -# define bind_textdomain_codeset(Domainname, Codeset) ((const char *) (Codeset)) - -#endif - -/* A pseudo function call that serves as a marker for the automated - extraction of messages, but does not call gettext(). The run-time - translation is done at a different place in the code. - The argument, String, should be a literal string. Concatenated strings - and other string expressions won't work. - The macro's expansion is not parenthesized, so that it is suitable as - initializer for static 'char[]' or 'const char[]' variables. */ -#define gettext_noop(String) String - -/* The separator between msgctxt and msgid in a .mo file. */ -#define GETTEXT_CONTEXT_GLUE "\004" - -/* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a - MSGID. MSGCTXT and MSGID must be string literals. MSGCTXT should be - short and rarely need to change. - The letter 'p' stands for 'particular' or 'special'. */ -#define pgettext(Msgctxt, Msgid) \ - pgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) -#define dpgettext(Domainname, Msgctxt, Msgid) \ - pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, LC_MESSAGES) -#define dcpgettext(Domainname, Msgctxt, Msgid, Category) \ - pgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, Category) -#define npgettext(Msgctxt, Msgid, MsgidPlural, N) \ - npgettext_aux (NULL, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) -#define dnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ - npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, LC_MESSAGES) -#define dcnpgettext(Domainname, Msgctxt, Msgid, MsgidPlural, N, Category) \ - npgettext_aux (Domainname, Msgctxt GETTEXT_CONTEXT_GLUE Msgid, Msgid, MsgidPlural, N, Category) - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static const char * -pgettext_aux (const char *domain, - const char *msg_ctxt_id, const char *msgid, - int category) -{ - const char *translation = dcgettext (domain, msg_ctxt_id, category); - if (translation == msg_ctxt_id) - return msgid; - else - return translation; -} - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static const char * -npgettext_aux (const char *domain, - const char *msg_ctxt_id, const char *msgid, - const char *msgid_plural, unsigned long int n, - int category) -{ - const char *translation = - dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); - if (translation == msg_ctxt_id || translation == msgid_plural) - return (n == 1 ? msgid : msgid_plural); - else - return translation; -} - -/* The same thing extended for non-constant arguments. Here MSGCTXT and MSGID - can be arbitrary expressions. But for string literals these macros are - less efficient than those above. */ - -#include - -#define pgettext_expr(Msgctxt, Msgid) \ - dcpgettext_expr (NULL, Msgctxt, Msgid, LC_MESSAGES) -#define dpgettext_expr(Domainname, Msgctxt, Msgid) \ - dcpgettext_expr (Domainname, Msgctxt, Msgid, LC_MESSAGES) - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static const char * -dcpgettext_expr (const char *domain, - const char *msgctxt, const char *msgid, - int category) -{ - size_t msgctxt_len = strlen (msgctxt) + 1; - size_t msgid_len = strlen (msgid) + 1; - const char *translation; -#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS - char msg_ctxt_id[msgctxt_len + msgid_len]; -#else - char buf[1024]; - char *msg_ctxt_id = - (msgctxt_len + msgid_len <= sizeof (buf) - ? buf - : (char *) malloc (msgctxt_len + msgid_len)); - if (msg_ctxt_id != NULL) -#endif - { - memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); - msg_ctxt_id[msgctxt_len - 1] = '\004'; - memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); - translation = dcgettext (domain, msg_ctxt_id, category); -#if !(_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS) - if (msg_ctxt_id != buf) - free (msg_ctxt_id); -#endif - if (translation != msg_ctxt_id) - return translation; - } - return msgid; -} - -#define npgettext_expr(Msgctxt, Msgid, MsgidPlural, N) \ - dcnpgettext_expr (NULL, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) -#define dnpgettext_expr(Domainname, Msgctxt, Msgid, MsgidPlural, N) \ - dcnpgettext_expr (Domainname, Msgctxt, Msgid, MsgidPlural, N, LC_MESSAGES) - -#ifdef __GNUC__ -__inline -#else -#ifdef __cplusplus -inline -#endif -#endif -static const char * -dcnpgettext_expr (const char *domain, - const char *msgctxt, const char *msgid, - const char *msgid_plural, unsigned long int n, - int category) -{ - size_t msgctxt_len = strlen (msgctxt) + 1; - size_t msgid_len = strlen (msgid) + 1; - const char *translation; -#if _LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS - char msg_ctxt_id[msgctxt_len + msgid_len]; -#else - char buf[1024]; - char *msg_ctxt_id = - (msgctxt_len + msgid_len <= sizeof (buf) - ? buf - : (char *) malloc (msgctxt_len + msgid_len)); - if (msg_ctxt_id != NULL) -#endif - { - memcpy (msg_ctxt_id, msgctxt, msgctxt_len - 1); - msg_ctxt_id[msgctxt_len - 1] = '\004'; - memcpy (msg_ctxt_id + msgctxt_len, msgid, msgid_len); - translation = dcngettext (domain, msg_ctxt_id, msgid_plural, n, category); -#if !(_LIBGETTEXT_HAVE_VARIABLE_SIZE_ARRAYS) - if (msg_ctxt_id != buf) - free (msg_ctxt_id); -#endif - if (!(translation == msg_ctxt_id || translation == msgid_plural)) - return translation; - } - return (n == 1 ? msgid : msgid_plural); -} - -#endif /* _LIBGETTEXT_H */