From f26fbe9abaf88c6ce208ae9bf14df52178a19a0f Mon Sep 17 00:00:00 2001 From: Celtic Minstrel Date: Mon, 29 May 2017 22:50:35 -0400 Subject: [PATCH] Prevent gettext from checking format strings, since we don't use the printf family of functions --- po/CMakeLists.txt | 2 +- po/wesnoth-manpages/Makefile | 4 ++-- po/wesnoth-manual/Makefile | 4 ++-- scons/gettext.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt index c59d0a275ac..17d2986905c 100644 --- a/po/CMakeLists.txt +++ b/po/CMakeLists.txt @@ -217,7 +217,7 @@ endif(ENABLE_POT_UPDATE_TARGET) if(ENABLE_NLS) - set(GETTEXT_MSGFMT_PARAMETER --check-format --check-domain ) + set(GETTEXT_MSGFMT_PARAMETER --check-domain ) if(ENABLE_POT_UPDATE_TARGET) # Only set the verbose flag for maintainers. diff --git a/po/wesnoth-manpages/Makefile b/po/wesnoth-manpages/Makefile index 698c77bf8ce..ff579b5fa0d 100644 --- a/po/wesnoth-manpages/Makefile +++ b/po/wesnoth-manpages/Makefile @@ -26,5 +26,5 @@ MSGFMT = msgfmt # generate .gmo files for po4a manpages .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ - echo "$(MSGFMT) --check-format --check-domain --statistics -o /dev/null $${lang}.po"; \ - $(MSGFMT) --check-format --check-domain --statistics -o /dev/null $${lang}.po + echo "$(MSGFMT) --check-domain --statistics -o /dev/null $${lang}.po"; \ + $(MSGFMT) --check-domain --statistics -o /dev/null $${lang}.po diff --git a/po/wesnoth-manual/Makefile b/po/wesnoth-manual/Makefile index 1e04f3fe9ac..42f033c45ff 100644 --- a/po/wesnoth-manual/Makefile +++ b/po/wesnoth-manual/Makefile @@ -26,5 +26,5 @@ MSGFMT = msgfmt # generate .gmo files for po4a manpages .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ - echo "$(MSGFMT) --check-format --check-domain --statistics -o /dev/null $${lang}.po"; \ - $(MSGFMT) --check-format --check-domain --statistics -o /dev/null $${lang}.po + echo "$(MSGFMT) --check-domain --statistics -o /dev/null $${lang}.po"; \ + $(MSGFMT) --check-domain --statistics -o /dev/null $${lang}.po diff --git a/scons/gettext.py b/scons/gettext.py index ba3a5eac040..5d416b784ae 100644 --- a/scons/gettext.py +++ b/scons/gettext.py @@ -12,7 +12,7 @@ def generate(env): env.AppendENVPath("PATH", join(env["gettextdir"], "bin")) env["MSGFMT"] = WhereIs("msgfmt") msgfmt = Builder( - action = "$MSGFMT --check-format --check-domain --statistics -o $TARGET $SOURCE", + action = "$MSGFMT --check-domain --statistics -o $TARGET $SOURCE", src_suffix = ".po", suffix = ".mo", single_source = True