From: Bruno Haible Date: Sun, 2 Feb 2025 10:39:54 +0000 (+0100) Subject: Sort programming languages like in the documentation. X-Git-Tag: v0.24~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ff1705f8f294f6cf5161bcfa3d1b1d8bdd72876;p=thirdparty%2Fgettext.git Sort programming languages like in the documentation. * gettext-tools/src/xgettext.c (usage): For the -L, -a, -k, --flag options, sort the list of programming languages like in the documentation. Add Guile, Rust, GSettings, that were forgotten earlier. * gettext-tools/doc/xgettext.texi: Likewise. * gettext-tools/examples/README: Sort the examples like the programming languages in the documentation. * gettext-tools/examples/Makefile.am (EXAMPLESFILES, EXAMPLESDIRS): Likewise. * gettext-tools/examples/check-examples (func_check_autoclean_all, func_check_distclean_all, func_check_maintainerclean_all, func_check_maintainerclean_vpath_all, func_check_dist_all, func_check_dist_vpath_all, func_check_install_all, func_check_uninstall_all, func_check_distcheck_all, func_check_all): Likewise. * gettext-tools/examples/po/Makefile.am (POTFILES, SMALLPOTS, hello-*.pot, SMALLPOFILES_FOR_lang, $(srcdir)/../hello-*/po/$(LL).po): Likewise. --- diff --git a/gettext-tools/doc/xgettext.texi b/gettext-tools/doc/xgettext.texi index 299f5ef75..217d2f094 100644 --- a/gettext-tools/doc/xgettext.texi +++ b/gettext-tools/doc/xgettext.texi @@ -72,14 +72,34 @@ is written to standard output. @opindex -L@r{, @code{xgettext} option} @opindex --language@r{, @code{xgettext} option} @cindex supported languages, @code{xgettext} -Specifies the language of the input files. The supported languages -are @code{C}, @code{C++}, @code{ObjectiveC}, @code{PO}, @code{Shell}, -@code{Python}, @code{Lisp}, @code{EmacsLisp}, @code{librep}, @code{Scheme}, -@code{Guile}, @code{Smalltalk}, @code{Java}, @code{JavaProperties}, -@code{C#}, @code{Rust}, @code{Ruby}, @code{awk}, @code{YCP}, -@code{Tcl}, @code{Perl}, @code{PHP}, @code{GCC-source}, @code{NXStringTable}, -@code{RST}, @code{RSJ}, @code{Glade}, @code{Lua}, @code{JavaScript}, -@code{Vala}, @code{GSettings}, @code{Desktop}. +Specifies the language of the input files. The supported languages are +@code{C}, @code{C++}, @code{ObjectiveC}, +@code{PO}, +@code{Python}, +@code{Java}, @code{JavaProperties}, +@code{C#}, +@code{JavaScript}, +@code{Scheme}, @code{Guile}, +@code{Lisp}, +@code{EmacsLisp}, +@code{librep}, +@code{Rust}, +@code{Ruby}, +@code{Shell}, +@code{awk}, +@code{Lua}, +@code{Smalltalk}, +@code{Vala}, +@code{Tcl}, +@code{Perl}, +@code{PHP}, +@code{GCC-source}, +@code{YCP}, +@code{NXStringTable}, +@code{RST}, @code{RSJ}, +@code{Glade}, +@code{GSettings}, +@code{Desktop}. @item -C @itemx --c++ @@ -225,9 +245,27 @@ Expect at least two whitespaces after a period @opindex --extract-all@r{, @code{xgettext} option} Extract all strings. -This option has an effect with most languages, namely C, C++, ObjectiveC, -Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP, -GCC-source, Glade, Lua, JavaScript, Vala, GSettings. +This option has an effect with most languages, namely +C, C++, ObjectiveC, +Python, +Java, +C#, +JavaScript, +Scheme, Guile, +Lisp, +EmacsLisp, +librep, +Rust, +Shell, +awk, +Lua, +Vala, +Tcl, +Perl, +PHP, +GCC-source, +Glade, +GSettings. @item -k[@var{keywordspec}] @itemx --keyword[=@var{keywordspec}] @@ -268,9 +306,28 @@ comment @var{xcomment} to the message. Note that when used through a normal shell command line, the double-quotes around the @var{xcomment} need to be escaped. -This option has an effect with most languages, namely C, C++, ObjectiveC, -Shell, Python, Lisp, EmacsLisp, librep, Java, C#, awk, Tcl, Perl, PHP, -GCC-source, Glade, Lua, JavaScript, Vala, GSettings, Desktop. +This option has an effect with most languages, namely +C, C++, ObjectiveC, +Python, +Java, +C#, +JavaScript, +Scheme, Guile, +Lisp, +EmacsLisp, +librep, +Rust, +Shell, +awk, +Lua, +Vala, +Tcl, +Perl, +PHP, +GCC-source, +Glade, +GSettings, +Desktop. The default keyword specifications, which are always looked for if not explicitly disabled, are language dependent. They are: @@ -405,9 +462,26 @@ together with the checks done by @samp{msgfmt -c} it will ensure that translators cannot accidentally use format string directives that would lead to a crash at runtime. @* -This option has an effect with most languages, namely C, C++, ObjectiveC, -Shell, Python, Lisp, EmacsLisp, librep, Scheme, Guile, Java, C#, awk, -YCP, Tcl, Perl, PHP, GCC-source, Lua, JavaScript, Vala. +This option has an effect with most languages, namely +C, C++, ObjectiveC, +Python, +Java, +C#, +JavaScript, +Scheme, Guile, +Lisp, +EmacsLisp, +librep, +Rust, +Shell, +awk, +Lua, +Vala, +Tcl, +Perl, +PHP, +GCC-source, +YCP. @item --tag=@var{word}:@var{format} @opindex --tag@r{, @code{xgettext} option} diff --git a/gettext-tools/examples/Makefile.am b/gettext-tools/examples/Makefile.am index 0774ddc42..0559321e5 100644 --- a/gettext-tools/examples/Makefile.am +++ b/gettext-tools/examples/Makefile.am @@ -215,15 +215,6 @@ EXAMPLESFILES = \ hello-objc-gnome2/po/Makevars \ hello-objc-gnome2/po/POTFILES.in \ \ - hello-sh/INSTALL \ - hello-sh/autogen.sh \ - hello-sh/autoclean.sh \ - hello-sh/hello.sh \ - hello-sh/Makefile.am \ - hello-sh/configure.ac \ - hello-sh/m4/Makefile.am \ - hello-sh/po/Makefile.am \ - \ hello-python/INSTALL \ hello-python/autogen.sh \ hello-python/autoclean.sh \ @@ -233,42 +224,6 @@ EXAMPLESFILES = \ hello-python/m4/Makefile.am \ hello-python/po/Makefile.am \ \ - hello-clisp/INSTALL \ - hello-clisp/autogen.sh \ - hello-clisp/autoclean.sh \ - hello-clisp/hello.lisp.in \ - hello-clisp/Makefile.am \ - hello-clisp/configure.ac \ - hello-clisp/m4/Makefile.am \ - hello-clisp/po/Makefile.am \ - \ - hello-librep/INSTALL \ - hello-librep/autogen.sh \ - hello-librep/autoclean.sh \ - hello-librep/hello.jl.in \ - hello-librep/Makefile.am \ - hello-librep/configure.ac \ - hello-librep/m4/Makefile.am \ - hello-librep/po/Makefile.am \ - \ - hello-guile/INSTALL \ - hello-guile/autogen.sh \ - hello-guile/autoclean.sh \ - hello-guile/hello.scm \ - hello-guile/Makefile.am \ - hello-guile/configure.ac \ - hello-guile/m4/Makefile.am \ - hello-guile/po/Makefile.am \ - \ - hello-smalltalk/INSTALL \ - hello-smalltalk/autogen.sh \ - hello-smalltalk/autoclean.sh \ - hello-smalltalk/hello.st.in \ - hello-smalltalk/Makefile.am \ - hello-smalltalk/configure.ac \ - hello-smalltalk/m4/Makefile.am \ - hello-smalltalk/po/Makefile.am \ - \ hello-java/INSTALL \ hello-java/autogen.sh \ hello-java/autoclean.sh \ @@ -333,6 +288,33 @@ EXAMPLESFILES = \ hello-csharp-forms/m4/Makefile.am \ hello-csharp-forms/po/Makefile.am \ \ + hello-guile/INSTALL \ + hello-guile/autogen.sh \ + hello-guile/autoclean.sh \ + hello-guile/hello.scm \ + hello-guile/Makefile.am \ + hello-guile/configure.ac \ + hello-guile/m4/Makefile.am \ + hello-guile/po/Makefile.am \ + \ + hello-clisp/INSTALL \ + hello-clisp/autogen.sh \ + hello-clisp/autoclean.sh \ + hello-clisp/hello.lisp.in \ + hello-clisp/Makefile.am \ + hello-clisp/configure.ac \ + hello-clisp/m4/Makefile.am \ + hello-clisp/po/Makefile.am \ + \ + hello-librep/INSTALL \ + hello-librep/autogen.sh \ + hello-librep/autoclean.sh \ + hello-librep/hello.jl.in \ + hello-librep/Makefile.am \ + hello-librep/configure.ac \ + hello-librep/m4/Makefile.am \ + hello-librep/po/Makefile.am \ + \ hello-rust/INSTALL \ hello-rust/autogen.sh \ hello-rust/autoclean.sh \ @@ -352,6 +334,15 @@ EXAMPLESFILES = \ hello-ruby/m4/Makefile.am \ hello-ruby/po/Makefile.am \ \ + hello-sh/INSTALL \ + hello-sh/autogen.sh \ + hello-sh/autoclean.sh \ + hello-sh/hello.sh \ + hello-sh/Makefile.am \ + hello-sh/configure.ac \ + hello-sh/m4/Makefile.am \ + hello-sh/po/Makefile.am \ + \ hello-gawk/INSTALL \ hello-gawk/autogen.sh \ hello-gawk/autoclean.sh \ @@ -370,14 +361,14 @@ EXAMPLESFILES = \ hello-pascal/m4/Makefile.am \ hello-pascal/po/Makefile.am \ \ - hello-ycp/INSTALL \ - hello-ycp/autogen.sh \ - hello-ycp/autoclean.sh \ - hello-ycp/hello.ycp \ - hello-ycp/Makefile.am \ - hello-ycp/configure.ac \ - hello-ycp/m4/Makefile.am \ - hello-ycp/po/Makefile.am \ + hello-smalltalk/INSTALL \ + hello-smalltalk/autogen.sh \ + hello-smalltalk/autoclean.sh \ + hello-smalltalk/hello.st.in \ + hello-smalltalk/Makefile.am \ + hello-smalltalk/configure.ac \ + hello-smalltalk/m4/Makefile.am \ + hello-smalltalk/po/Makefile.am \ \ hello-tcl/INSTALL \ hello-tcl/autogen.sh \ @@ -417,6 +408,15 @@ EXAMPLESFILES = \ hello-php/m4/Makefile.am \ hello-php/po/Makefile.am \ \ + hello-ycp/INSTALL \ + hello-ycp/autogen.sh \ + hello-ycp/autoclean.sh \ + hello-ycp/hello.ycp \ + hello-ycp/Makefile.am \ + hello-ycp/configure.ac \ + hello-ycp/m4/Makefile.am \ + hello-ycp/po/Makefile.am \ + \ README # List of examples directories containing a po directory. @@ -434,27 +434,27 @@ EXAMPLESDIRS = \ hello-objc \ hello-objc-gnustep \ hello-objc-gnome2 \ - hello-sh \ hello-python \ - hello-clisp \ - hello-librep \ - hello-guile \ - hello-smalltalk \ hello-java \ hello-java-awt \ hello-java-swing \ hello-java-qtjambi \ hello-csharp \ hello-csharp-forms \ + hello-guile \ + hello-clisp \ + hello-librep \ hello-rust \ hello-ruby \ + hello-sh \ hello-gawk \ hello-pascal \ - hello-ycp \ + hello-smalltalk \ hello-tcl \ hello-tcl-tk \ hello-perl \ - hello-php + hello-php \ + hello-ycp # List of files present in every example's po directory. EXAMPLESPOFILES = \ diff --git a/gettext-tools/examples/README b/gettext-tools/examples/README index 9545209ce..04d81b2d3 100644 --- a/gettext-tools/examples/README +++ b/gettext-tools/examples/README @@ -18,27 +18,27 @@ environment. hello-objc ObjectiveC hello-objc-gnustep ObjectiveC GNUstep hello-objc-gnome2 ObjectiveC GNOME 2 (obsolete) - hello-sh Shell hello-python Python - hello-clisp Lisp - hello-librep librep - hello-guile Scheme - hello-smalltalk Smalltalk hello-java Java hello-java-awt Java AWT hello-java-swing Java Swing hello-java-qtjambi Java Qt hello-csharp C# hello-csharp-forms C# Forms + hello-guile Scheme + hello-clisp Lisp + hello-librep librep hello-rust Rust hello-ruby Ruby + hello-sh Shell hello-gawk awk hello-pascal Pascal - hello-ycp YCP libyui + hello-smalltalk Smalltalk hello-tcl Tcl hello-tcl-tk Tcl Tk hello-perl Perl hello-php PHP + hello-ycp YCP libyui Before building an example, you need to 1. Build and install the GNU gettext package, as described in the INSTALL @@ -68,19 +68,19 @@ Makefile types: hello-objc .gmo Makefile.in.in hello-objc-gnome2 .gmo Makefile.in.in hello-c++-wxwidgets .gmo Makefile.am - hello-sh .gmo Makefile.am hello-python .gmo Makefile.am + hello-guile .gmo Makefile.am hello-clisp .gmo Makefile.am hello-librep .gmo Makefile.am - hello-guile .gmo Makefile.am - hello-smalltalk .gmo Makefile.am hello-rust .gmo Makefile.am hello-ruby .gmo Makefile.am + hello-sh .gmo Makefile.am hello-gawk .gmo Makefile.am hello-pascal .gmo Makefile.am - hello-ycp .gmo Makefile.am + hello-smalltalk .gmo Makefile.am hello-perl .gmo Makefile.am hello-php .gmo Makefile.am + hello-ycp .gmo Makefile.am hello-java .properties Makefile.am hello-java-awt .properties Makefile.am hello-java-swing .properties Makefile.am diff --git a/gettext-tools/examples/check-examples b/gettext-tools/examples/check-examples index 7bf013c8f..b35c2b379 100755 --- a/gettext-tools/examples/check-examples +++ b/gettext-tools/examples/check-examples @@ -141,27 +141,27 @@ func_check_autoclean_all () func_check_autoclean hello-objc func_check_autoclean hello-objc-gnustep func_check_autoclean hello-objc-gnome2 - func_check_autoclean hello-sh func_check_autoclean hello-python - func_check_autoclean hello-clisp - func_check_autoclean hello-librep - func_check_autoclean hello-guile - func_check_autoclean hello-smalltalk func_check_autoclean hello-java func_check_autoclean hello-java-awt func_check_autoclean hello-java-swing func_check_autoclean hello-java-qtjambi func_check_autoclean hello-csharp func_check_autoclean hello-csharp-forms + func_check_autoclean hello-guile + func_check_autoclean hello-clisp + func_check_autoclean hello-librep func_check_autoclean hello-rust func_check_autoclean hello-ruby + func_check_autoclean hello-sh func_check_autoclean hello-gawk func_check_autoclean hello-pascal - func_check_autoclean hello-ycp + func_check_autoclean hello-smalltalk func_check_autoclean hello-tcl func_check_autoclean hello-tcl-tk func_check_autoclean hello-perl func_check_autoclean hello-php + func_check_autoclean hello-ycp if (shopt -s failglob; echo hello-*.out) >/dev/null 2>/dev/null; then echo "*** func_check_autoclean error: Leftover files:" cat hello-*.out @@ -216,27 +216,27 @@ func_check_distclean_all () func_check_distclean hello-objc func_check_distclean hello-objc-gnustep #func_check_distclean hello-objc-gnome2 - func_check_distclean hello-sh func_check_distclean hello-python - func_check_distclean hello-clisp - func_check_distclean hello-librep - func_check_distclean hello-guile - func_check_distclean hello-smalltalk func_check_distclean hello-java func_check_distclean hello-java-awt func_check_distclean hello-java-swing func_check_distclean hello-java-qtjambi func_check_distclean hello-csharp func_check_distclean hello-csharp-forms + func_check_distclean hello-guile + func_check_distclean hello-clisp + func_check_distclean hello-librep func_check_distclean hello-rust func_check_distclean hello-ruby + func_check_distclean hello-sh func_check_distclean hello-gawk func_check_distclean hello-pascal - #func_check_distclean hello-ycp + func_check_distclean hello-smalltalk func_check_distclean hello-tcl func_check_distclean hello-tcl-tk func_check_distclean hello-perl func_check_distclean hello-php + #func_check_distclean hello-ycp if (shopt -s failglob; echo hello-*.log) >/dev/null 2>/dev/null; then echo "*** func_check_distclean error: 'configure' failures" echo hello-*.log @@ -293,27 +293,27 @@ func_check_maintainerclean_all () func_check_maintainerclean hello-objc func_check_maintainerclean hello-objc-gnustep #func_check_maintainerclean hello-objc-gnome2 - func_check_maintainerclean hello-sh func_check_maintainerclean hello-python - func_check_maintainerclean hello-clisp - func_check_maintainerclean hello-librep - func_check_maintainerclean hello-guile - func_check_maintainerclean hello-smalltalk func_check_maintainerclean hello-java func_check_maintainerclean hello-java-awt func_check_maintainerclean hello-java-swing #func_check_maintainerclean hello-java-qtjambi func_check_maintainerclean hello-csharp func_check_maintainerclean hello-csharp-forms + func_check_maintainerclean hello-guile + func_check_maintainerclean hello-clisp + func_check_maintainerclean hello-librep func_check_maintainerclean hello-rust func_check_maintainerclean hello-ruby + func_check_maintainerclean hello-sh func_check_maintainerclean hello-gawk func_check_maintainerclean hello-pascal - #func_check_maintainerclean hello-ycp + func_check_maintainerclean hello-smalltalk func_check_maintainerclean hello-tcl func_check_maintainerclean hello-tcl-tk func_check_maintainerclean hello-perl func_check_maintainerclean hello-php + #func_check_maintainerclean hello-ycp if (shopt -s failglob; echo hello-*log) >/dev/null 2>/dev/null; then echo "*** func_check_maintainerclean error: 'make' failures" echo hello-*.log @@ -373,27 +373,27 @@ func_check_maintainerclean_vpath_all () func_check_maintainerclean_vpath hello-objc func_check_maintainerclean_vpath hello-objc-gnustep #func_check_maintainerclean_vpath hello-objc-gnome2 - func_check_maintainerclean_vpath hello-sh func_check_maintainerclean_vpath hello-python - func_check_maintainerclean_vpath hello-clisp - func_check_maintainerclean_vpath hello-librep - func_check_maintainerclean_vpath hello-guile - func_check_maintainerclean_vpath hello-smalltalk func_check_maintainerclean_vpath hello-java func_check_maintainerclean_vpath hello-java-awt func_check_maintainerclean_vpath hello-java-swing #func_check_maintainerclean_vpath hello-java-qtjambi func_check_maintainerclean_vpath hello-csharp func_check_maintainerclean_vpath hello-csharp-forms + func_check_maintainerclean_vpath hello-guile + func_check_maintainerclean_vpath hello-clisp + func_check_maintainerclean_vpath hello-librep func_check_maintainerclean_vpath hello-rust func_check_maintainerclean_vpath hello-ruby + func_check_maintainerclean_vpath hello-sh func_check_maintainerclean_vpath hello-gawk func_check_maintainerclean_vpath hello-pascal - #func_check_maintainerclean_vpath hello-ycp + func_check_maintainerclean_vpath hello-smalltalk func_check_maintainerclean_vpath hello-tcl func_check_maintainerclean_vpath hello-tcl-tk func_check_maintainerclean_vpath hello-perl func_check_maintainerclean_vpath hello-php + #func_check_maintainerclean_vpath hello-ycp if (shopt -s failglob; echo hello-*log) >/dev/null 2>/dev/null; then echo "*** func_check_maintainerclean_vpath error: 'make' failures" echo hello-*.log @@ -460,27 +460,27 @@ func_check_dist_all () func_check_dist hello-objc func_check_dist hello-objc-gnustep #func_check_dist hello-objc-gnome2 - func_check_dist hello-sh func_check_dist hello-python - func_check_dist hello-clisp - func_check_dist hello-librep - func_check_dist hello-guile - func_check_dist hello-smalltalk func_check_dist hello-java func_check_dist hello-java-awt func_check_dist hello-java-swing #func_check_dist hello-java-qtjambi func_check_dist hello-csharp func_check_dist hello-csharp-forms + func_check_dist hello-guile + func_check_dist hello-clisp + func_check_dist hello-librep func_check_dist hello-rust func_check_dist hello-ruby + func_check_dist hello-sh func_check_dist hello-gawk func_check_dist hello-pascal - #func_check_dist hello-ycp + func_check_dist hello-smalltalk func_check_dist hello-tcl func_check_dist hello-tcl-tk func_check_dist hello-perl func_check_dist hello-php + #func_check_dist hello-ycp if (shopt -s failglob; echo hello-*log) >/dev/null 2>/dev/null; then echo "*** func_check_dist error: 'make dist' failures" echo hello-*.log @@ -547,27 +547,27 @@ func_check_dist_vpath_all () func_check_dist_vpath hello-objc func_check_dist_vpath hello-objc-gnustep #func_check_dist_vpath hello-objc-gnome2 - func_check_dist_vpath hello-sh func_check_dist_vpath hello-python - func_check_dist_vpath hello-clisp - func_check_dist_vpath hello-librep - func_check_dist_vpath hello-guile - func_check_dist_vpath hello-smalltalk func_check_dist_vpath hello-java func_check_dist_vpath hello-java-awt func_check_dist_vpath hello-java-swing #func_check_dist_vpath hello-java-qtjambi func_check_dist_vpath hello-csharp func_check_dist_vpath hello-csharp-forms + func_check_dist_vpath hello-guile + func_check_dist_vpath hello-clisp + func_check_dist_vpath hello-librep func_check_dist_vpath hello-rust func_check_dist_vpath hello-ruby + func_check_dist_vpath hello-sh func_check_dist_vpath hello-gawk func_check_dist_vpath hello-pascal - #func_check_dist_vpath hello-ycp + func_check_dist_vpath hello-smalltalk func_check_dist_vpath hello-tcl func_check_dist_vpath hello-tcl-tk func_check_dist_vpath hello-perl func_check_dist_vpath hello-php + #func_check_dist_vpath hello-ycp if (shopt -s failglob; echo hello-*log) >/dev/null 2>/dev/null; then echo "*** func_check_dist_vpath error: 'make dist' failures" echo hello-*.log @@ -626,27 +626,27 @@ func_check_install_all () func_check_install hello-objc func_check_install hello-objc-gnustep #func_check_install hello-objc-gnome2 - func_check_install hello-sh func_check_install hello-python - func_check_install hello-clisp - func_check_install hello-librep - func_check_install hello-guile - func_check_install hello-smalltalk func_check_install hello-java func_check_install hello-java-awt func_check_install hello-java-swing #func_check_install hello-java-qtjambi func_check_install hello-csharp func_check_install hello-csharp-forms + func_check_install hello-guile + func_check_install hello-clisp + func_check_install hello-librep func_check_install hello-rust func_check_install hello-ruby + func_check_install hello-sh func_check_install hello-gawk func_check_install hello-pascal - #func_check_install hello-ycp + func_check_install hello-smalltalk func_check_install hello-tcl func_check_install hello-tcl-tk func_check_install hello-perl func_check_install hello-php + #func_check_install hello-ycp if (shopt -s failglob; echo hello-*log) >/dev/null 2>/dev/null; then echo "*** func_check_install error: 'make install' failures" echo hello-*.log @@ -702,27 +702,27 @@ func_check_uninstall_all () func_check_uninstall hello-objc func_check_uninstall hello-objc-gnustep #func_check_uninstall hello-objc-gnome2 - func_check_uninstall hello-sh func_check_uninstall hello-python - func_check_uninstall hello-clisp - func_check_uninstall hello-librep - func_check_uninstall hello-guile - func_check_uninstall hello-smalltalk func_check_uninstall hello-java func_check_uninstall hello-java-awt func_check_uninstall hello-java-swing #func_check_uninstall hello-java-qtjambi func_check_uninstall hello-csharp func_check_uninstall hello-csharp-forms + func_check_uninstall hello-guile + func_check_uninstall hello-clisp + func_check_uninstall hello-librep func_check_uninstall hello-rust func_check_uninstall hello-ruby + func_check_uninstall hello-sh func_check_uninstall hello-gawk func_check_uninstall hello-pascal - #func_check_uninstall hello-ycp + func_check_uninstall hello-smalltalk func_check_uninstall hello-tcl func_check_uninstall hello-tcl-tk func_check_uninstall hello-perl func_check_uninstall hello-php + #func_check_uninstall hello-ycp if (shopt -s failglob; echo hello-*log) >/dev/null 2>/dev/null; then echo "*** func_check_uninstall error: 'make uninstall' failures" echo hello-*.log @@ -780,27 +780,27 @@ func_check_distcheck_all () func_check_distcheck hello-objc func_check_distcheck hello-objc-gnustep #func_check_distcheck hello-objc-gnome2 - func_check_distcheck hello-sh func_check_distcheck hello-python - func_check_distcheck hello-clisp - func_check_distcheck hello-librep - func_check_distcheck hello-guile - func_check_distcheck hello-smalltalk func_check_distcheck hello-java func_check_distcheck hello-java-awt func_check_distcheck hello-java-swing #func_check_distcheck hello-java-qtjambi func_check_distcheck hello-csharp func_check_distcheck hello-csharp-forms + func_check_distcheck hello-guile + func_check_distcheck hello-clisp + func_check_distcheck hello-librep func_check_distcheck hello-rust func_check_distcheck hello-ruby + func_check_distcheck hello-sh func_check_distcheck hello-gawk func_check_distcheck hello-pascal - #func_check_distcheck hello-ycp + func_check_distcheck hello-smalltalk func_check_distcheck hello-tcl func_check_distcheck hello-tcl-tk func_check_distcheck hello-perl func_check_distcheck hello-php + #func_check_distcheck hello-ycp if (shopt -s failglob; echo hello-*log) >/dev/null 2>/dev/null; then echo "*** func_check_distcheck error: 'make distcheck' failures" echo hello-*.log @@ -841,27 +841,27 @@ func_check_all () func_check hello-objc func_check hello-objc-gnustep func_check hello-objc-gnome2 - func_check hello-sh func_check hello-python - func_check hello-clisp - func_check hello-librep - func_check hello-guile - func_check hello-smalltalk func_check hello-java func_check hello-java-awt func_check hello-java-swing func_check hello-java-qtjambi func_check hello-csharp func_check hello-csharp-forms + func_check hello-guile + func_check hello-clisp + func_check hello-librep func_check hello-rust func_check hello-ruby + func_check hello-sh func_check hello-gawk func_check hello-pascal - func_check hello-ycp + func_check hello-smalltalk func_check hello-tcl func_check hello-tcl-tk func_check hello-perl func_check hello-php + func_check hello-ycp } diff --git a/gettext-tools/examples/po/Makefile.am b/gettext-tools/examples/po/Makefile.am index 532c9c3cb..9901db39e 100644 --- a/gettext-tools/examples/po/Makefile.am +++ b/gettext-tools/examples/po/Makefile.am @@ -47,28 +47,28 @@ POTFILES = \ hello-objc-gnustep/Hello.h \ hello-objc-gnustep/Hello.m \ hello-objc-gnome2/hello.m \ - hello-sh/hello.sh \ hello-python/hello.py.in \ - hello-clisp/hello.lisp.in \ - hello-librep/hello.jl.in \ - hello-guile/hello.scm \ - hello-smalltalk/hello.st.in \ hello-java/Hello.java \ hello-java-awt/Hello.java \ hello-java-swing/Hello.java \ hello-java-qtjambi/Hello.java \ hello-csharp/hello.cs \ hello-csharp-forms/hello.cs \ + hello-guile/hello.scm \ + hello-clisp/hello.lisp.in \ + hello-librep/hello.jl.in \ hello-rust/src/main.rs.in \ hello-ruby/hello.rb \ + hello-sh/hello.sh \ hello-gawk/hello.awk \ hello-pascal/hello.pas \ - hello-ycp/hello.ycp \ + hello-smalltalk/hello.st.in \ hello-tcl/hello.tcl \ hello-tcl-tk/hello.tcl \ hello-perl/hello-1.pl.in \ hello-perl/hello-2.pl.in \ - hello-php/hello.php + hello-php/hello.php \ + hello-ycp/hello.ycp # List of small POT files. SMALLPOTS = \ @@ -85,27 +85,27 @@ SMALLPOTS = \ hello-objc.pot \ hello-objc-gnustep.pot \ hello-objc-gnome2.pot \ - hello-sh.pot \ hello-python.pot \ - hello-clisp.pot \ - hello-librep.pot \ - hello-guile.pot \ - hello-smalltalk.pot \ hello-java.pot \ hello-java-awt.pot \ hello-java-swing.pot \ hello-java-qtjambi.pot \ hello-csharp.pot \ hello-csharp-forms.pot \ + hello-guile.pot \ + hello-clisp.pot \ + hello-librep.pot \ hello-rust.pot \ hello-ruby.pot \ + hello-sh.pot \ hello-gawk.pot \ hello-pascal.pot \ - hello-ycp.pot \ + hello-smalltalk.pot \ hello-tcl.pot \ hello-tcl-tk.pot \ hello-perl.pot \ - hello-php.pot + hello-php.pot \ + hello-ycp.pot # This is a synthetic domain name. DOMAIN = gettext-examples @@ -289,24 +289,9 @@ hello-objc-gnustep.pot : $(POTFILES_DEPS) hello-objc-gnome2.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-objc-gnome2 -hello-sh.pot : $(POTFILES_DEPS) - $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-sh - hello-python.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-python -hello-clisp.pot : $(POTFILES_DEPS) - $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-clisp - -hello-librep.pot : $(POTFILES_DEPS) - $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-librep - -hello-guile.pot : $(POTFILES_DEPS) - $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-guile - -hello-smalltalk.pot : $(POTFILES_DEPS) - $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-smalltalk - hello-java.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-java @@ -325,20 +310,32 @@ hello-csharp.pot : $(POTFILES_DEPS) hello-csharp-forms.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-csharp-forms +hello-guile.pot : $(POTFILES_DEPS) + $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-guile + +hello-clisp.pot : $(POTFILES_DEPS) + $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-clisp + +hello-librep.pot : $(POTFILES_DEPS) + $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-librep + hello-rust.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-rust hello-ruby.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-ruby +hello-sh.pot : $(POTFILES_DEPS) + $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-sh + hello-gawk.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-gawk hello-pascal.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-pascal -hello-ycp.pot : $(POTFILES_DEPS) - $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-ycp +hello-smalltalk.pot : $(POTFILES_DEPS) + $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-smalltalk hello-tcl.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-tcl @@ -352,6 +349,9 @@ hello-perl.pot : $(POTFILES_DEPS) hello-php.pot : $(POTFILES_DEPS) $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-php +hello-ycp.pot : $(POTFILES_DEPS) + $(USE_BUILT_PROGS) $(SHELL) '$(srcdir)/xsmallpot.sh' '$(srcdir)' hello-ycp + # This rule has no dependencies: we don't need to update $(DOMAIN).pot at # every "make" invocation, only create it when it is missing. @@ -441,27 +441,27 @@ SMALLPOFILES_FOR_lang = \ $(srcdir)/../hello-objc/po/$$lang.po \ $(srcdir)/../hello-objc-gnustep/po/$$lang.po \ $(srcdir)/../hello-objc-gnome2/po/$$lang.po \ - $(srcdir)/../hello-sh/po/$$lang.po \ $(srcdir)/../hello-python/po/$$lang.po \ - $(srcdir)/../hello-clisp/po/$$lang.po \ - $(srcdir)/../hello-librep/po/$$lang.po \ - $(srcdir)/../hello-guile/po/$$lang.po \ - $(srcdir)/../hello-smalltalk/po/$$lang.po \ $(srcdir)/../hello-java/po/$$lang.po \ $(srcdir)/../hello-java-awt/po/$$lang.po \ $(srcdir)/../hello-java-swing/po/$$lang.po \ $(srcdir)/../hello-java-qtjambi/po/$$lang.po \ $(srcdir)/../hello-csharp/po/$$lang.po \ $(srcdir)/../hello-csharp-forms/po/$$lang.po \ + $(srcdir)/../hello-guile/po/$$lang.po \ + $(srcdir)/../hello-clisp/po/$$lang.po \ + $(srcdir)/../hello-librep/po/$$lang.po \ $(srcdir)/../hello-rust/po/$$lang.po \ $(srcdir)/../hello-ruby/po/$$lang.po \ + $(srcdir)/../hello-sh/po/$$lang.po \ $(srcdir)/../hello-gawk/po/$$lang.po \ $(srcdir)/../hello-pascal/po/$$lang.po \ - $(srcdir)/../hello-ycp/po/$$lang.po \ + $(srcdir)/../hello-smalltalk/po/$$lang.po \ $(srcdir)/../hello-tcl/po/$$lang.po \ $(srcdir)/../hello-tcl-tk/po/$$lang.po \ $(srcdir)/../hello-perl/po/$$lang.po \ - $(srcdir)/../hello-php/po/$$lang.po + $(srcdir)/../hello-php/po/$$lang.po \ + $(srcdir)/../hello-ycp/po/$$lang.po $(srcdir)/../hello-c/po/$(LL).po: $(srcdir)/hello-c.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-c $(LL) @@ -502,24 +502,9 @@ $(srcdir)/../hello-objc-gnustep/po/$(LL).po: $(srcdir)/hello-objc-gnustep.pot $( $(srcdir)/../hello-objc-gnome2/po/$(LL).po: $(srcdir)/hello-objc-gnome2.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-objc-gnome2 $(LL) -$(srcdir)/../hello-sh/po/$(LL).po: $(srcdir)/hello-sh.pot $(srcdir)/$(LL).po - $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-sh $(LL) - $(srcdir)/../hello-python/po/$(LL).po: $(srcdir)/hello-python.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-python $(LL) -$(srcdir)/../hello-clisp/po/$(LL).po: $(srcdir)/hello-clisp.pot $(srcdir)/$(LL).po - $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-clisp $(LL) - -$(srcdir)/../hello-librep/po/$(LL).po: $(srcdir)/hello-librep.pot $(srcdir)/$(LL).po - $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-librep $(LL) - -$(srcdir)/../hello-guile/po/$(LL).po: $(srcdir)/hello-guile.pot $(srcdir)/$(LL).po - $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-guile $(LL) - -$(srcdir)/../hello-smalltalk/po/$(LL).po: $(srcdir)/hello-smalltalk.pot $(srcdir)/$(LL).po - $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-smalltalk $(LL) - $(srcdir)/../hello-java/po/$(LL).po: $(srcdir)/hello-java.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-java $(LL) @@ -538,20 +523,32 @@ $(srcdir)/../hello-csharp/po/$(LL).po: $(srcdir)/hello-csharp.pot $(srcdir)/$(LL $(srcdir)/../hello-csharp-forms/po/$(LL).po: $(srcdir)/hello-csharp-forms.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-csharp-forms $(LL) +$(srcdir)/../hello-guile/po/$(LL).po: $(srcdir)/hello-guile.pot $(srcdir)/$(LL).po + $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-guile $(LL) + +$(srcdir)/../hello-clisp/po/$(LL).po: $(srcdir)/hello-clisp.pot $(srcdir)/$(LL).po + $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-clisp $(LL) + +$(srcdir)/../hello-librep/po/$(LL).po: $(srcdir)/hello-librep.pot $(srcdir)/$(LL).po + $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-librep $(LL) + $(srcdir)/../hello-rust/po/$(LL).po: $(srcdir)/hello-rust.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-rust $(LL) $(srcdir)/../hello-ruby/po/$(LL).po: $(srcdir)/hello-ruby.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-ruby $(LL) +$(srcdir)/../hello-sh/po/$(LL).po: $(srcdir)/hello-sh.pot $(srcdir)/$(LL).po + $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-sh $(LL) + $(srcdir)/../hello-gawk/po/$(LL).po: $(srcdir)/hello-gawk.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-gawk $(LL) $(srcdir)/../hello-pascal/po/$(LL).po: $(srcdir)/hello-pascal.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-pascal $(LL) -$(srcdir)/../hello-ycp/po/$(LL).po: $(srcdir)/hello-ycp.pot $(srcdir)/$(LL).po - $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-ycp $(LL) +$(srcdir)/../hello-smalltalk/po/$(LL).po: $(srcdir)/hello-smalltalk.pot $(srcdir)/$(LL).po + $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-smalltalk $(LL) $(srcdir)/../hello-tcl/po/$(LL).po: $(srcdir)/hello-tcl.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-tcl $(LL) @@ -564,3 +561,6 @@ $(srcdir)/../hello-perl/po/$(LL).po: $(srcdir)/hello-perl.pot $(srcdir)/$(LL).po $(srcdir)/../hello-php/po/$(LL).po: $(srcdir)/hello-php.pot $(srcdir)/$(LL).po $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-php $(LL) + +$(srcdir)/../hello-ycp/po/$(LL).po: $(srcdir)/hello-ycp.pot $(srcdir)/$(LL).po + $(USE_BUILT_PROGS) cd $(srcdir) && $(SHELL) mmsmallpo.sh hello-ycp $(LL) diff --git a/gettext-tools/src/xgettext.c b/gettext-tools/src/xgettext.c index 9ab408489..6cb78e3ab 100644 --- a/gettext-tools/src/xgettext.c +++ b/gettext-tools/src/xgettext.c @@ -1114,11 +1114,12 @@ If output file is -, output is written to standard output.\n")); Choice of input file language:\n")); printf (_("\ -L, --language=NAME recognise the specified language\n\ - (C, C++, ObjectiveC, PO, Shell, Python, Lisp,\n\ - EmacsLisp, librep, Scheme, Guile, Smalltalk,\n\ - Java, JavaProperties, C#, Rust, Ruby, awk, YCP,\n\ - Tcl, Perl, PHP, GCC-source, NXStringTable, RST,\n\ - RSJ, Glade, Lua, JavaScript, Vala, Desktop)\n")); + (C, C++, ObjectiveC, PO, Python, Java,\n\ + JavaProperties, C#, JavaScript, Scheme, Guile,\n\ + Lisp, EmacsLisp, librep, Rust, Ruby, Shell,\n\ + awk, Lua, Smalltalk, Vala, Tcl, Perl, PHP,\n\ + GCC-source, YCP, NXStringTable, RST, RSJ,\n\ + Glade, GSettings, Desktop)\n")); printf (_("\ -C, --c++ shorthand for --language=C++\n")); printf (_("\ @@ -1157,26 +1158,27 @@ Language specific options:\n")); printf (_("\ -a, --extract-all extract all strings\n")); printf (_("\ - (only languages C, C++, ObjectiveC, Shell,\n\ - Python, Lisp, EmacsLisp, librep, Scheme, Java,\n\ - C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n\ - Lua, JavaScript, Vala)\n")); + (only languages C, C++, ObjectiveC, Python,\n\ + Java, C#, JavaScript, Scheme, Guile, Lisp,\n\ + EmacsLisp, librep, Rust, Shell, awk, Lua, Vala,\n\ + Tcl, Perl, PHP, GCC-source, Glade, GSettings)\n")); printf (_("\ -kWORD, --keyword=WORD look for WORD as an additional keyword\n\ -k, --keyword do not to use default keywords\n")); printf (_("\ - (only languages C, C++, ObjectiveC, Shell,\n\ - Python, Lisp, EmacsLisp, librep, Scheme, Java,\n\ - C#, awk, Tcl, Perl, PHP, GCC-source, Glade,\n\ - Lua, JavaScript, Vala, Desktop)\n")); + (only languages C, C++, ObjectiveC, Python,\n\ + Java, C#, JavaScript, Scheme, Guile, Lisp,\n\ + EmacsLisp, librep, Rust, Shell, awk, Lua, Vala,\n\ + Tcl, Perl, PHP, GCC-source, Glade, GSettings,\n\ + Desktop)\n")); printf (_("\ --flag=WORD:ARG:FLAG additional flag for strings inside the argument\n\ number ARG of keyword WORD\n")); printf (_("\ - (only languages C, C++, ObjectiveC, Shell,\n\ - Python, Lisp, EmacsLisp, librep, Scheme, Java,\n\ - C#, awk, YCP, Tcl, Perl, PHP, GCC-source,\n\ - Lua, JavaScript, Vala)\n")); + (only languages C, C++, ObjectiveC, Python,\n\ + Java, C#, JavaScript, Scheme, Guile, Lisp,\n\ + EmacsLisp, librep, Rust, Shell, awk, Lua, Vala,\n\ + Tcl, Perl, PHP, GCC-source, YCP)\n")); printf (_("\ --tag=WORD:FORMAT defines the behaviour of tagged template literals\n\ with tag WORD\n"));