summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* msgfmt: Support XML file mergingwip/ueno/its2Daiki Ueno2015-10-1511-13/+914
| | | | | | | | | | | | | | | | | | | | | | | | | | | * gettext-tools/src/Makefile.am (noinst_HEADERS): Add write-xml.h. (msgfmt_SOURCES): Add write-xml.c. * gettext-tools/src/its.c (its_merge_context_merge_node): New function. (its_merge_context_merge): New function. (its_merge_context_alloc): New function. (its_merge_context_write): New function. (its_merge_context_free): New function. * gettext-tools/src/its.h (its_merge_context_ty): New type. * gettext-tools/src/msgfmt.c: Include "its.h", "locating-rule.h", and "write-xml.h". (SIZEOF): New macro. (xml_mode, xml_locale_name, xml_template_name, xml_base_directory, xml_language, xml_its_rules): New variable. (long_options): Add --language and --xml. (main): Handle new options. (usage): Document new options. (msgfmt_xml_bulk): New function. * gettext-tools/src/write-xml.c: New file. * gettext-tools/src/write-xml.h: New file. * gettext-tools/doc/gettext.texi: Mention XML file merging use-case. * gettext-tools/doc/msgfmt.texi: Mention --xml option. * gettext-tools/tests/msgfmt-xml-1: New file. * gettext-tools/tests/msgfmt-xml-2: New file. * gettext-tools/tests/Makefile.am (TESTS): Add new tests.
* xgettext: Rewrite Glade scanner in ITSDaiki Ueno2015-10-159-633/+79
| | | | | | | | | | | | | | * gettext-tools/its/glade.loc: New file. * gettext-tools/its/glade1.its: New file. * gettext-tools/its/glade2.its: New file. * gettext-tools/its/gtkbuilder.its: New file. * gettext-tools/its/Makefile.am (dist_its_DATA): Add new files. * gettext-tools/src/Makefile.am (xgettext_SOURCES): Remove x-glade.c. * gettext-tools/src/x-glade.c: Remove. * gettext-tools/src/x-glade.h (EXTENSIONS_GLADE): Set language field to NULL. (SCANNERS_GLADE): Set func field to NULL. * gettext-tools/po/POTFILES.in: Remove x-glade.c
* xgettext: Rewrite GSettings scanner in ITSDaiki Ueno2015-10-156-398/+27
| | | | | | | | | | | * gettext-tools/its/gsettings.its: New file. * gettext-tools/its/gsettings.loc: New file. * gettext-tools/its/Makefile.am (dist_its_DATA): Add new files. * gettext-tools/src/Makefile.am (xgettext_SOURCES): Remove x-gsettings.c. * gettext-tools/src/x-gsettings.c: Remove. * gettext-tools/src/x-gsettings.h (EXTENSIONS_GSETTINGS): Set language field to NULL. (SCANNER_GSETTINGS): Set func field to NULL.
* xgettext: Rewrite AppData scanner in ITSDaiki Ueno2015-10-157-383/+30
| | | | | | | | | | | * gettext-tools/its/appdata.loc: New file. * gettext-tools/its/appdata.its: New file. * gettext-tools/its/Makefile.am (dist_its_DATA): Add new files. * gettext-tools/src/Makefile.am (xgettext_SOURCES): Remove x-appdata.c. * gettext-tools/src/x-appdata.c: Remove. * gettext-tools/src/x-appdata.h (EXTENSIONS_APPDATA): Set language field to NULL. (SCANNERS_APPDATA): Set func field to NULL.
* xgettext: Add support for generic XML filesDaiki Ueno2015-10-1515-34/+3010
| | | | | | | | | | | | | | | | | | | | | | | | | * autogen.sh (GNULIB_MODULES_TOOLS_FOR_SRC): Add trim module. * gettext-tools/src/locating-rule.h: New file. * gettext-tools/src/locating-rule.c: New file. * gettext-tools/src/its.h: New file. * gettext-tools/src/its.c: New file. * gettext-tools/src/xgettext.c: Include "locating-rule.h" and "its.h". (its_locators): New variable. (long_options): Add --itstool option. (extract_from_xml_file): New function. (main): Handle --itstool option. (usage): Document --itstool option. * gettext-tools/src/Makefile.am (noinst_HEADERS): Add locating-rule.h and its.h. (libgettextsrc_la_CPPFLAGS): Add $(INCXML). (libgettextsrc_la_SOURCES): Add locating-rule.c and its.c. * gettext-tools/Makefile.am (SUBDIRS): Add its directory. * gettext-tools/configure.ac: Output its/Makefile. * gettext-tools/doc/gettext.texi (Preparing ITS Rules): New section. * gettext-tools/doc/xgettext.texi: Mention --itstool option. * gettext-tools/tests/Makefile.am (TESTS): Add new tests. * gettext-tools/tests/xgettext-its-1: New file * gettext-tools/tests/init-env.in: Set GETTEXTDATADIR for ITS tests.
* build: Generate ChangeLogs for intl and poDaiki Ueno2015-10-155-12/+16
| | | | | | | | | * autogen.sh: Create empty ChangeLog files under intl and po. * Makefile.am (gen-ChangeLogs): Rename from gen-ChangeLog. Generate ChangeLog files for */intl and */po as well as top-level. * gettext-runtime/intl/ChangeLog.0: Rename from ChangeLog. * gettext-runtime/po/ChangeLog.0: Rename from ChangeLog. * gettext-tools/po/ChangeLog.1: Rename from ChangeLog.
* build: Distribute old ChangeLogs in tarballDaiki Ueno2015-10-151-5/+1
| | | | | | * Makefile.am (changelog_etc): Remove non-existent ChangeLog files under intl and po. (EXTRA_DIST): Add $(changelog_etc).
* tests: use check_PROGRAMSMike Frysinger2015-10-141-1/+1
| | | | | | | | | The noinst_xxx targets will be compiled all the time. For test programs, the check_xxx targets make more sense as they'll only be built when the user runs `make check`. * gettext-runtime/tests/Makefile.am (noinst_PROGRAMS): Rename to ... (check_PROGRAMS): ... this.
* intl/localename: control langinfo.h inclusionMike Frysinger2015-10-142-1/+12
| | | | | | | | | This header is only used to work around buggy behavior in old versions of glibc, so do not include it all the time. Otherwise we get build failures on systems that do not provide langinfo.h. * gettext-runtime/intl/localename.c: Wrap langinfo.h include with same ifdefs used in the source later on.
* build: Remove ChangeLogsDaiki Ueno2015-10-1435-64/+105
| | | | | | | | | | | | | | | | | | | | | Generate ChangeLog files at "make dist" time, using gitlog-to-changelog. We still keep ChangeLog files under "po" and "intl" directories, since those files are copied as part of gettext infrastructure and it is still meaningful to have them there. * .gitignore: Add ChangeLog files. * Admin/release-steps: Remove mention of running update-changelog script. * Admin/update-changelog: Remove. * Makefile.am (gen-ChangeLog): New rule. * autogen.sh: Copy gitlog-to-changelog from gnulib. Create empty ChangeLog files to suppress Automake errors. * gettext-tools/doc/Makefile.am (EXTRA_DIST): Remove ChangeLog.0. * gettext-tools/man/Makefile.am (EXTRA_DIST): Remove ChangeLog.0. * gettext-tools/src/Makefile.am (EXTRA_DIST): Remove ChangeLog.0. * gettext-tools/tests/Makefile.am (EXTRA_DIST): Remove ChangeLog.0. * gnulib-local/Makefile.am (EXTRA_DIST): Remove ChangeLog files. * */ChangeLog: Rename to ChangeLog.0 or ChangeLog.1. * HACKING: Add brief guideline to submit patches.
* hello-c-gnome3: Simplify the Desktop Entry rulesDaiki Ueno2015-10-082-4/+9
| | | | | | * hello-c-gnome3/Makefile.am (hello.desktop.in): Don't use a temporary file. (hello.desktop): Likewise.
* doc: Don't expose generated versionDaiki Ueno2015-10-064-10/+21
| | | | | | | | * gettext-tools/doc/Makefile.am ($(srcdir)/stamp-vti): Set ARCHIVE-VERSION, derived from $(ARCHIVE_VERSION) in version.texi. * gettext-tools/doc/gettext.texi (Files under Version Control): Refer to ARCHIVE-VERSION, instead of VERSION. * gettext-tools/doc/autopoint.texi: Refer to ARCHIVE-VERSION, instead of VERSION.
* msgfmt: More refactoring on --desktopDaiki Ueno2015-10-063-14/+23
| | | | | | | * msgfmt.c (msgfmt_desktop_bulk): Distinguish the number of errors and the exit status. * write-desktop.c (msgdomain_write_desktop_bulk): Don't immediately exit when fwriteerror() returns error.
* msgfmt: Refactor --desktop handlingDaiki Ueno2015-10-065-92/+170
| | | | | | | | | | | | | | | | | * gettext-tools/src/msgfmt.c (get_languages): Avoid redundant memory allocation. (msgfmt_operand_list_init): New function. (msgfmt_operand_list_destroy): New function. (msgfmt_operand_list_append): New function. (msgfmt_operand_list_add_directory): New function. (msgfmt_desktop_bulk): Rewrite using msgfmt_operand_list_ty. * gettext-tools/src/msgfmt.h (msgfmt_operand_ty, msgfmt_operand_list_ty): New type. * gettext-tools/src/write-desktop.c (msgdomain_write_desktop_bulk): Simplify using msgfmt_operand_list_ty. (msgdomain_write_desktop): Simplify using msgfmt_operand_list_ty. * gettext-tools/src/write-desktop.h (msgdomain_write_desktop_bulk): Take OPERANDS as the first argument, instead of LANGUAGES and MESSAGES.
* sentence: Avoid compiler warningsDaiki Ueno2015-10-062-2/+8
| | | | | | * gettext-tools/src/sentence.c (sentence_end): Assign initial values to local variables to suppress compiler warnings with -Wmaybe-uninitialized. This shouldn't address any real bug.
* build: Fix the last commitDaiki Ueno2015-10-011-1/+1
|
* build: Fix the last commitDaiki Ueno2015-09-301-4/+4
|
* build: Avoid file name length limitation of tarDaiki Ueno2015-09-308-10/+20
| | | | | | | | | | "csharpdoc" is a bit too long to accommodate long file names with the version returned from git-version-gen: tar: gettext-0.19.6.4-1e74e4/.../csharpdoc/...: file name is too long (max 99); not dumped * gettext-runtime/intl-csharp/doc: Rename from csharpdoc. * gettext-runtime/intl-cshap/Makefile.am (doc, DOC_FILES): Adjust to the directory name change.
* build: Regenerate ABOUT-NLSDaiki Ueno2015-09-301-81/+77
|
* build: Fix ABOUT-NLS generation with newer TexinfoDaiki Ueno2015-09-302-1/+6
|
* Release 0.19.6v0.19.6Daiki Ueno2015-09-1127-0/+108
|
* Update translationsDaiki Ueno2015-09-1115-2326/+3107
|
* Prepare for 0.19.6Daiki Ueno2015-09-117-7/+7
|
* doc: Regenerate translation matrixDaiki Ueno2015-09-112-530/+530
| | | | | * gettext-runtime/ABOUT-NLS: Regenerate for 0.19.6. * gettext-runtime/doc/matrix.texi: Regenerate for 0.19.6.
* gettext-tools: Remove ABOUT-NLS from repositoryDaiki Ueno2015-09-111-1410/+0
|
* Update gnulibDaiki Ueno2015-09-111-0/+0
|
* Revert "xgettext: Allow multiple --copyright-holder"Daiki Ueno2015-09-101-64/+6
| | | | | | | This reverts commit 15363cca838ff1d69f6e3bfbb47ecfe90c0f5000. Now that po/Makefile.in.in supports custom header for POT files, it is not meaningful to add a special case for multiple copyright holders.
* NEWS: Fix wordingDaiki Ueno2015-09-021-5/+7
|
* NEWS: Add 0.19.6 changesDaiki Ueno2015-09-012-0/+24
|
* po: Support reading header comments from fileDaiki Ueno2015-09-012-0/+10
| | | | | * Makefile.in.in ($(DOMAIN).pot-update): Replace header comment with the content of $(DOMAIN).pot-header, if exists.
* intl: fix memory leak in _nl_load_domainPaul Eggert2015-08-272-2/+10
| | | | | | * loadmsgcat.c (_nl_load_domain): Free data after a read failure. See: https://sourceware.org/bugzilla/show_bug.cgi?id=18871
* xgettext: Replace PACKAGE placeholder if possibleDaiki Ueno2015-08-242-2/+8
| | | | | * xgettext.c (construct_header): Replace PACKAGE placeholder in the header comment.
* xgettext: Add support for AppData XML filesPhilip Withnall2015-08-2110-3/+582
| | | | | | | | | | | AppData files are used to describe an application for package management, and are described here: http://people.freedesktop.org/~hughsient/appdata/ They may also currently be translated using intltool or itstool: http://people.freedesktop.org/~hughsient/appdata/#translation
* tests: Use check_PROGRAMSDaiki Ueno2015-08-212-1/+6
| | | | | * gettext-tools/tests/Makefile.am (check_PROGRAMS): Rename from noinst_PROGRAMS, to defer the compilation until required.
* autopoint: Respect AM_GNU_GETTEXT_REQUIRE_VERSIONDaiki Ueno2015-08-219-15/+138
| | | | | | | | | | * gettext-runtime/m4/gettext.m4 (AM_GNU_GETTEXT_REQUIRE_VERSION): New macro. Bump serial to 67. * gettext-tools/doc/autopoint.texi: Mention AM_GNU_GETTEXT_REQUIRE_VERSION. * gettext-tools/misc/gettextize.in: Check if AM_GNU_GETTEXT_VERSION is used. * gettext-tools/misc/autopoint.in: Respect AM_GNU_GETTEXT_REQUIRE_VERSION. * gettext-tools/tests/autopoint-2: Check AM_GNU_GETTEXT_REQUIRE_VERSION.
* xgettext: Allow multiple --copyright-holderDaiki Ueno2015-08-212-6/+75
| | | | | | | | | | Feature requested by Francesco Poli in: <https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682580>. * xgettext.c (default_copyright_holder): New constant, renamed from copyright_holder. (copyright_holder): Define as a variable. (main): Allow multiple --copyright-holder options. (construct_header): Support multiple --copyright-holder options.
* intl: Pacify compilation with pre-C99 compilersDaiki Ueno2015-08-212-1/+11
| | | | | | | | | * loadmsgcat.c (_nl_load_domain): Move the call to __libc_lock_define_initialized_recursive to the end of local variable declarations to avoid extra ';' being expanded to an empty statement. Reported by pan7 in: <http://savannah.gnu.org/support/?108864>.
* cldr-plurals: Fix trivial resource leakDaiki Ueno2015-08-152-0/+6
| | | | | * cldr-plurals.c (main): Close FP after use. Reported by Denis Denisov.
* build: Substitute archive version with configureDaiki Ueno2015-07-289-33/+34
| | | | | | | | | | | | * gettext-tools/configure.ac (ARCHIVE_VERSION): New substituted variable. * gettext-tools/misc/gettextize.in (archive_version): New variable, set to ARCHIVE_VERSION. Use it as the argument of AM_GNU_GETTEXT_VERSION. * gettext-tools/tests/init-env.in (ARCHIVE_VERSION): New substituted variable. * gettext-tools/tests/autopoint-2: Use ARCHIVE_VERSION, instead of the hard-coded version string. * gettext-tools/tests/autopoint-3: Likewise.
* NEWS: Fix typoDaiki Ueno2015-07-271-1/+1
|
* gettextize: Use a crafted version stringDaiki Ueno2015-07-273-2/+18
| | | | | | | | | | Reported by Max Lin in: <https://lists.gnu.org/archive/html/bug-gettext/2015-07/msg00024.html>. * gettextize.in: Replace AM_GNU_GETTEXT_VERSION invocation with "$gettext_version" rather than "$version". This makes it easier to maintain a minor release without being affected by the actual version number generated by git-version-gen. (gettext_version): New variable.
* po-mode: Fix to accept four-part msgfmt version numberPeter Eisentraut2015-07-272-1/+8
|
* cldr-plurals: Fix --enable-relocatable compilationVáclav Slavík2015-07-212-0/+12
| | | | | | | | | Compilation of the cldr-plurals tool was broken in the relocatable case because of missing CPPFLAGS/LDFLAGS. Add the same flags used by other tools to the makefile. * gettext-tools/src/Makefile.am (cldr_plurals_CPPFLAGS) (cldr_plurals_LDFLAGS): Adjust for --enable-relocatable compilation.
* maint: Add more files to .gitignorev0.19.5.1Daiki Ueno2015-07-151-0/+1
|
* gnulib-local: Fix Java compilation on mingwDaiki Ueno2015-07-142-0/+21
| | | | | | * lib/clean-temp.c.diff: New file, from m4. Suggested by Eric Blake in: <https://lists.gnu.org/archive/html/bug-gnulib/2013-09/msg00044.html>.
* build: Import stpcpy as well to libgettextpoDaiki Ueno2015-07-122-1/+3
|
* build: Avoid link error on Mac OS X < 10.6Daiki Ueno2015-07-122-0/+8
| | | | | | Reported by Ryan Schmidt in: <http://savannah.gnu.org/bugs/?45527>. * autogen.sh (GNULIB_MODULES_LIBGETTEXTPO): Add stpncpy.
* NEWS: Fix the release date of 0.19.5v0.19.5Daiki Ueno2015-07-101-1/+1
|
* Release 0.19.5Daiki Ueno2015-07-1027-0/+108
|
* Update translationsDaiki Ueno2015-07-1054-12805/+12352
|