diff options
| author | Daiki Ueno <ueno@gnu.org> | 2015-03-05 12:00:09 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-03-09 18:24:52 +0900 |
| commit | 5c2d4fc20a40d1ec70730a6bcdc03cb2eb0e16c9 (patch) | |
| tree | 62f1773b1dd04721d6dd10ee70042044476c9988 /gettext-tools/libgettextpo | |
| parent | 4d2115c62a723dc9e375433261c1bf3e45928815 (diff) | |
| download | external_gettext-5c2d4fc20a40d1ec70730a6bcdc03cb2eb0e16c9.zip external_gettext-5c2d4fc20a40d1ec70730a6bcdc03cb2eb0e16c9.tar.gz external_gettext-5c2d4fc20a40d1ec70730a6bcdc03cb2eb0e16c9.tar.bz2 | |
format-kde: Recognize KUIT markup
Reported by Chusslove Illich in:
https://lists.gnu.org/archive/html/bug-gettext/2015-01/msg00017.html
* gettext-tools/src/format.h (formatstring_kde_kuit): New variable
declaration.
* gettext-tools/src/format.c (formatstring_parsers): Register
formatstring_kde_kuitas a format string parser.
* gettext-tools/src/format-kde-kuit.c: New file.
* gettext-tools/src/message.h (NFORMATS): Increment.
(enum format_type): New enum value format_kde_kuit.
* gettext-tools/src/xgettext.c (xgettext_record_flag): Handle
format_kde_kuit.
* gettext-tools/src/Makefile.am (xgettext_SOURCES): Move
libexpat-compat.c to...
(libgettextsrc_la_SOURCES): ...here.
(xgettext_LDADD): Move @LTLIBEXPAT@ to...
(libgettextsrc_la_LDFLAGS): ...here.
(FORMAT_SOURCE): Add format-kde-kuit.c.
* gettext-tools/libgettextpo/Makefile.am (libgettextpo_la_AUXSOURCES):
Add ../src/format-kde-kuit.c and ../src/libexpat-compat.c.
(libgettextpo_la_LDFLAGS): Add @LTLIBEXPAT@.
* gettext-tools/tests/format-kde-kuit-1: New file.
* gettext-tools/tests/format-kde-kuit-2: New file.
* gettext-tools/tests/Makefile.am (TESTS): Add new tests.
* gettext-tools/doc/gettext.texi (kde-kuit-format): New subsection.
* NEWS: Mention KUIT format string support.
Diffstat (limited to 'gettext-tools/libgettextpo')
| -rw-r--r-- | gettext-tools/libgettextpo/ChangeLog | 6 | ||||
| -rw-r--r-- | gettext-tools/libgettextpo/Makefile.am | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/gettext-tools/libgettextpo/ChangeLog b/gettext-tools/libgettextpo/ChangeLog index c439706..f0f4bba 100644 --- a/gettext-tools/libgettextpo/ChangeLog +++ b/gettext-tools/libgettextpo/ChangeLog @@ -1,3 +1,9 @@ +2015-03-06 Daiki Ueno <ueno@gnu.org> + + * Makefile.am (libgettextpo_la_AUXSOURCES): Add + ../src/format-kde-kuit.c and ../src/libexpat-compat.c. + (libgettextpo_la_LDFLAGS): Add @LTLIBEXPAT@. + 2014-12-24 Daiki Ueno <ueno@gnu.org> * gettext 0.19.4 released. diff --git a/gettext-tools/libgettextpo/Makefile.am b/gettext-tools/libgettextpo/Makefile.am index 10f5de6..f49065b 100644 --- a/gettext-tools/libgettextpo/Makefile.am +++ b/gettext-tools/libgettextpo/Makefile.am @@ -85,13 +85,15 @@ libgettextpo_la_AUXSOURCES = \ ../src/format-qt.c \ ../src/format-qt-plural.c \ ../src/format-kde.c \ + ../src/format-kde-kuit.c \ ../src/format-boost.c \ ../src/format-lua.c \ ../src/format.c \ ../src/plural-exp.c \ ../src/plural-eval.c \ ../src/msgl-check.c \ - ../src/sentence.c + ../src/sentence.c \ + ../src/libexpat-compat.c # Libtool's library version information for libgettextpo. # See the libtool documentation, section "Library interface versions". @@ -106,7 +108,7 @@ libgettextpo_la_LIBADD = libgnu.la $(WOE32_LIBADD) $(LTLIBUNISTRING) libgettextpo_la_LDFLAGS = \ -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ -rpath $(libdir) \ - @LTLIBINTL@ @LTLIBICONV@ -lc -no-undefined + @LTLIBINTL@ @LTLIBICONV@ @LTLIBEXPAT@ -lc -no-undefined # Tell the mingw or Cygwin linker which symbols to export. if WOE32DLL |