RE: Where to contribute manual translations ?

["Vincent Belaïche" <vincent.b.1@hotmail.fr>]

[-- Attachment #1.1: Type: text/plain, Size: 1307 bytes --]

Please find it attached.

BR,
  V.
________________________________
De : emacs-devel-bounces+vincent.b.1=hotmail.fr@gnu.org <emacs-devel-bounces+vincent.b.1=hotmail.fr@gnu.org> de la part de Eli Zaretskii <eliz@gnu.org>
Envoyé : jeudi 4 janvier 2024 12:24
À : Vincent Belaïche <vincent.b.1@hotmail.fr>
Cc : jean.christophe.helary@traductaire-libre.org <jean.christophe.helary@traductaire-libre.org>; rrandresf@gmail.com <rrandresf@gmail.com>; rrandresf@hotmail.com <rrandresf@hotmail.com>; stefankangas@gmail.com <stefankangas@gmail.com>; emacs-devel@gnu.org <emacs-devel@gnu.org>; rms@gnu.org <rms@gnu.org>
Objet : Re: Where to contribute manual translations ?

> From: Vincent Belaïche <vincent.b.1@hotmail.fr>
> CC: "emacs-devel@gnu.org" <emacs-devel@gnu.org>, Richard Stallman
>        <rms@gnu.org>
> Date: Mon, 1 Jan 2024 00:27:28 +0000
>
> I have pushed the French translation of SES manual to master, here is a patch to make the compilation :
>
> [https://res-h3.public.cdn.office.net/assets/mail/file-icon/png/generic_16x16.png]patch.diff<https://1drv.ms/u/s!AkDIBBjRAOVwg3y54YIxSCu3e2MI>
>
> Since I am not the maintainer of these Makefile.in scripts, I did not dare push this change.

Could you please post that patch here, either inline or as an
attachment?

Thanks.


[-- Attachment #1.2: Type: text/html, Size: 2959 bytes --]

[-- Attachment #2: patch 2.diff --]
[-- Type: application/octet-stream, Size: 9894 bytes --]

diff --git a/Makefile.in b/Makefile.in
index 45540d2742f..b076cccbe39 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -115,6 +115,8 @@ HAVE_GSETTINGS =
 
 ANDROID = @ANDROID@
 
+DOCLANGS=default fr
+
 # ==================== Where To Install Things ====================
 
 # Location to install Emacs.app under GNUstep / macOS.
@@ -800,7 +802,7 @@ install-info:
 	   [ -f "$(DESTDIR)${infodir}/dir" ] || \
 	      [ ! -f ${srcdir}/info/dir ] || \
 	      ${INSTALL_DATA} ${srcdir}/info/dir "$(DESTDIR)${infodir}/dir"; \
-	   info_misc=`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc echo-info`; \
+	   info_misc="$(foreach lang,$(DOCLANGS),`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc lang=$(lang) echo-info`)"; \
 	   cd ${srcdir}/info ; \
 	   for elt in ${INFO_NONMISC} $${info_misc}; do \
 	      for f in `ls $$elt $$elt-[1-9] $$elt-[1-9][0-9] 2>/dev/null`; do \
@@ -945,7 +947,7 @@ uninstall:
 	done
 	-rm -rf "$(DESTDIR)${libexecdir}/emacs/${version}"
 	thisdir=`pwd -P`; \
-	(info_misc=`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc echo-info`; \
+	(info_misc="$(foreach LANG,$(DOCLANGS),`MAKEFLAGS= $(MAKE) --no-print-directory -s -C doc/misc LANG=$(LANG) echo-info`)"; \
 	 if cd "$(DESTDIR)${infodir}"; then \
 	   for elt in ${INFO_NONMISC} $${info_misc}; do \
 	     (cd "$${thisdir}"; \
@@ -1120,7 +1122,7 @@ TAGS tags:
 	$(MAKE) -C doc/emacs tags
 	$(MAKE) -C doc/lispintro tags
 	$(MAKE) -C doc/lispref tags
-	$(MAKE) -C doc/misc tags
+	$(foreach LANG,$(DOCLANGS),$(MAKE) -C doc/misc LANG=$(LANG) tags;)
 
 CHECK_TARGETS = check check-maybe check-expensive check-all check-byte-compile
 .PHONY: $(CHECK_TARGETS)
@@ -1142,7 +1144,7 @@ PSS   =
 
 DOCS = $(DVIS) $(HTMLS) $(INFOS) $(PDFS) $(PSS)
 $(DOCS):
-	$(MAKE) -C doc/$(subst -, ,$@)
+	$(foreach lang,$(DOCLANGS),$(MAKE) -C doc/$(subst -, LANG=$(lang) ,$@);)
 
 .PHONY: $(DOCS) docs pdf ps
 .PHONY: info dvi dist html info-dir check-info
@@ -1166,13 +1168,18 @@ misc-dvi misc-html misc-pdf misc-ps:
 
 info-dir: ${srcdir}/info/dir
 
-texi_misc = $(shell MAKEFLAGS= ${MAKE} --no-print-directory -s -C doc/misc echo-sources)
+define set_texi_misc
+texi_misc_$(1) = $$(shell MAKEFLAGS= $${MAKE} --no-print-directory -s -C doc/misc LANG=$(1) echo-sources)
+
+endef
+
+$(foreach lang,$(DOCLANGS),$(eval $(call set_texi_misc,$(lang))))
 
 srcdir_doc_info_dir_inputs = \
   ${srcdir}/doc/emacs/emacs.texi \
   ${srcdir}/doc/lispintro/emacs-lisp-intro.texi \
   ${srcdir}/doc/lispref/elisp.texi \
-  $(addprefix ${srcdir}/doc/misc/,${texi_misc})
+  $(foreach lang,$(DOCLANGS),$(addprefix ${srcdir}/doc/misc/$(filter-out ../lang/default/misc/,../lang/$(lang)/misc/),$(texi_misc_$(lang)) ))
 info_dir_inputs = \
   ../build-aux/dir_top \
   $(subst ${srcdir}/doc/,,${srcdir_doc_info_dir_inputs})
diff --git a/doc/lang/default/info_common.mk b/doc/lang/default/info_common.mk
new file mode 100644
index 00000000000..92b3f144019
--- /dev/null
+++ b/doc/lang/default/info_common.mk
@@ -0,0 +1,11 @@
+## Info files to build and install on all platforms.
+INFO_COMMON = auth autotype bovine calc ccmode cl dbus dired-x		\
+	ebrowse ede ediff edt efaq eglot eieio emacs-gnutls		\
+	emacs-mime epa erc ert eshell eudc eww flymake forms gnus	\
+	htmlfontify idlwave ido info.info mairix-el message mh-e	\
+	modus-themes newsticker nxml-mode octave-mode org pcl-cvs pgg	\
+	rcirc reftex remember sasl sc semantic ses sieve smtpmail	\
+	speedbar srecode todo-mode tramp transient url use-package	\
+	vhdl-mode vip viper vtable widget wisent woman
+
+DOCMISC_W32_TARGET = efaq-w32
diff --git a/doc/lang/fr/info_common.mk b/doc/lang/fr/info_common.mk
new file mode 100644
index 00000000000..e72440fe69a
--- /dev/null
+++ b/doc/lang/fr/info_common.mk
@@ -0,0 +1,8 @@
+## Info files to build and install on all platforms (onl ses has been
+## translated to Frenchj)
+INFO_COMMON = ses
+
+## efac-w32 has not been translated to French
+DOCMISC_W32:=#
+
+DOCMISC_W32_TARGET:=#
diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in
index 1831bbbb73f..b8ea16b554a 100644
--- a/doc/misc/Makefile.in
+++ b/doc/misc/Makefile.in
@@ -63,18 +63,18 @@ INSTALL_DATA =
 MAKEINFO = @MAKEINFO@
 MAKEINFO_OPTS = --force -I$(emacsdir)
 
+ifeq ($(LANG),)
+LANG:=default
+endif
+
+lang_suffix:=$(filter-out -default,-$(LANG))
+lang_subdir:=$(filter-out ../lang/default/misc/,../lang/$(LANG)/misc/)
+
 ## On MS Windows, efaq-w32; otherwise blank.
 DOCMISC_W32 = @DOCMISC_W32@
 
 ## Info files to build and install on all platforms.
-INFO_COMMON = auth autotype bovine calc ccmode cl dbus dired-x		\
-	ebrowse ede ediff edt efaq eglot eieio emacs-gnutls		\
-	emacs-mime epa erc ert eshell eudc eww flymake forms gnus	\
-	htmlfontify idlwave ido info.info mairix-el message mh-e	\
-	modus-themes newsticker nxml-mode octave-mode org pcl-cvs pgg	\
-	rcirc reftex remember sasl sc semantic ses sieve smtpmail	\
-	speedbar srecode todo-mode tramp transient url use-package	\
-	vhdl-mode vip viper vtable widget wisent woman
+include ../lang/$(LANG)/info_common.mk
 
 ## Info files to install on current platform.
 INFO_INSTALL = $(INFO_COMMON) $(DOCMISC_W32)
@@ -82,13 +82,13 @@ INFO_INSTALL =
 ## Info files to build on current platform.
 ## This is all of them, even though they might not all get installed,
 ## because the info files are pre-built in release tarfiles.
-INFO_TARGETS = $(INFO_COMMON) efaq-w32
+INFO_TARGETS = $(INFO_COMMON) $(DOCMISC_W32_TARGET)
 
 ## Some manuals have their source in .org format.
 ## This is discouraged because the .texi files it generates
 ## are not as well formatted as handwritten ones.
-ORG_SETUP = $(wildcard ${srcdir}/*-setup.org)
-ORG_SRC = $(filter-out ${ORG_SETUP},$(wildcard ${srcdir}/*.org))
+ORG_SETUP = $(wildcard ${srcdir}/$(lang_subdir)*-setup.org)
+ORG_SRC = $(filter-out ${ORG_SETUP},$(wildcard ${srcdir}/$(lang_subdir)*.org))
 TEXI_FROM_ORG = ${ORG_SRC:.org=.texi}
 
 # There are some naming differences between the info targets and the other
@@ -96,15 +96,18 @@ TEXI_FROM_ORG = ${ORG_SRC:
 TARGETS_1 = $(INFO_INSTALL:ccmode=cc-mode)
 TARGETS = $(TARGETS_1:info.info=info)
 
-texi_sources = $(addsuffix .texi,${TARGETS})
+# Sources are also suffixed, this is useless as they are in different
+# directories, but some people argued that there should not be
+# different files with same name in the repo.
+texi_sources = $(addsuffix $(lang_suffix).texi,${TARGETS})
 texi_notgen = $(filter-out $(notdir ${TEXI_FROM_ORG}),${texi_sources})
 texi_and_org = $(notdir ${ORG_SRC}) ${texi_notgen}
 SOURCES = $(sort ${texi_and_org})
 
-DVI_TARGETS  = $(TARGETS:=.dvi)
-HTML_TARGETS = $(TARGETS:=.html)
-PDF_TARGETS  = $(TARGETS:=.pdf)
-PS_TARGETS   = $(TARGETS:=.ps)
+DVI_TARGETS  = $(TARGETS:=$(lang_suffix).dvi)
+HTML_TARGETS = $(TARGETS:=$(lang_suffix).html)
+PDF_TARGETS  = $(TARGETS:=$(lang_suffix).pdf)
+PS_TARGETS   = $(TARGETS:=$(lang_suffix).ps)
 
 TEXI2DVI = texi2dvi
 TEXI2PDF = texi2pdf
@@ -132,7 +135,7 @@ info:
 ## Base file names of output info files.
 INFO_BASES = $(patsubst %.info,%,$(notdir $(INFO_INSTALL)))
 echo-info:
-	@: $(info $(addsuffix .info,$(INFO_BASES)))
+	@: $(info $(addsuffix $(lang_suffix).info,$(INFO_BASES)))
 
 echo-sources:
 	@: $(info $(SOURCES))
@@ -152,13 +155,13 @@ ${buildinfodir}:
 
 EXTRA_OPTS =
 
-${buildinfodir}/%.info: ${srcdir}/%.texi ${gfdl} ${style} | ${buildinfodir}
+${buildinfodir}/%$(lang_suffix).info: ${srcdir}/$(lang_subdir)%$(lang_suffix).texi ${gfdl} ${style} | ${buildinfodir}
 	$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) $(EXTRA_OPTS) \
 	  -o $@ $<
 
 ## The short aliases, eg efaq = $(buildinfodir)/efaq.info.
 define info_template
- $(1): $$(buildinfodir)/$(1).info
+ $(1): $$(buildinfodir)/$(1)$(lang_suffix).info
 endef
 
 ## "info" is already taken.
@@ -167,17 +170,17 @@ info.info:
 $(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_template,$(ifile))))
 
 
-%.dvi: ${srcdir}/%.texi ${gfdl} ${style}
+%$(lang_suffix).dvi: ${srcdir}/$(lang_subdir)%$(lang_suffix).texi ${gfdl} ${style}
 	$(ENVADD) $(TEXI2DVI) $<
 
-%.pdf: ${srcdir}/%.texi ${gfdl} ${style}
+%$(lang_suffix).pdf: ${srcdir}/$(lang_subdir)%$(lang_suffix).texi ${gfdl} ${style}
 	$(ENVADD) $(TEXI2PDF) $<
 
-%.html: ${srcdir}/%.texi ${gfdl} ${style}
+%$(lang_suffix).html: ${srcdir}/$(lang_subdir)%$(lang_suffix).texi ${gfdl} ${style}
 	$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) $(EXTRA_OPTS) \
 	  -o $@ $<
 
-%.ps: %.dvi
+%$(lang_suffix).ps: %$(lang_suffix).dvi
 	$(DVIPS) -o $@ $<
 
 
@@ -204,16 +207,16 @@ ${buildinfodir}/ccmode.info:
 
 ## efaq, efaq_w32 do not depend on gfdl.
 ## Maybe we can use .SECONDEXPANSION for this.
-${buildinfodir}/efaq%.info: ${srcdir}/efaq%.texi ${style} | ${buildinfodir}
+${buildinfodir}/efaq%$(lang_suffix).info: ${srcdir}/efaq%$(lang_suffix).texi ${style} | ${buildinfodir}
 	$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $<
 
-efaq%.dvi: ${srcdir}/efaq%.texi
+efaq%$(lang_suffix).dvi: ${srcdir}/efaq%$(lang_suffix).texi
 	$(ENVADD) $(TEXI2DVI) $<
 
-efaq%.pdf: ${srcdir}/efaq%.texi
+efaq%$(lang_suffix).pdf: ${srcdir}/efaq%$(lang_suffix).texi
 	$(ENVADD) $(TEXI2PDF) $<
 
-efaq%.html: ${srcdir}/efaq%.texi
+efaq%$(lang_suffix).html: ${srcdir}/efaq%$(lang_suffix).texi
 	$(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $<
 
 ${buildinfodir}/emacs-mime.info emacs-mime.html: EXTRA_OPTS = --enable-encoding
@@ -248,7 +251,10 @@ emacs =
 # things like org-setup's "version" macro work.  Sigh.
 define org_template
  $(1:.org=.texi): $(1) ${top_srcdir}/lisp/org/ox-texinfo.el
-	$${AM_V_GEN}cd "$${srcdir}" && $${emacs} -l ox-texinfo \
+	$${AM_V_GEN}cd "$${srcdir}" && $${emacs} \
+	  --eval '(add-to-list (quote load-path) "$(abspath ${top_srcdir}/lisp/org)")' \
+	  --eval '(setq org--inhibit-version-check t)' \
+	  -l ox-texinfo \
 	  --eval '(setq gc-cons-threshold 50000000)' \
 	  -f org-texinfo-export-to-texinfo-batch $$(notdir $$<) $$(notdir $$@)
 endef