search for: ocaml_gettext

Hi, here there are few patches to improve the extraction of translatable messages, and the usage of messages with plural forms. Pino Toscano (3): po: fix broken message extraction po: fix dependencies for libguestfs.pot extraction fish: improve the command error messages generator/fish.ml | 20 ++++++++++++++++---- po/Makefile.am | 24 +++++++----------------- 2 files changed, 23

...d-bugs-address="$(MSGID_BUGS_ADDRESS)" \ > --directory=$(top_srcdir) > > -$(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) > +$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl $(POTFILES_PL) POTFILES-ml $(POTFILES_ML) > rm -f $@-t > if HAVE_OCAML_GETTEXT > $(OCAML_GETTEXT) --action extract --extract-pot $@-t $(POTFILES_ML) So I agree that $(POTFILES-pl) is definitely wrong. Not sure exactly what we were thinking about there ... But, won't the addition of the literal file names break separate compilation? In particular, $(POTFILES_PL) i...

...erl \ - --files-from=$(abs_srcdir)/POTFILES-pl -# Don't trust msgcat since it will definitely screw up. Instead, chop -# the head from the second file and append it to the first. - echo >> $@-t - awk '/^#:/{i++}i{print}' < $@-pl >> $@-t - rm $@-pl + rm -f $@-t if HAVE_OCAML_GETTEXT - $(OCAML_GETTEXT) --action extract --extract-pot $@-ml $(POTFILES_ML) -# Don't trust msgcat since it will definitely screw up. Instead, chop -# the head from the second file and append it to the first. - echo >> $@-t - awk '/^#:/{i++}i{print}' < $@-ml >> $@-t - rm $@-ml...

...!= "xno" && test "x$OCAML_PKG_oUnit" != "xno" && test "x$ounit_is_v2" != "xno"]) + [test "x$OCAML_PKG_oUnit" != "xno" && test "x$ounit_is_v2" != "xno"]) AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no]) AM_CONDITIONAL([HAVE_OCAML_GETTEXT], - [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_gettext" != "xno" && test "x$OCAML_GETTEXT" !...

...)/POTFILES-pl > -# Don't trust msgcat since it will definitely screw up. Instead, chop > -# the head from the second file and append it to the first. > - echo >> $@-t > - awk '/^#:/{i++}i{print}' < $@-pl >> $@-t > - rm $@-pl > + rm -f $@-t > if HAVE_OCAML_GETTEXT > - $(OCAML_GETTEXT) --action extract --extract-pot $@-ml $(POTFILES_ML) > -# Don't trust msgcat since it will definitely screw up. Instead, chop > -# the head from the second file and append it to the first. > - echo >> $@-t > - awk '/^#:/{i++}i{print}' < $@-ml...

...t; > > > > > -$(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) > > > +$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl > > > $(POTFILES_PL) POTFILES-ml $(POTFILES_ML)> > > > rm -f $@-t > > > > > > if HAVE_OCAML_GETTEXT > > > > > > $(OCAML_GETTEXT) --action extract --extract-pot $@-t > > > $(POTFILES_ML) > > > > So I agree that $(POTFILES-pl) is definitely wrong. Not sure exactly > > what we were thinking about there ... > > > > But, won't the a...

...r CDEFLMPSUVYZX-3 $(OCAMLPACKAGES) +OCAMLCFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR) $(OCAMLPACKAGES) OCAMLOPTFLAGS = $(OCAMLCFLAGS) OCAMLCLIBS = \ diff --git a/configure.ac b/configure.ac index d464615..20f87ca 100644 --- a/configure.ac +++ b/configure.ac @@ -1093,6 +1093,12 @@ AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no]) AM_CONDITIONAL([HAVE_OCAML_GETTEXT], [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_gettext" != "xno" && test "x$OCAML_GETTEXT" !...

--- po-docs/ja/Makefile.am | 16 ++++++++-------- po-docs/uk/Makefile.am | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/po-docs/ja/Makefile.am b/po-docs/ja/Makefile.am index 820f91a..e954f04 100644 --- a/po-docs/ja/Makefile.am +++ b/po-docs/ja/Makefile.am @@ -92,9 +92,9 @@ guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod guestfs-stru

Not actually useful, as TESTS defines the tests, and it breaks when oUnit is not available (as it tries to build an oUnit-based unit test). --- mllib/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/mllib/Makefile.am b/mllib/Makefile.am index 0b43684..e363f27 100644 --- a/mllib/Makefile.am +++ b/mllib/Makefile.am @@ -132,9 +132,6 @@ libdir.ml: Makefile # Tests.

...$OCAML_PKG_oUnit" != "xno"]) + [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_oUnit" != "xno" && test "x$ounit_is_v2" != "xno"]) AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no]) AM_CONDITIONAL([HAVE_OCAML_GETTEXT], -- 2.1.0

...@@ XGETTEXT_ARGS = \ --msgid-bugs-address="$(MSGID_BUGS_ADDRESS)" \ --directory=$(top_srcdir) -$(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) +$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl $(POTFILES_PL) POTFILES-ml $(POTFILES_ML) rm -f $@-t if HAVE_OCAML_GETTEXT $(OCAML_GETTEXT) --action extract --extract-pot $@-t $(POTFILES_ML) -- 1.8.3.1

...> --directory=$(top_srcdir) > > > > -$(DOMAIN).pot: Makefile $(POTFILES) $(POTFILES-pl) $(POTFILES-ml) > > +$(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl > > $(POTFILES_PL) POTFILES-ml $(POTFILES_ML)> > > rm -f $@-t > > > > if HAVE_OCAML_GETTEXT > > > > $(OCAML_GETTEXT) --action extract --extract-pot $@-t > > $(POTFILES_ML) > > So I agree that $(POTFILES-pl) is definitely wrong. Not sure exactly > what we were thinking about there ... > > But, won't the addition of the literal file names break...

...rtion(+) diff --git a/po/Makefile.am b/po/Makefile.am index a8343ec..fd69441 100644 --- a/po/Makefile.am +++ b/po/Makefile.am @@ -67,6 +67,7 @@ XGETTEXT_ARGS = \ $(DOMAIN).pot: Makefile POTFILES $(POTFILES) POTFILES-pl $(POTFILES_PL) POTFILES-ml $(POTFILES_ML) rm -f $@-t + touch $@-t if HAVE_OCAML_GETTEXT $(OCAML_GETTEXT) --action extract --extract-pot $@-t $(POTFILES_ML) endif -- 1.8.5.1

...ML_BYTES_COMPAT_CMO) \ ../common/mlstdutils/guestfs_config.cmo \ ../common/mlstdutils/std_utils.cmo \ types.cmo \ diff --git a/m4/guestfs_ocaml.m4 b/m4/guestfs_ocaml.m4 index d8bd89f..c18a3de 100644 --- a/m4/guestfs_ocaml.m4 +++ b/m4/guestfs_ocaml.m4 @@ -113,27 +113,23 @@ AM_CONDITIONAL([HAVE_OCAML_GETTEXT], [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_gettext" != "xno" && test "x$OCAML_GETTEXT" != "xno"]) dnl Create the backwards compatibility Bytes module...

Followup/fix of commit 61d4891ef48df171a27873efe90aab51a9b711ef. --- builder/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index 09ae4ae..e64c899 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -311,7 +311,7 @@ depend: .depend .depend: $(wildcard $(abs_srcdir)/*.mli) $(wildcard $(abs_srcdir)/*.ml) rm -f

This commit starts to split our massive, monolithic configure.ac file into smaller files, using the m4_include mechanism to combine them. I don't know if we should really do this, so I'm open to comments about it. However: - Our configure.ac script is 1800+ lines long, and that's pretty long. - configure.ac lacks structure; splitting it up might improve that. - From what I read,

OCaml 4.02 introduced the 'bytes' type, a mutable string intended to replace the existing 'string' type for those cases where the byte array can be mutated. In future the 'string' type will become immutable. This is not the default now, but it can be forced using the '-safe-string' compile option. I tested this on Fedora 24 (OCaml 4.02) & RHEL 7 (OCaml 4.01).

We are migrating to Weblate (the Fedora instance, in particular) for translations instead of Zanata. Adapt our tooling a bit to the different workflow: - Weblate takes care of updating the po files whenever a new translation catalog is available, so stop doing that on our own: this meant also tweaking the po4a usage for POD documentations, resulting in simpler rules (IMHO) - ensure that the

We are migrating to Weblate (the Fedora instance, in particular) for translations instead of Zanata. Adapt our tooling a bit to the different workflow: - Weblate takes care of updating the po files whenever a new translation catalog is available, so stop doing that on our own: this meant also tweaking the po4a usage for POD documentations, resulting in simpler rules (IMHO) - ensure that the

...;& test "x$OCAML_PKG_gettext" != "xno"]) +AM_CONDITIONAL([HAVE_OCAML_PKG_OUNIT], + [test "x$OCAMLC" != "xno" && test "x$OCAMLFIND" != "xno" && test "x$OCAML_PKG_oUnit" != "xno"]) AC_CHECK_PROG([OCAML_GETTEXT],[ocaml-gettext],[ocaml-gettext],[no]) AM_CONDITIONAL([HAVE_OCAML_GETTEXT], -- 1.9.3