From unknown Sat Jun 21 03:02:48 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#63483 <63483@debbugs.gnu.org> To: bug#63483 <63483@debbugs.gnu.org> Subject: Status: [PATCH 0/4] build: Update po4a process. Reply-To: bug#63483 <63483@debbugs.gnu.org> Date: Sat, 21 Jun 2025 10:02:48 +0000 retitle 63483 [PATCH 0/4] build: Update po4a process. reassign 63483 guix-patches submitter 63483 gemmaro severity 63483 normal tag 63483 moreinfo patch thanks From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 06:32:06 2023 Received: (at submit) by debbugs.gnu.org; 13 May 2023 10:32:06 +0000 Received: from localhost ([127.0.0.1]:36046 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmXl-0004v4-Qy for submit@debbugs.gnu.org; Sat, 13 May 2023 06:32:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:57352) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmXk-0004uw-A8 for submit@debbugs.gnu.org; Sat, 13 May 2023 06:32:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pxmXi-0007qn-R6 for guix-patches@gnu.org; Sat, 13 May 2023 06:32:03 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pxmXg-0000WM-Ax for guix-patches@gnu.org; Sat, 13 May 2023 06:32:01 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-643a1fed360so6502870b3a.3 for ; Sat, 13 May 2023 03:31:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683973918; x=1686565918; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=x4rpqNf0yuUEmr9mmqRRU3KdkBGN9egkPIMCppVlJBQ=; b=H/Gzq4cql+US6Q/yYYqXQmiKjYffhnLFLl2EGHl3Xh0oWWqooeIGryk5Caj9xLhIMD Bit1w8dsxKH5Q0Mi385ZocdcsguLVcoTuOBUnrKuawxor0X6bJ8cERUz0iZwyymN4nz1 52BUcdHSwMXH/93Nlu1pVFx2iAAKmjI5l+bQqMRar+iqEItlc9hP8xFlnKQtsDp+N4Sn p9hAClyzZquPkZmZAWij/x4FycEusGSl6h+aRW34CfzOgq46nr7AusSFtw4h8BM+nORl 8RNCLg+et1fPYYSCkhRXiOkEUUH3JaocVQQESktHkr/prcLYkylxMgspBCrXZJoXO08l cMfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683973918; x=1686565918; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=x4rpqNf0yuUEmr9mmqRRU3KdkBGN9egkPIMCppVlJBQ=; b=g+wgoyQh8ZE5waENoNDCo5tKKl/WhaNnMOMx/iJGiq0ZZyg+2fP6+i/qVnZlLQgLm1 JIzxXOeBllvDDx8n0hG+UCHh+l3VY8QH/pjcQmSdXnTqcm+IPiQ53IJHUdVNNW34xjGN PUIVyylfwMqDhHl8Jowi87BCrvfdTrJFF5OdhhcEukrSrbRIVeraTgCbYGJJ1KpwOATB 96aJKYDjLIQcDsFII2Fqn9Lx5kG8DW7+HzkoUD2jyqDeyAXFY/VosorAG5egY0aipoWU Dj9NKMtm5FJTKix44ZlwJr2P/SW/qh1vIrkGFz1+XrWw3vtaGMxSZRC0SkuL8Z2wOFaw ZSGg== X-Gm-Message-State: AC+VfDy4ga99Pd2kP3V/XT1myKWnVhvkICf3EVCAV+LJiz/l/p2y/fjX 29ollJOGifTz6mA0UPnsnXPEi/MeKFoOLA== X-Google-Smtp-Source: ACHHUZ61ntBAtX+eLf/Ak8mvDuoeFxSZOS4awKN5iYm7jFT16pbuFzlbnHyG7sRhHLfYR17GRKyHdg== X-Received: by 2002:a05:6a00:b82:b0:649:450f:3231 with SMTP id g2-20020a056a000b8200b00649450f3231mr13461830pfj.9.1683973918633; Sat, 13 May 2023 03:31:58 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id p21-20020aa78615000000b00638965d4248sm8395687pfn.184.2023.05.13.03.31.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:31:58 -0700 (PDT) From: gemmaro To: guix-patches@gnu.org Subject: [PATCH 0/4] build: Update po4a process. Date: Sat, 13 May 2023 19:17:47 +0900 Message-Id: X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=gemmaro.dev@gmail.com; helo=mail-pf1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) Hello, This patchset updates the po4a build process and is a follow-up to [1]. In particular, it now uses po4a command instead of po4a-updatepo and po4a-translate in both Make tasks and `guix build -f doc/build.scm`. So no more warnings like "po4a-translate is deprecated. The unified po4a(1) program is more convenient and less error prone." I have checked that the updated process works with `make`, `make dist`, `make as-derivation` and `guix build -f doc/build.scm`, and there seem to be no errors. I don't think this affects other components like Weblate either (Weblate components use po/doc/guix-manual.xx.po and po/doc/guix-cookbook.xx.po, and these files are still to be generated). Sorry for the delay in submitting this. I hope there are no major mistakes and that I'll no longer feel guilty every time I see po4a warnings. [1] [PATCH 0/6] gnu: po4a: Update to 0.68 https://issues.guix.gnu.org/60448 Best, gemmaro. gemmaro (4): build: Align Automake status lines of po4a and PO xref. build: Update po4a process for Makefiles. self: Update po4a process. doc: Update documentation about translation languages. Makefile.am | 5 ++-- configure.ac | 3 +- doc/contributing.texi | 14 ++++----- doc/local.mk | 67 ++++++++++++++++++++++++------------------- guix/self.scm | 39 ++++++++++++------------- po/doc/local.mk | 49 +++++++++++++------------------ po/doc/po4a.cfg | 42 +++++++++++++++++++++++++++ 7 files changed, 130 insertions(+), 89 deletions(-) create mode 100644 po/doc/po4a.cfg base-commit: cf89a215cec346bc4d6622cbe353c058452b29b2 -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 06:37:12 2023 Received: (at 63483) by debbugs.gnu.org; 13 May 2023 10:37:12 +0000 Received: from localhost ([127.0.0.1]:36052 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmch-00052P-MT for submit@debbugs.gnu.org; Sat, 13 May 2023 06:37:12 -0400 Received: from mail-pl1-f181.google.com ([209.85.214.181]:61900) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmcf-000528-HF for 63483@debbugs.gnu.org; Sat, 13 May 2023 06:37:10 -0400 Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1ab1b79d3a7so75334935ad.3 for <63483@debbugs.gnu.org>; Sat, 13 May 2023 03:37:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683974224; x=1686566224; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6g5ZY7gBsJ9uVVaGQBx1WlAUpV98KcCDZ1B9f9Ob0fM=; b=MKAUtDTlfvL/Dgc/w+/Wz0W3wILY30QeEaYw6pz0k2TQrL7l2kDJbbJlKl227qtaxE V13qf6Jmt0kBj3KxqaKPrpnOuAC0KqQ7w3gQEBJM/pDr2Cmvq7uJlUjKcfu3KqLvFi1F zCzje5lFballbA7n46OhLDYCKueu+I9e8c2vG9XY/1bo1RwRYxIuvrqF+/13FP7+830v M16Ei2MULm7xR2kPVJQhqmsrDcdj/ielsIoax7KEw9lUTtLiUkmDbnfrNbSvFlMNjicE +J1VcwpRaMt4f7GOgJRGKRMFI4uAU68RX6WftdJarbK85ulW5wPCbXiPsUuv5O6jgZYL WR2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683974224; x=1686566224; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6g5ZY7gBsJ9uVVaGQBx1WlAUpV98KcCDZ1B9f9Ob0fM=; b=CnrZ8ZT9jvqm6Jf5t+MNZ01xGQWzGn6w9fB5k0V8V+eoTCBmB3FKpobMdEYdHTHsoY q4OQJI2f5TOZ90LlbkntaEa3anAZWN5qBGYeZIjheqtWZkbDr3ZJhbEUTf+dHkRoOtIm O9ZC6AOOGKPFLQfIoVhypYcseaMFMY2nc7ZpVUCMwA6Ub2OtRLJh0Bnu3y4RDmnyXhyN ZlViMlIoW+XywsR8epuK8iKihnLnv3CsBlTOK3IvWW8yiBESvIWLflQ+6RCxCU9fwANA L7fyyxDivkZd+TVp9luJNw30EjeqbfJeZU3HR+ESYDQuJavteUbnx0JSIWxXZRJfeMkG irbA== X-Gm-Message-State: AC+VfDz8LA3gAp1TWlhcD4k4PGQGyQUma+ut7pnrI2dWUoIJLvymuL3H 1k2FHEp7P529mYD74egpFfmGZvExdVSGRw== X-Google-Smtp-Source: ACHHUZ7Pcu6+BNKqWtZxseqpAr0ffGGARN+Ff/j2vbKp6HPDChF1W/HPxzurV61B8h/mU3toV1Bltw== X-Received: by 2002:a17:903:1208:b0:1a6:4606:6e06 with SMTP id l8-20020a170903120800b001a646066e06mr32430759plh.17.1683974223625; Sat, 13 May 2023 03:37:03 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 3-20020a170902c10300b001aaed524541sm9483236pli.227.2023.05.13.03.37.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:37:03 -0700 (PDT) From: gemmaro To: 63483@debbugs.gnu.org Subject: [PATCH 1/4] build: Align Automake status lines of po4a and PO xref. Date: Sat, 13 May 2023 19:36:13 +0900 Message-Id: <9f604573c558026da2546fad2e1b6f3b41edba12.1683969802.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 13718e4353a..1c7dc667311 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,6 +17,7 @@ # Copyright © 2020, 2021, 2023 Maxim Cournoyer # Copyright © 2021 Chris Marusich # Copyright © 2021 Andrew Tropin +# Copyright © 2023 gemmaro # # This file is part of GNU Guix. # @@ -1186,8 +1187,8 @@ AM_V_HELP2MAN_0 = @echo " HELP2MAN" $@; AM_V_PO4A = $(AM_V_PO4A_$(V)) AM_V_PO4A_ = $(AM_V_PO4A_$(AM_DEFAULT_VERBOSITY)) -AM_V_PO4A_0 = @echo " PO4A" $@; +AM_V_PO4A_0 = @echo " PO4A " $@; AM_V_POXREF = $(AM_V_POXREF_$(V)) AM_V_POXREF_ = $(AM_V_POXREF_$(AM_DEFAULT_VERBOSITY)) -AM_V_POXREF_0 = @echo " POXREF" $@; +AM_V_POXREF_0 = @echo " POXREF " $@; -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 06:37:15 2023 Received: (at 63483) by debbugs.gnu.org; 13 May 2023 10:37:15 +0000 Received: from localhost ([127.0.0.1]:36055 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmck-00052j-6U for submit@debbugs.gnu.org; Sat, 13 May 2023 06:37:15 -0400 Received: from mail-pl1-f170.google.com ([209.85.214.170]:54782) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmch-00052B-4O for 63483@debbugs.gnu.org; Sat, 13 May 2023 06:37:12 -0400 Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1ab13da70a3so105078545ad.1 for <63483@debbugs.gnu.org>; Sat, 13 May 2023 03:37:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683974225; x=1686566225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=v7s18vUnpIxW6b1W0EKqsUc3DUTo030BipSRr0f2pDQ=; b=BpDCCVGALsr7AjcgSOwA00Z2S2egx7voI/vRuN0Nj3RsG6ndje/s6K4sXpgKPARbE5 OQBTrBUGEA9QjYNuYwoqXFIhbBTnnwaKGN5c2uy/3kkADmR2QPajpzoT80BAsKurgO6U A3voGdySo4ypjKF7TRpB9ki9Kk8934n8UdobgRURdn9H4PGfff/Zlc9g5W+vpXxaDlNr xIYRH7tgL8ZLd1VkzwPQvUdqtYJ8i444YV4eiXc9mUd2Pu3ruWNZ2dq7aoye0FrYCvMK nbwMyTpglCnVEkBzwEmc6XGVxZNmOw9LuN9o6e5rWqyaT5XsZ00KwumH+KCYYXziPraT 8dtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683974225; x=1686566225; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=v7s18vUnpIxW6b1W0EKqsUc3DUTo030BipSRr0f2pDQ=; b=TqphbN4ODYbuSLhFp2ZMmlYzADU5/wDeAe2CDqkAeKS0+Xtap34p8jwQ6U3Q3uHrPI VYgzOwfCxt4fhNffWmCsuyn9KhaUannQub2cKW7MRzqAo9kaJEgbyEBIZ84hBn9xSxtg 6+aEOhCk8By/euHZWjKWKZbv3kBm3YjltlxHFc94bDxGl/8KNH6YlZsA97ZA/oDdGNb/ C+zLza7j8m1WbF7UQzvJOn1sV+KZ4qwH+wAG+XjWGtmwdzTv/PIn+Ek9zDfhaZqFfjxL U+Wc/Yxawt8ViqSXDsqfu3XRbFbxGWzDtkxnaVuoBwtsmKXsfWyZHpmJubJC5ETdq2wa ESAg== X-Gm-Message-State: AC+VfDw9ejevWuMMWp80/BMs0wwjZ3l+uDRIPXsRGDWkWUN0KwMZtYeG ayzo4zh068ZJAYhWYrpkKE3IXN/FIUO4Wg== X-Google-Smtp-Source: ACHHUZ610ZeeI6/CCgOsZKoecseFaKAsFyy/Z1n+a4UFDmg+MIWGWt9nq8HvtnU4za5sRV/Ssy0zuQ== X-Received: by 2002:a17:902:c14b:b0:1aa:fdab:24a5 with SMTP id 11-20020a170902c14b00b001aafdab24a5mr7282911plj.10.1683974225347; Sat, 13 May 2023 03:37:05 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 3-20020a170902c10300b001aaed524541sm9483236pli.227.2023.05.13.03.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:37:04 -0700 (PDT) From: gemmaro To: 63483@debbugs.gnu.org Subject: [PATCH 2/4] build: Update po4a process for Makefiles. Date: Sat, 13 May 2023 19:36:14 +0900 Message-Id: <82eab96fe2d17ab13beea1bdcd8aea8a3d1e325c.1683969802.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Florian Pelz , Julien Lepiller Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- po4a adds deprecation warnings for po4a-updatepo and po4a-translate as of version 0.68[1]. Since po4a supports split mode[2] for POT files, intermediate POT files po/doc/guix.pot and po/doc/contributing.pot are no longer generated. Note that the po4a option translate-only can't be used here, because po4a doesn't support it in this split mode. In the po4a.cfg file, the destdir option is used to override it with the po4a command line flag, which is needed by the translate-texi-manuals function in guix/self.scm (see also third patch). [1] mquinson/po4a: The High Hopes release https://github.com/mquinson/po4a/releases/tag/v0.68 [2] po4a(1): Centralized or split PO files? https://po4a.org/man/man1/po4a.1.php configure.ac | 3 +-- doc/local.mk | 67 ++++++++++++++++++++++++++++--------------------- po/doc/local.mk | 49 +++++++++++++++--------------------- po/doc/po4a.cfg | 42 +++++++++++++++++++++++++++++++ 4 files changed, 101 insertions(+), 60 deletions(-) create mode 100644 po/doc/po4a.cfg diff --git a/configure.ac b/configure.ac index 92dede80141..a9488967c3f 100644 --- a/configure.ac +++ b/configure.ac @@ -255,8 +255,7 @@ dnl Manual pages. AM_MISSING_PROG([HELP2MAN], [help2man]) dnl Documentation translation. -AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate]) -AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo]) +AM_MISSING_PROG([PO4A], [po4a]) case "$storedir" in /gnu/store) diff --git a/doc/local.mk b/doc/local.mk index 89285b9f35a..68e518a4933 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -5,6 +5,7 @@ # Copyright © 2016 Taylan Ulrich Bayırlı/Kammer # Copyright © 2016, 2018 Mathieu Lirzin # Copyright © 2018, 2021 Julien Lepiller +# Copyright © 2023 gemmaro # # This file is part of GNU Guix. # @@ -21,32 +22,43 @@ # You should have received a copy of the GNU General Public License # along with GNU Guix. If not, see . -# If adding a language, update the following variables, and info_TEXINFOS. -MANUAL_LANGUAGES = de es fr pt_BR ru zh_CN -COOKBOOK_LANGUAGES = de fr ko sk +info_TEXINFOS = \ + %D%/guix.texi \ + %D%/guix-cookbook.texi \ + $(TRANSLATED_INFO_TEXINFOS) -# Arg1: A list of languages codes. -# Arg2: The file name stem. -lang_to_texinfo = $(foreach lang,$(1),%D%/$(2).$(lang).texi) +%C%_guix_TEXINFOS = \ + %D%/contributing.texi \ + $(TRANSLATED_GUIX_TEXINFOS) \ + %D%/fdl-1.3.texi +# If adding a language, update the following and po4a_langs section in +# po/doc/po4a.cfg. And if the file name is guix.xx.texi, also update +# TRANSLATED_GUIX_TEXINFOS. +# # Automake does not understand GNU Make non-standard extensions, -# unfortunately, so we cannot use the above patsubst-based function here. -info_TEXINFOS = %D%/guix.texi \ +# unfortunately, so we cannot use the patsubst-based function here. +TRANSLATED_INFO_TEXINFOS = \ %D%/guix.de.texi \ %D%/guix.es.texi \ %D%/guix.fr.texi \ %D%/guix.pt_BR.texi \ %D%/guix.ru.texi \ %D%/guix.zh_CN.texi \ - %D%/guix-cookbook.texi \ %D%/guix-cookbook.de.texi \ %D%/guix-cookbook.fr.texi \ %D%/guix-cookbook.ko.texi \ %D%/guix-cookbook.sk.texi -%C%_guix_TEXINFOS = \ - %D%/contributing.texi \ - %D%/fdl-1.3.texi +TRANSLATED_GUIX_TEXINFOS = \ + %D%/contributing.de.texi \ + %D%/contributing.es.texi \ + %D%/contributing.fr.texi \ + %D%/contributing.pt_BR.texi \ + %D%/contributing.ru.texi \ + %D%/contributing.zh_CN.texi + +TRANSLATED_INFO = $(TRANSLATED_INFO_TEXINFOS) $(TRANSLATED_GUIX_TEXINFOS) DOT_FILES = \ %D%/images/bootstrap-graph.dot \ @@ -76,19 +88,13 @@ OS_CONFIG_EXAMPLES_TEXI = \ %D%/os-config-lightweight-desktop.texi \ %D%/he-config-bare-bones.scm -TRANSLATED_INFO = \ - $(call lang_to_texinfo,$(MANUAL_LANGUAGES),guix) \ - $(call lang_to_texinfo,$(MANUAL_LANGUAGES),contributing) \ - $(call lang_to_texinfo,$(COOKBOOK_LANGUAGES),guix-cookbook) - # Bundle this file so that makeinfo finds it in out-of-source-tree builds. BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) EXTRA_DIST += $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) MAINTAINERCLEANFILES = $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) -PO4A_PARAMS := -M UTF-8 -L UTF-8 #master and localized encoding -PO4A_PARAMS += -k 0 # produce an output even if the translation is not complete -PO4A_PARAMS += -f texinfo # texinfo format +$(foreach texi,$(TRANSLATED_INFO),$(texi).tmp) &: $(DOC_PO_FILES) + -$(AM_V_PO4A)$(PO4A) --no-update $(srcdir)/po/doc/po4a.cfg # When a change to guix.texi occurs, it is not translated immediately. # Because @pxref and @xref commands are references to sections by name, they @@ -101,22 +107,25 @@ $(top_srcdir)/pre-inst-env $(GUILE) --no-auto-compile \ $@.tmp $< endef -$(srcdir)/%D%/guix.%.texi: po/doc/guix-manual.%.po $(srcdir)/%D%/contributing.%.texi guix/build/po.go - -$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/guix.texi" -p "$<" -l "$@.tmp" +$(srcdir)/%D%/guix.%.texi: po/doc/guix-manual.%.po \ + $(srcdir)/%D%/guix.%.texi.tmp \ + guix/build/po.go -sed -i "s|guix\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp" -$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command) - -mv "$@.tmp" "$@" + -cp "$@.tmp" "$@" -$(srcdir)/%D%/guix-cookbook.%.texi: po/doc/guix-cookbook.%.po guix/build/po.go - -$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/guix-cookbook.texi" -p "$<" -l "$@.tmp" +$(srcdir)/%D%/guix-cookbook.%.texi: po/doc/guix-cookbook.%.po \ + $(srcdir)/%D%/guix-cookbook.%.texi.tmp \ + guix/build/po.go -sed -i "s|guix-cookbook\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp" -$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command) - -mv "$@.tmp" "$@" + -cp "$@.tmp" "$@" -$(srcdir)/%D%/contributing.%.texi: po/doc/guix-manual.%.po guix/build/po.go - -$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/contributing.texi" -p "$<" -l "$@.tmp" +$(srcdir)/%D%/contributing.%.texi: po/doc/guix-manual.%.po \ + $(srcdir)/%D%/contributing.%.texi.tmp \ + guix/build/po.go -$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command) - -mv "$@.tmp" "$@" + -cp "$@.tmp" "$@" %D%/os-config-%.texi: gnu/system/examples/%.tmpl $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ diff --git a/po/doc/local.mk b/po/doc/local.mk index 49258cbb97c..eacd7d8c922 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2018 Julien Lepiller # Copyright © 2021 Maxim Cournoyer +# Copyright © 2023 gemmaro # # This file is part of GNU Guix. # @@ -17,38 +18,28 @@ # You should have received a copy of the GNU General Public License # along with GNU Guix. If not, see . -DOC_PO_FILES = \ - %D%/guix-manual.de.po \ - %D%/guix-manual.es.po \ - %D%/guix-manual.fr.po \ - %D%/guix-manual.pt_BR.po \ - %D%/guix-manual.ru.po \ - %D%/guix-manual.zh_CN.po +DOC_POT_FILES = %D%/guix-manual.pot %D%/guix-cookbook.pot -DOC_COOKBOOK_PO_FILES = \ - %D%/guix-cookbook.de.po \ - %D%/guix-cookbook.fr.po \ - %D%/guix-cookbook.ko.po \ +DOC_PO_FILES = \ + %D%/guix-manual.de.po \ + %D%/guix-manual.es.po \ + %D%/guix-manual.fr.po \ + %D%/guix-manual.pt_BR.po \ + %D%/guix-manual.ru.po \ + %D%/guix-manual.zh_CN.po \ + %D%/guix-cookbook.de.po \ + %D%/guix-cookbook.fr.po \ + %D%/guix-cookbook.ko.po \ %D%/guix-cookbook.sk.po -EXTRA_DIST = \ - %D%/guix-manual.pot \ - %D%/guix-cookbook.pot \ - $(DOC_PO_FILES) \ - $(DOC_COOKBOOK_PO_FILES) +EXTRA_DIST = $(DOC_POT_FILES) $(DOC_PO_FILES) -POT_OPTIONS = \ - --package-name "guix manual" --package-version "$(VERSION)" \ - --copyright-holder "the authors of Guix (msgids)" \ - --msgid-bugs-address "bug-guix@gnu.org" +$(DOC_POT_FILES) &: $(srcdir)/doc/guix.texi \ + $(srcdir)/doc/guix-cookbook.texi \ + $(srcdir)/doc/contributing.texi + $(AM_V_PO4A)$(PO4A) --no-translations \ + --package-version "$(VERSION)" \ + %D%/po4a.cfg -%D%/%.pot: $(srcdir)/doc/%.texi - $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ - -p "$@" $(POT_OPTIONS) && \ - touch $@ - -%D%/guix-manual.pot: %D%/guix.pot %D%/contributing.pot - msgcat $^ > $@ - -doc-pot-update: %D%/guix-manual.pot %D%/guix-cookbook.pot +doc-pot-update: $(DOC_POT_FILES) .PHONY: doc-pot-update diff --git a/po/doc/po4a.cfg b/po/doc/po4a.cfg new file mode 100644 index 00000000000..27a7599d9aa --- /dev/null +++ b/po/doc/po4a.cfg @@ -0,0 +1,42 @@ +# GNU Guix --- Functional package management for GNU +# Copyright © 2023 gemmaro +# +# This file is part of GNU Guix. +# +# GNU Guix is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# GNU Guix is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Guix. If not, see . + +# --keep 0: produce an output even if the translation is not complete +[options] --package-name "guix manual" \ + --copyright-holder "the authors of Guix (msgids)" \ + --msgid-bugs-address "bug-guix@gnu.org" \ + --keep 0 \ + --master-charset=UTF-8 \ + --localized-charset=UTF-8 \ + --destdir=doc + +[po4a_langs] de es fr pt_BR ru zh_CN ko sk + +[po4a_paths] po/doc/$master.pot $lang:po/doc/$master.$lang.po + +[type:texinfo] doc/guix-cookbook.texi \ + $lang:guix-cookbook.$lang.texi.tmp \ + pot=guix-cookbook + +[type:texinfo] doc/guix.texi \ + $lang:guix.$lang.texi.tmp \ + pot=guix-manual + +[type:texinfo] doc/contributing.texi \ + $lang:contributing.$lang.texi.tmp \ + pot=guix-manual -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 06:37:17 2023 Received: (at 63483) by debbugs.gnu.org; 13 May 2023 10:37:17 +0000 Received: from localhost ([127.0.0.1]:36058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmcn-00052y-4c for submit@debbugs.gnu.org; Sat, 13 May 2023 06:37:17 -0400 Received: from mail-pl1-f171.google.com ([209.85.214.171]:61891) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmci-00052D-NI for 63483@debbugs.gnu.org; Sat, 13 May 2023 06:37:13 -0400 Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1ab1b79d3a7so75335065ad.3 for <63483@debbugs.gnu.org>; Sat, 13 May 2023 03:37:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683974227; x=1686566227; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Rdv2lDxmW3NGtxHGlECRTeDMJJvqZDfGNnmLOSmIr08=; b=jnHoYVaMx57eLtWsS/m0X23olg19oO+8vvcXZ5+9VowU7/3dEGMOv8JZ3phE+w926q pRPqQeD66QujNpIbYteZ6yjwHHpGRO0jdHFUxVDbV8wDoez0YcwzAl7cqBI3JS+1tEcj EofwAO7zU/RGSS85QPSzxUMrDaIUaU/R/DQ5yp9O9UQ9B0it59qXX9CR9mvpx4JHRcPE T9JiywMtwP/aOaISjcucdJmbXQOmU4hCw1pGfQGuU2yc+pqnXh5tJC3SECeXbkC6hwAj nnWsz/Tx0pjAE5QXUkA9dIDguAGUrmRe8qy8toIaZ1XS22RURAfDWHk5F0+lHgl3GkNq cCsw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683974227; x=1686566227; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Rdv2lDxmW3NGtxHGlECRTeDMJJvqZDfGNnmLOSmIr08=; b=g8ELz6/3HhMFOu7VcM4Y7SuaoLNq9K2149XqYUpwUmX8xwkaW/iquLWW+S3479C+/m kwZUB3/Yrec1HvPZJg5cwSNiDVxZUx5L9XU+gBF/j/UIE4oGG+0TI83IfLh5C+1uYWka 7djpbnrPdtiHBhO9bZvs5lsSV5RE4AIGgSwV/7bMAkG00fR3L8nos6NXHDUwIZlb46qt 3UZUtzqeahOfeghDCul3jrJ2eeXjeYBaTlqbSlndYGxSXsNuv8Stxer9k9Y/uamCjGMP c973XDL1OFHW8i0ycdv/uvtaRlcsplSp1/9G13iDB9IidY6KiQgYB71GKDswLz1hIOj+ 8aiA== X-Gm-Message-State: AC+VfDzDjAiKcB9wmTBuWe9lYSDj7I5nU9sAN5cxeaSo3UOkk+fuqLdx hL+AyPyC6XNblsWoEIUyGpVryMpsemKf5w== X-Google-Smtp-Source: ACHHUZ7HgwX8cFpJoL4l0Xa29Mqx8lVTurKbNGoAAm+webxthl347ZLwqHeIOtkFXbyCcqa2F5PlZw== X-Received: by 2002:a17:903:230e:b0:1ad:164:74ee with SMTP id d14-20020a170903230e00b001ad016474eemr15288680plh.15.1683974226982; Sat, 13 May 2023 03:37:06 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 3-20020a170902c10300b001aaed524541sm9483236pli.227.2023.05.13.03.37.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:37:06 -0700 (PDT) From: gemmaro To: 63483@debbugs.gnu.org Subject: [PATCH 3/4] self: Update po4a process. Date: Sat, 13 May 2023 19:36:15 +0900 Message-Id: <4f073db4782e3250c3988c7129938765ffe0e0ee.1683969802.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- guix/self.scm | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/guix/self.scm b/guix/self.scm index 74c953bd50e..c9fedae0ea3 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017-2022 Ludovic Courtès ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2023 gemmaro ;;; ;;; This file is part of GNU Guix. ;;; @@ -307,12 +308,14 @@ (define (translate-texi-manuals source) (ice-9 vlist) (ice-9 threads) (srfi srfi-1)) - (define (translate-tmp-texi po source output) - "Translate Texinfo file SOURCE using messages from PO, and write -the result to OUTPUT." - (invoke #+(file-append po4a "/bin/po4a-translate") - "-M" "UTF-8" "-L" "UTF-8" "-k" "0" "-f" "texinfo" - "-m" source "-p" po "-l" output)) + (define (translate-tmp-texi) + "Translate Texinfo files using messages from PO, except for cross +references." + (invoke #+(file-append po4a "/bin/po4a") + "--no-update" + (string-append "--srcdir=" #$source) + "--destdir=." + #+(file-append documentation-po "/po4a.cfg"))) (define (canonicalize-whitespace str) ;; Change whitespace (newlines, etc.) in STR to #\space. @@ -322,17 +325,11 @@ (define (translate-texi-manuals source) chr)) str)) - (define* (translate-texi prefix po lang - #:key (extras '())) - "Translate the manual for one language LANG using the PO file. -PREFIX must be the prefix of the manual, 'guix' or 'guix-cookbook'. EXTRAS is -a list of extra files, such as '(\"contributing\")." - (for-each (lambda (file) - (translate-tmp-texi po (string-append file ".texi") - (string-append file "." lang - ".texi.tmp"))) - (cons prefix extras)) - + (define* (translate-texi-xrefs prefix po lang + #:key (extras '())) + "Translate cross references in the manual for one language LANG using the +PO file. PREFIX must be the prefix of the manual, 'guix' or 'guix-cookbook'. EXTRAS +is a list of extra files, such as '(\"contributing\")." (for-each (lambda (file) (let* ((texi (string-append file "." lang ".texi")) (tmp (string-append texi ".tmp"))) @@ -374,17 +371,19 @@ (define (translate-texi-manuals source) (setenv "LC_ALL" "en_US.UTF-8") (setlocale LC_ALL "en_US.UTF-8") + (translate-tmp-texi) + (n-par-for-each parallel-jobs (match-lambda ((language . po) - (translate-texi "guix" po language - #:extras '("contributing")))) + (translate-texi-xrefs "guix" po language + #:extras '("contributing")))) (available-translations "." "guix-manual")) (n-par-for-each parallel-jobs (match-lambda ((language . po) - (translate-texi "guix-cookbook" po language))) + (translate-texi-xrefs "guix-cookbook" po language))) (available-translations "." "guix-cookbook")) (for-each (lambda (file) -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Sat May 13 06:37:17 2023 Received: (at 63483) by debbugs.gnu.org; 13 May 2023 10:37:18 +0000 Received: from localhost ([127.0.0.1]:36060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmcn-000530-JF for submit@debbugs.gnu.org; Sat, 13 May 2023 06:37:17 -0400 Received: from mail-pg1-f181.google.com ([209.85.215.181]:45067) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pxmck-00052H-CH for 63483@debbugs.gnu.org; Sat, 13 May 2023 06:37:14 -0400 Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-5304d0d1eddso2809855a12.2 for <63483@debbugs.gnu.org>; Sat, 13 May 2023 03:37:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683974228; x=1686566228; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+dw+wR5FcdkjXfaeypAUhKo7BYGjqe4+AlPCcewzGVI=; b=RXGap5o3/H57zh1moYJ/am3xtJQGgPj/tcUP3OqYXsEmEHOiYFAapRUyDyPfnhwvUT H9Gq/Unms5fjtpLOyUbaxsTV2pLNb6Yqohqmn4Gn62LjPtiXd7UBLwSyxaXb5NFMj9Yl M776IQ5pXc0lAPvky1Xq/xwcr0G8thyWVFSSgS7lJtxsI8DwVo/tmLIvX/TRHasGgaVf 9q7lK+jhJX+99s9oByRVkTW/4SPdqDgecepUxrySLM5uB5uZer7nX5Z42WrLdquvEgXa NIwhajLh9IzWVDDYFY8Wukld7U8cflJtOKFZ9CXZmGdNg6MwyeBLpwrr+xCnmlqFxf6F yMjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683974228; x=1686566228; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+dw+wR5FcdkjXfaeypAUhKo7BYGjqe4+AlPCcewzGVI=; b=iwcw69hfsFDUZTBlyOZiD5firuxg/2duGs8B9zina1f/lVHRrK47119MypkdB+SjJx /vI5stvyWNFaOlGedHINbxdMBr83GqY66vGC5S10iW/+0aH1fX4CbtznhhMEXR01Z/N6 4QP9b9+P6f6mkwjClc38uv/wEB44v37flKS33AlxQaiEgJNyojhFXkAcmpXmGLtrdeDn PnEMnytra4Fm1I9hYO776Pc8ctg8QhowCiimpYAXa5tlSQP4Q1Si597erSw43XnkTaLx MDGcTVXUwXRGhchFe6ASz3IO260MN9Rsiut+dvNZor8A+QlLhqvpM4U3jRbDxictLVcV y5wg== X-Gm-Message-State: AC+VfDwU2fVehfA7oKeACzh4DLbZekzmdQ3+INT8A8O1LefluqhEiCrf 4Rsl0Ikz77RmRKSJBnz/zon5EOxSUqv0UQ== X-Google-Smtp-Source: ACHHUZ5K+YQ1W5rOGbOodGDNe2X0gezq2L4IGISnP8OUU659CoHgL+CH8LZycwXLYr2ohPK/jYhufA== X-Received: by 2002:a17:902:ec8c:b0:1ac:3d1c:83c9 with SMTP id x12-20020a170902ec8c00b001ac3d1c83c9mr37540185plg.13.1683974228644; Sat, 13 May 2023 03:37:08 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id 3-20020a170902c10300b001aaed524541sm9483236pli.227.2023.05.13.03.37.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 03:37:08 -0700 (PDT) From: gemmaro To: 63483@debbugs.gnu.org Subject: [PATCH 4/4] doc: Update documentation about translation languages. Date: Sat, 13 May 2023 19:36:16 +0900 Message-Id: <73f5f10031a59733dbb450627c61b16983b5cfc5.1683969802.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --- doc/contributing.texi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/contributing.texi b/doc/contributing.texi index 7bf350ee0dc..4c76641d7cc 100644 --- a/doc/contributing.texi +++ b/doc/contributing.texi @@ -2270,15 +2270,15 @@ Translating Guix @item New po files for the @code{documentation-manual} component must be registered by adding the file name to @code{DOC_PO_FILES} in @file{po/doc/local.mk}, the generated @file{%D%/guix.xx.texi} manual to - @code{info_TEXINFOS} in @file{doc/local.mk} and the generated - @file{%D%/guix.xx.texi} and @file{%D%/contributing.xx.texi} to - @code{TRANSLATED_INFO} also in @file{doc/local.mk}. + @code{TRANSLATED_INFO_TEXINFOS} in @file{doc/local.mk}, the generated + @file{%D%/contributing.xx.texi} to @code{TRANSLATED_GUIX_TEXINFOS} also + in @file{doc/local.mk}, and @code{po4a_langs} section in + @file{po/doc/po4a.cfg}. @item New po files for the @code{documentation-cookbook} component must be - registered by adding the file name to @code{DOC_COOKBOOK_PO_FILES} in + registered by adding the file name to @code{DOC_PO_FILES} in @file{po/doc/local.mk}, the generated @file{%D%/guix-cookbook.xx.texi} - manual to @code{info_TEXINFOS} in @file{doc/local.mk} and the generated - @file{%D%/guix-cookbook.xx.texi} to @code{TRANSLATED_INFO} also - in @file{doc/local.mk}. + manual to @code{TRANSLATED_INFO_TEXINFOS} in @file{doc/local.mk}, and + @code{po4a_langs} section in @file{po/doc/po4a.cfg}. @item New po files for the @code{website} component must be added to the @code{guix-artwork} repository, in @file{website/po/}. @file{website/po/LINGUAS} and @file{website/po/ietf-tags.scm} must -- 2.39.2 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 01 08:49:37 2023 Received: (at 63483) by debbugs.gnu.org; 1 Sep 2023 12:49:37 +0000 Received: from localhost ([127.0.0.1]:60038 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc3ai-000225-V6 for submit@debbugs.gnu.org; Fri, 01 Sep 2023 08:49:37 -0400 Received: from mail-qv1-xf30.google.com ([2607:f8b0:4864:20::f30]:54751) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qc3ag-00021k-Ao; Fri, 01 Sep 2023 08:49:34 -0400 Received: by mail-qv1-xf30.google.com with SMTP id 6a1803df08f44-649921ec030so9936036d6.1; Fri, 01 Sep 2023 05:49:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693572559; x=1694177359; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=V4Dzm/AebLWoLtKqlVFYAaqRAJ6oDVHuIvO5wigj1FQ=; b=JqOYAUq0GWGxekgwH7dTM/n4Aq6ECibkfCVGxiC8WXWqpWUyFynWekt2AIcy5nPmmH ZWBdm7wZIRIQpEzgWfoBz+OujdronG4CC4KOfGpDW9xgnGBg+bfARgazm9uSaaiGqWF1 qJZH1qOJBm881L4OPaoE82KvCftC5YUz69hYYLDOlDbixa3W+dHQnsB49heE5mfGJ+jC /J/HJNWFK4/qhq6dKw65SJR5YhLw8yc0I0uPgqh/2xyGWSJIgOto/7VNiM+DJB1gJTwd hvOuhRRA1QiT8wwAuo5Rx7BsKlgek4r3AaftQLt9CzAdsW43eWYTtWay3V3vdsnA4HvC KhyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693572559; x=1694177359; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=V4Dzm/AebLWoLtKqlVFYAaqRAJ6oDVHuIvO5wigj1FQ=; b=BD/DLbn7cR+Z8H3kBrzFGCcTVlZbVPr1oxvcYVOkTkVmIgcEHKepQUI0jyUvvZqFkH 98abHCWtmzfW58F8/OIswlNs31AIc+iwstEsvaOuueba80waIEkmEstIzwSJF9rDsATo 3WaKQI7UC7eups/7+N0H1bKu7Rgbvv52vgxErYqEE4xHDAhNCGGi3aKNjloTSTgzvVfq VC10bAWmeb8D+ddF7gSMink36h5aH4/PSKStqXjudJA13NbwPbUeY6/HVu5ZqHGZv6gL MjyWj+KCbcVLdnkZDBSOU2WfG5ueewaRPbNQdjqSVwH1YVPKN+lesNtgxnVrWp9xEqxv v/Rg== X-Gm-Message-State: AOJu0YzGr8hNZDkRl5hegJY8k6BrMAkdpjm+5XUiGzTZ8mOiqc5ClCK4 2TFt6qjPDi7kgNpt1/TG9ryqRoI4Dx3gsw== X-Google-Smtp-Source: AGHT+IFqPCPTkoYA/223eClvernOLHPu/G9J7a9vEXjf9kyzVVorAQQR3LLe5HcY5eOYaiMn73v/nw== X-Received: by 2002:a05:6214:3d09:b0:651:67bd:7501 with SMTP id ol9-20020a0562143d0900b0065167bd7501mr2057527qvb.37.1693572559250; Fri, 01 Sep 2023 05:49:19 -0700 (PDT) Received: from hurd (dsl-154-228.b2b2c.ca. [66.158.154.228]) by smtp.gmail.com with ESMTPSA id q18-20020a0cf5d2000000b0064743dd0633sm1403227qvm.106.2023.09.01.05.49.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Sep 2023 05:49:18 -0700 (PDT) From: Maxim Cournoyer To: gemmaro Subject: Re: bug#63483: [PATCH 0/4] build: Update po4a process. References: <73f5f10031a59733dbb450627c61b16983b5cfc5.1683969802.git.gemmaro.dev@gmail.com> Date: Fri, 01 Sep 2023 08:49:17 -0400 In-Reply-To: <73f5f10031a59733dbb450627c61b16983b5cfc5.1683969802.git.gemmaro.dev@gmail.com> (gemmaro's message of "Sat, 13 May 2023 19:36:16 +0900") Message-ID: <87sf7y3voy.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: GNU Debbugs , 63483@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 63483 + moreinfo quit Hi gemmaro, Thanks for doing this! I have surveyed the series, and I'll need to dive into the details to see if everything adds up, but it looks good! We include a GNU ChangeLog in our git commit messages, as mentioned in info '(guix) Submitting Patches'. There's a cross-reference to 'info (standards)Change Logs', which is made available upon installing the 'standards' Guix package (and 'info-reader'). This changelog should be a high level description of the changes, which is handy when reviewing. I hope this helps! I hope to see a v2 soon :-) -- Thanks, Maxim From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 03:20:11 2024 Received: (at 63483) by debbugs.gnu.org; 14 Apr 2024 07:20:11 +0000 Received: from localhost ([127.0.0.1]:34173 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9j-0003js-11 for submit@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:10 -0400 Received: from mail-pg1-x534.google.com ([2607:f8b0:4864:20::534]:46305) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9d-0003il-QQ for 63483@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:01 -0400 Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-5cddfe0cb64so1193897a12.0 for <63483@debbugs.gnu.org>; Sun, 14 Apr 2024 00:19:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713079181; x=1713683981; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aRGlPQe0BWXVZCvLP4+gpjQL/GJYT9TOPyDrjkOJynE=; b=mMRLEtAN0iWuCZ2KwkVW2ssXmTooxt854ndTwPOwtWyGfaX+gm18Iy9/qrYf6DbusU AR0iIhsx/imQYcoc39EtWJR/WOqTMAKSRl3UbM5JfDueAEOdTVjwWh5YRsxUfH79bGME 79NINzZL6m/qmpsYq1Rkh6zNSfE1FPU8m8n575puq0naNq28nW3qicHHV9i/4xd/soSh y1tg0Nhqo3q6GpMNxz5JZLBTUbaZTu6nss5puZ5NOfkHf0XrzzwZ5QCW7M3lD0qqi+0+ /SiJxXh0kPGOD377MpjDyHqhrIkXLuNVdq6hdpCyillpsJEV1CazCb+HKCCgQkqPnV3y Ic7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713079181; x=1713683981; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aRGlPQe0BWXVZCvLP4+gpjQL/GJYT9TOPyDrjkOJynE=; b=nWVBqmdgtLjtoe749kFEEQgdzWGzcbe5DvpKayIead1CSI/VeRqcRjdFnKoRSNJX14 +pndSTPl0GLKVXuCnuv6PblNrpdn3AUMokzdOQ72ru0OSiToWlGeEdAHvtKi3gX1N/AR Pp2BqcswxBXEOO8Owya72cfxmu/e+/uFbSMkBbw5+S3IWxqFpMh+wBmG18kGNid69BAu ObfIsLS/+Q2QRjPN/eMsXMkPSuWv+n7CWCVuhGAVCU+TX19WsG8sbkPSCIrZwFuufXBK up/cjKy9z7Y/9pTPQMr4NGrPuT4cZCzJon5HFgCYZw/f/ZmFu3/Yqq+ZrxJ/iPGTVah2 q5yg== X-Gm-Message-State: AOJu0YwOAsWBYG06b9T5q6b1hIe73vpJbm9fPBgso0nQRF/o172/v1df sUtGE25CfwroURaSdwG1a38+uho9g5Cwg6PzA9OySURIAy9A1KCRRsfG5g== X-Google-Smtp-Source: AGHT+IGeRaMSZyBvqw7LGLhx+YVABF3sOVYO9wNoxSbBY1CpmgZHrncMo859YMknTEg4/bdD8/wW3A== X-Received: by 2002:a17:902:c94b:b0:1e4:54d1:a159 with SMTP id i11-20020a170902c94b00b001e454d1a159mr7190111pla.47.1713079180941; Sun, 14 Apr 2024 00:19:40 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id j14-20020a170902da8e00b001e2bbc0a66fsm5557125plx.234.2024.04.14.00.19.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 00:19:40 -0700 (PDT) From: gemmaro To: 63483@debbugs.gnu.org Subject: [PATCH v2 1/4] build: Align the Automake status lines of the po4a and the PO xref. Date: Sun, 14 Apr 2024 16:18:50 +0900 Message-ID: <57afeead3bff93c5343e327126656d64da236002.1713073114.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * Makefile.am (AM_V_PO4A_0, AM_V_POXREF_0): Align the Automake status lines of the po4a and the PO xref, since the common width is 10 characters. Change-Id: Ic8c32f73294ba6e4ca71ab4aa889a558e4d7fcee --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 1c5688ac13..faf16defc9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # Copyright © 2021 Andrew Tropin # Copyright © 2023 Clément Lassieur # Copyright © 2023, 2024 Wilko Meyer +# Copyright © 2024 gemmaro # # This file is part of GNU Guix. # @@ -1263,8 +1264,8 @@ AM_V_HELP2MAN_0 = @echo " HELP2MAN" $@; AM_V_PO4A = $(AM_V_PO4A_$(V)) AM_V_PO4A_ = $(AM_V_PO4A_$(AM_DEFAULT_VERBOSITY)) -AM_V_PO4A_0 = @echo " PO4A" $@; +AM_V_PO4A_0 = @echo " PO4A " $@; AM_V_POXREF = $(AM_V_POXREF_$(V)) AM_V_POXREF_ = $(AM_V_POXREF_$(AM_DEFAULT_VERBOSITY)) -AM_V_POXREF_0 = @echo " POXREF" $@; +AM_V_POXREF_0 = @echo " POXREF " $@; -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 03:20:20 2024 Received: (at 63483) by debbugs.gnu.org; 14 Apr 2024 07:20:21 +0000 Received: from localhost ([127.0.0.1]:34176 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9x-0003n2-1R for submit@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:20 -0400 Received: from mail-pg1-x533.google.com ([2607:f8b0:4864:20::533]:61786) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9f-0003j4-Hb for 63483@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:03 -0400 Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-5f415fd71f8so1777168a12.3 for <63483@debbugs.gnu.org>; Sun, 14 Apr 2024 00:19:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713079183; x=1713683983; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SBcSmfwkGbuOcJPXkSCYDDqAXHpiRLthjwUUYhpEO8Q=; b=FY360oOyX+BHiEtmuONLnXYXlX2sGRm5V0k04zSEqpf8ntRUUlPpluWLD3MZnqYjME MJAOl0/fHfW6rTlR2EezjVum/Ca499kdv2xswx0DZsMgH/pn7twW+Dlc+yIAH83FPlXl CUiS5PDsK199ERu2vUGsMmNQEy3RNRZkhZ5loxUX7L+xvGk4mvvVlRrzm4mq7PIG6yWe u04XVWBtcwtAQuiaG+ZMcRUYl5XgcVeLWTHtUvdWhOyMO1moNlDneoad5HJgOaXG+6h6 /8+DfwAZg2/kHw0fQtrD8DV7TbXgAdGIKxsrLqGvUPJFjkFDbq2fMkFoeF89BOmR4Hjy nA9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713079183; x=1713683983; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SBcSmfwkGbuOcJPXkSCYDDqAXHpiRLthjwUUYhpEO8Q=; b=AJFCwBOD011/HhZXiXPkRXRfIa9qTD7IZm98RDlYxNniF1fx9kRoXpTPEIc24YUJzh wFWf4mmjV4+r+kLdDV9pbW+ZbGJvik0Ii/Q0W7aoShNCke7Cb8gEbb573JhF62E8/2up ouHiWaTZEVTD7iofZeRMU4+mrzkGo6ko43Zq8VdU0OsZlK48HLrER1gLloukS1X/SCuD YqvIxEaJPgHZUogmbJRnABktqIrUFRKT0ZLV7nfGTp942NEd8d5oNWpixvG4TbewKF/H 40gg9NxOaK9+V1S4xtfeBXMHit7oU8znMpAH0Nx5EtYRxyQCz025UEds+Bdq+wUREtLL mmNw== X-Gm-Message-State: AOJu0YwKDtuBQGoyImT1BNN5x6UuLw+QuPwmjH0gAi66SAzAsLqVzhmW PSO67W3z1jnpq+ScTAybYOKWK9ptEcXA0G3nZuR9N05U+ilTb1jjUJOokw== X-Google-Smtp-Source: AGHT+IHPsHgECx9EOnlbipL2/mK6y4ASw0O3ju53i+lDrPmQy20JVCQZBq0fgliqzVDO66aud3XtUQ== X-Received: by 2002:a17:902:6f16:b0:1e5:3c5:55a5 with SMTP id w22-20020a1709026f1600b001e503c555a5mr5441563plk.8.1713079182780; Sun, 14 Apr 2024 00:19:42 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id j14-20020a170902da8e00b001e2bbc0a66fsm5557125plx.234.2024.04.14.00.19.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 00:19:42 -0700 (PDT) From: gemmaro To: 63483@debbugs.gnu.org Subject: [PATCH v2 2/4] build: Update the POT creation task with the po4a command. Date: Sun, 14 Apr 2024 16:18:51 +0900 Message-ID: <1fc791a888ce4bc45b6dabf0b7274b31fc0198c8.1713073114.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Florian Pelz , Julien Lepiller Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * configure.ac (Documentation translation): Add the po4a program and remove the po4a-updatepo program. The PO4A defined here can be used in Makefiles (e.g. po/doc/local.mk below). The po4a command integrates the functionality of po4a-updatepo and is currently recommended for use [1]. The po4a-updatepo command has been replaced by the po4a command and are not used from anywhere. * po/doc/local.mk (%D%/%.pot): Use a po4a command instead of the po4a-updatepo for the POT generation. This eliminates the warning of po4a-updatepo; "po4a-updatepo is deprecated. The unified po4a(1) program is more convenient and less error prone." Here, the file paths are passed using variables. This is because the po4a command needs to be executed for each language and each file. Dummy values are passed for those that are not needed to update the POT file. * po/doc/po4a.cfg: Add a po4a config file for the POT generation. The po4a command requires a configulation file. [1] https://po4a.org/man/man7/po4a.7.php.en#lbAS Change-Id: Ica39a0d1f77b6a64d37c592ac2e693319443d3c5 --- configure.ac | 2 +- po/doc/local.mk | 10 ++++++++-- po/doc/po4a.cfg | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 po/doc/po4a.cfg diff --git a/configure.ac b/configure.ac index ecbd596a34..68542f0348 100644 --- a/configure.ac +++ b/configure.ac @@ -262,8 +262,8 @@ dnl Manual pages. AM_MISSING_PROG([HELP2MAN], [help2man]) dnl Documentation translation. +AM_MISSING_PROG([PO4A], [po4a]) AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate]) -AM_MISSING_PROG([PO4A_UPDATEPO], [po4a-updatepo]) case "$storedir" in /gnu/store) diff --git a/po/doc/local.mk b/po/doc/local.mk index dd6ba30133..8a78fb23f8 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -1,6 +1,7 @@ # GNU Guix --- Functional package management for GNU # Copyright © 2018 Julien Lepiller # Copyright © 2021 Maxim Cournoyer +# Copyright © 2024 gemmaro # # This file is part of GNU Guix. # @@ -44,8 +45,13 @@ POT_OPTIONS = \ --msgid-bugs-address "bug-guix@gnu.org" %D%/%.pot: $(srcdir)/doc/%.texi - $(AM_V_PO4A)$(PO4A_UPDATEPO) -M UTF-8 -f texinfo -m "$<" \ - -p "$@" $(POT_OPTIONS) && \ + $(AM_V_PO4A)$(PO4A) --no-translations -M UTF-8 \ + --package-version "$(VERSION)" \ + --variable master="$<" \ + --variable pot="$@" \ + --variable po=/dev/null \ + --variable localized=/dev/null \ + $(POT_OPTIONS) %D%/po4a.cfg touch $@ %D%/guix-manual.pot: %D%/guix.pot %D%/contributing.pot diff --git a/po/doc/po4a.cfg b/po/doc/po4a.cfg new file mode 100644 index 0000000000..7d2ef71773 --- /dev/null +++ b/po/doc/po4a.cfg @@ -0,0 +1,32 @@ +# GNU Guix --- Functional package management for GNU +# Copyright © 2024 gemmaro +# +# This file is part of GNU Guix. +# +# GNU Guix is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or (at +# your option) any later version. +# +# GNU Guix is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GNU Guix. If not, see . + +# "--keep 0": produce an output even if the translation is not complete +[options] \ + --package-name "guix manual" \ + --copyright-holder "the authors of Guix (msgids)" \ + --msgid-bugs-address "bug-guix@gnu.org" \ + --master-charset UTF-8 \ + --localized-charset UTF-8 \ + --keep 0 + +[po4a_langs] de es fr pt_BR ru zh_CN ko sk + +[po4a_paths] $(pot) $lang:$(po) + +[type:texinfo] $(master) $lang:$(localized) -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 03:20:24 2024 Received: (at 63483) by debbugs.gnu.org; 14 Apr 2024 07:20:25 +0000 Received: from localhost ([127.0.0.1]:34178 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvuA0-0003nY-Gm for submit@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:24 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:61629) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9h-0003j8-EF for 63483@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:03 -0400 Received: by mail-pg1-x532.google.com with SMTP id 41be03b00d2f7-53fa455cd94so1819455a12.2 for <63483@debbugs.gnu.org>; Sun, 14 Apr 2024 00:19:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713079185; x=1713683985; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=EzEwjl5DtDs5dK2gddRO7Hc/6OcfrHGdWlJAsPfYOd8=; b=C9q0E9u18cwX88553+m2+Db8GCXs8rTmOo8i7GcaUqUCRCWgej527MbXlE5O/gfmXl j9pt3DNSomzwFm1l6erbOecLj9f5lAbEBf7f+zgP/pBA3DNpWi7VcRYa9WBM8oMPPAFn DwooCnUwWeLrsPLBTue0hBqU0291ESHzzFjw58Rh/wHLnwoEmZFAs9BQH0U4Unl9dzbT sebcUd8YsWW2k7Oaw6jFDQu3T1Ll79ToezSdSuzyYwDam4cd8QWJCTvoYvt9aOectZEm Mmv0xNfSQWoltuhptm8R1VJBKGUdxz9/nAs3qkGxj3wzzHWKYRK8b604Klqq9it9cLbv IodQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713079185; x=1713683985; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EzEwjl5DtDs5dK2gddRO7Hc/6OcfrHGdWlJAsPfYOd8=; b=MY70GeGvA7dYa58h3Zo/CWHvwxH5XxzVufwc31J5fDmXr2iXtggug1KrHZclWTIVfr 59XXHdTT4Jj5o4+HSQNQ+g4D/fHxj097ICJYrOtMoKtBy4bIno4BFZQZW9qH0iGYz8W2 zbpbIrRgWGkwRdO9ux6BsJDhi2lufeDRng/setctAU6ADwA7bSGQUbcxgtE/gEhxgdBX uc+3ewgMaqD48V3iI69gFZde+oILdbTR301CcNVNjkP01W0V2oOtoRyOBcim5IPoZgM5 vm/dXEEBiJw7eeMaSfnxYP1IL41PChu8eWFjC6iMBqXAhsF5F+k94tPUEk9y80g3tqfs UcCA== X-Gm-Message-State: AOJu0Yx3JiSWE2MJtrTtUgH9T5MTz8Yut+Uw54hkulVtl0LZzQXPBcot ELiJVnJwVDu2gTIdBpfVksmGpL9Kqg5GkUwDTpwav7AcnfNqwzeN24ZOEg== X-Google-Smtp-Source: AGHT+IEAJq2HOUerGmxI3HJOLM/BXxlF3e9TbjhKTqPaY/DzVwkaZ9KzXkw40EqIMK1c6Y/4at5F/Q== X-Received: by 2002:a17:902:b906:b0:1e3:e256:44e0 with SMTP id bf6-20020a170902b90600b001e3e25644e0mr5396099plb.31.1713079184631; Sun, 14 Apr 2024 00:19:44 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id j14-20020a170902da8e00b001e2bbc0a66fsm5557125plx.234.2024.04.14.00.19.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 00:19:44 -0700 (PDT) From: gemmaro To: 63483@debbugs.gnu.org Subject: [PATCH v2 3/4] build: Use the po4a command for the translation generation. Date: Sun, 14 Apr 2024 16:18:52 +0900 Message-ID: <1c856bb1f6ec8a648775a919f360d3ec878b6575.1713073114.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Florian Pelz , Julien Lepiller Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * configure.ac (Documentation translation): Remove the po4a-translate command. This command has been replaced by the po4a command and are not used from anywhere. * doc/local.mk ($(srcdir)/%D%/guix.%.texi, $(srcdir)/%D%/guix-cookbook.%.texi) ($(srcdir)/%D%/contributing.%.texi): Use the po4a command instead of the po4a-translate for the translation generation. This eliminates the warning of po4a-translate; "po4a-translate is deprecated. The unified po4a(1) program is more convenient and less error prone." (PO4A_PARAMS): Remove the Texinfo format option. This option is specified in the configuration file (po/doc/po4a.cfg). (dummy_pot): Add a variable for the temporary POT file location. Change-Id: I542b934c3c03b8701e9f86823191224f8b0ccf81 --- configure.ac | 1 - doc/local.mk | 30 +++++++++++++++++++++++------- po/doc/local.mk | 5 ----- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 68542f0348..ad148f33b6 100644 --- a/configure.ac +++ b/configure.ac @@ -263,7 +263,6 @@ AM_MISSING_PROG([HELP2MAN], [help2man]) dnl Documentation translation. AM_MISSING_PROG([PO4A], [po4a]) -AM_MISSING_PROG([PO4A_TRANSLATE], [po4a-translate]) case "$storedir" in /gnu/store) diff --git a/doc/local.mk b/doc/local.mk index 8df003b891..a6234b2e3e 100644 --- a/doc/local.mk +++ b/doc/local.mk @@ -5,6 +5,7 @@ # Copyright © 2016 Taylan Ulrich Bayırlı/Kammer # Copyright © 2016, 2018 Mathieu Lirzin # Copyright © 2018, 2021 Julien Lepiller +# Copyright © 2024 gemmaro # # This file is part of GNU Guix. # @@ -87,10 +88,6 @@ BUILT_SOURCES += $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) EXTRA_DIST += $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) MAINTAINERCLEANFILES = $(OS_CONFIG_EXAMPLES_TEXI) $(TRANSLATED_INFO) -PO4A_PARAMS := -M UTF-8 -L UTF-8 #master and localized encoding -PO4A_PARAMS += -k 0 # produce an output even if the translation is not complete -PO4A_PARAMS += -f texinfo # texinfo format - # When a change to guix.texi occurs, it is not translated immediately. # Because @pxref and @xref commands are references to sections by name, they # should be translated. If a modification adds a reference to a section, this @@ -102,20 +99,39 @@ $(top_srcdir)/pre-inst-env $(GUILE) --no-auto-compile \ $@.tmp $< endef +# If /dev/null is used for this POT file path, a warning will be issued +# because the path extension is not 'pot'. +dummy_pot = $(shell mktemp --suffix=.pot) + $(srcdir)/%D%/guix.%.texi: po/doc/guix-manual.%.po $(srcdir)/%D%/contributing.%.texi guix/build/po.go - -$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/guix.texi" -p "$<" -l "$@.tmp" + -$(AM_V_PO4A)$(PO4A) --no-update \ + --variable localized="$@.tmp" \ + --variable master="%D%/guix.texi" \ + --variable po="$<" \ + --variable pot=$(dummy_pot) \ + po/doc/po4a.cfg -sed -i "s|guix\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp" -$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command) -mv "$@.tmp" "$@" $(srcdir)/%D%/guix-cookbook.%.texi: po/doc/guix-cookbook.%.po guix/build/po.go - -$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/guix-cookbook.texi" -p "$<" -l "$@.tmp" + -$(AM_V_PO4A)$(PO4A) --no-update \ + --variable localized="$@.tmp" \ + --variable master="%D%/guix-cookbook.texi" \ + --variable po="$<" \ + --variable pot=$(dummy_pot) \ + po/doc/po4a.cfg -sed -i "s|guix-cookbook\.info|$$(basename "$@" | sed 's|texi$$|info|')|" "$@.tmp" -$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command) -mv "$@.tmp" "$@" $(srcdir)/%D%/contributing.%.texi: po/doc/guix-manual.%.po guix/build/po.go - -$(AM_V_PO4A)$(PO4A_TRANSLATE) $(PO4A_PARAMS) -m "%D%/contributing.texi" -p "$<" -l "$@.tmp" + -$(AM_V_PO4A)$(PO4A) --no-update \ + --variable localized="$@.tmp" \ + --variable master="%D%/contributing.texi" \ + --variable po="$<" \ + --variable pot=$(dummy_pot) \ + po/doc/po4a.cfg -$(AM_V_POXREF)LC_ALL=en_US.UTF-8 $(xref_command) -mv "$@.tmp" "$@" diff --git a/po/doc/local.mk b/po/doc/local.mk index 8a78fb23f8..a1f1875623 100644 --- a/po/doc/local.mk +++ b/po/doc/local.mk @@ -39,11 +39,6 @@ EXTRA_DIST = \ $(DOC_PO_FILES) \ $(DOC_COOKBOOK_PO_FILES) -POT_OPTIONS = \ - --package-name "guix manual" --package-version "$(VERSION)" \ - --copyright-holder "the authors of Guix (msgids)" \ - --msgid-bugs-address "bug-guix@gnu.org" - %D%/%.pot: $(srcdir)/doc/%.texi $(AM_V_PO4A)$(PO4A) --no-translations -M UTF-8 \ --package-version "$(VERSION)" \ -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 03:20:27 2024 Received: (at 63483) by debbugs.gnu.org; 14 Apr 2024 07:20:27 +0000 Received: from localhost ([127.0.0.1]:34180 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvuA4-0003oL-9J for submit@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:27 -0400 Received: from mail-pl1-x635.google.com ([2607:f8b0:4864:20::635]:59702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9g-0003j7-Kd for 63483@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:04 -0400 Received: by mail-pl1-x635.google.com with SMTP id d9443c01a7336-1e65a1370b7so688375ad.3 for <63483@debbugs.gnu.org>; Sun, 14 Apr 2024 00:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713079184; x=1713683984; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=996edB7RYe7j3cciNqGDR6z3kBuz4TRFtlTArBkUk4o=; b=TnwdmAC8VwOpNqg3VXtQcmiMpxjN4erHT4ctt6xm1qclQ2edSO8hwVdBEH1FZVqBts GEnzh1wfQHXOGKRywZKz4viIvoHPn3lesN49CKqkzeU8EVKPn1gISJIYpX+MaxJpwvd4 qmcPXKZt6rBhmDuKGXT7JtnN+D9Amgkf1b4LQ6Zj93mE5EQtPDC74EdohxsBX6rVekYS D3X6KpJGhB9VS22uaGX/yXdw7gDYSNRVBOVwCk8y8puAhZu4d1k7pzWZLIqyOIgoTUpM vxe9FWiE+Mpr8Xklw9bNKire10y5oYdaLohPj/aMb9s9S/pFVkgEcnw+9R88k41PMp3z ArMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713079184; x=1713683984; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=996edB7RYe7j3cciNqGDR6z3kBuz4TRFtlTArBkUk4o=; b=py/ePJVQem4Zj8WURb0dHtNNC/yDkczsgM/ZT+1z2eAiqLaoG6NYrW8ukWZiMk6Ji2 6MFumVZPzf6aSZ8kha3ariupF+QjQgmDw4qdfFtaSy/wHvwou48VJuYA8wu3dF3c8Agy Lub/STnp6F1aXXlM5bnItTSqcxaLhcXIdpdVtbzuoufgXTdL8FTr6N9/0gDZ7f468X62 iHCco61QMvu3sckZIexBcKhPaSbBIIyA0x2VS6JaI+0AWY2VSCEHqt7U4Rc9hROsyNzb 17vLxz/k4p82TRYsQ4Q4p7wI4FtSK5EL93n/Hyy+i2luOPvsSsh2RuYY/8g+Hpeuqwrj BQsg== X-Gm-Message-State: AOJu0YzkWqJZPXQYF+C4hxzJfkUcywFA59yp7uL3DT8wdpRJtdbKCyUP qUXbOjzo6TDrAffFLKRibopcC8SUnYkHGi/DmoF7vuyJHpq8jgOGTiPAVg== X-Google-Smtp-Source: AGHT+IE8pNWj7HHcDOgbUqgtvEdtdsEvMm8nGPpe6KQfHE5o62n30dweHtTn56avmFm2wgaYCNWbxA== X-Received: by 2002:a17:902:c40a:b0:1e4:24cc:e025 with SMTP id k10-20020a170902c40a00b001e424cce025mr10066801plk.59.1713079179089; Sun, 14 Apr 2024 00:19:39 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id j14-20020a170902da8e00b001e2bbc0a66fsm5557125plx.234.2024.04.14.00.19.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 00:19:38 -0700 (PDT) From: gemmaro To: 63483@debbugs.gnu.org Subject: [PATCH v2 0/4] build: Update po4a process. Date: Sun, 14 Apr 2024 16:18:49 +0900 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello, Maxim Cournoyer writes: > tags 63483 + moreinfo > quit > > Hi gemmaro, > > Thanks for doing this! > > I have surveyed the series, and I'll need to dive into the details to > see if everything adds up, but it looks good! > > We include a GNU ChangeLog in our git commit messages, as mentioned in > info '(guix) Submitting Patches'. There's a cross-reference to 'info > (standards)Change Logs', which is made available upon installing the > 'standards' Guix package (and 'info-reader'). This changelog should be > a high level description of the changes, which is handy when reviewing. > > I hope this helps! I hope to see a v2 soon :-) > > -- > Thanks, > Maxim Thank you for your response. I read the chapter on Change Logs and rewrote it to tried to make it more descriptive and more purposeful. To recap, the goal of this change is to eliminate the po4a warning ("po4a-{updatepo,translate} is deprecated. The unified po4a(1) program is more convenient and less error prone."). I checked it works by running "make" and "make as-derivation". The location of the PO files is not changed, so Weblate can continue to be used as is. Several things have changed since revision 1. Firstly, I have broken down the process and tried to write better commit messages and comments to make the changes easier to grasp. Secondly, I used po4a in batches in revision 1, but this may not be suitable for the use case for Guix, so I left as is. If it is the case to run po4a in batches, the change might be similar to the revision 1. However, there are the following concerns. Because of these and the aim here to clear po4a warnings, I don't use po4a in bulk. 1) It may take more time to process the translations. Combining them in one configuration file increases the number of target files to be handled. 2) The Makefiles (doc/local.mk and po/doc/local.mk) become more complex, since a single run of po4a will update multiple files. 3) PO files will need to be addressed. Currently two are covered - manuals and cookbooks - but the merging of gettext entries will cause conflicts if there are different translations (msgstr) for the same source text (msgid). I also think that the configuration of Weblate will then need to be changed[3] simultaneously. 4) There would be some new almost empty PO files generated. I noticed that the similar change[1] has been proposed. It is possible that action will be taken on the po4a side, but in the meantime we may encounter problems that were not addressed in po4a-{updatepo,translate} [2]. [1] [PATCH] gnu: Replace deprecated po4a-* calls with po4a, https://issues.guix.gnu.org/70042 [2] Why are the individual scripts deprecated?, https://po4a.org/man/man7/po4a.7.php.en [3] Translation projects / Allow translation propagation, https://docs.weblate.org/en/latest/admin/projects.html#allow-translation-propagation Regards, gemmaro. gemmaro (4): build: Align the Automake status lines of the po4a and the PO xref. build: Update the POT creation task with the po4a command. build: Use the po4a command for the translation generation. self: Use po4a instead of po4a-translate. Makefile.am | 5 +++-- configure.ac | 3 +-- doc/local.mk | 30 +++++++++++++++++++++++------- guix/self.scm | 12 +++++++++--- po/doc/local.mk | 15 ++++++++------- po/doc/po4a.cfg | 32 ++++++++++++++++++++++++++++++++ 6 files changed, 76 insertions(+), 21 deletions(-) create mode 100644 po/doc/po4a.cfg base-commit: 51de844a0ff6ea224367a384092896bce6848b9f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 14 03:20:28 2024 Received: (at 63483) by debbugs.gnu.org; 14 Apr 2024 07:20:29 +0000 Received: from localhost ([127.0.0.1]:34182 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvuA7-0003p8-GP for submit@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:28 -0400 Received: from mail-oo1-xc36.google.com ([2607:f8b0:4864:20::c36]:47509) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvu9j-0003jD-9s for 63483@debbugs.gnu.org; Sun, 14 Apr 2024 03:20:06 -0400 Received: by mail-oo1-xc36.google.com with SMTP id 006d021491bc7-5aa2a74c238so1708961eaf.3 for <63483@debbugs.gnu.org>; Sun, 14 Apr 2024 00:19:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713079186; x=1713683986; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9RqS2/t4WyP6w1d8wSxF/UI24jnXZRAn44RF3OIX9Vc=; b=AS139x9hhabjDVfF/52GUm89Ti+fPxbdUntAO6at55i3+KCPZtXMKDgE0lLepCQ4x7 RwfmHwrqZAQkLnfBu8OJFDJ0LfppzWQ1r842T7J3znn165R+bxdtCmvbbMNY04T9iaLj npozNlZpzvYF7URXbsLtLd3yFGgzfSHoYeJgXNGGUEUwnW4VLtnGRWuJQcSS/QJIZKOr nsC2/MqZh1Dgt7M28JKd243E7bz4wWnqvYUKEf0SyoQlYloi6/hNbvegrvfXslC5S3FA FrhBbwGBPoiziKAkMr25H5DrP7lz7h/S8QmqPyiFj2GTuzFl5d15T4ejLYh8IBnGHqRa Sz+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713079186; x=1713683986; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9RqS2/t4WyP6w1d8wSxF/UI24jnXZRAn44RF3OIX9Vc=; b=lYRTqf6px7RE0nKvxEcb0QJz71L0sP6dSpWnCkj0kFUs+mtefOGbytoZNSmWr2W/SP q6C28nWkTB0+cA3a5ckr5mlZqZeFeZpbVfHqBeDt+LGZbIWNNBWn3U2JAj57Ohd7npHP 4dtwuYMAREm+/RjaV813M2EMTA1+C43WGXOT3qRLNF3B9e2CcAuDJvYdFhAaSBF5psF3 jFAFZU2irHR3mUoDsgnqpHP7l1SFcVJFy4tBWjrZig17FY2k4SGHJPkNCi330YzJjGLr 1vXWUQoSNSp4J8XNPlgksSXClO+SPlABopUMxquYoFfNRHWQxH9CmSfD8Kx/NnCgNrNn qiuw== X-Gm-Message-State: AOJu0YyxMT02dY9Kf0sHKrhEq73UpOIzPJLtVksehnhuCLWr9IiUe1RZ YIwOqSjqy5jAysY6EGawp3E1Cs5HxithTsYI2anmUOerVGSUvTFF23s7Gg== X-Google-Smtp-Source: AGHT+IH5aN3e88yKAtQM/wufH0GJBOO32ZEeOW4c6ulDjxeAF6D/GOAaqZTCTMdJ0Gk9o61d4W0vOw== X-Received: by 2002:a05:6358:9814:b0:183:f7cb:af75 with SMTP id y20-20020a056358981400b00183f7cbaf75mr7440936rwa.32.1713079186480; Sun, 14 Apr 2024 00:19:46 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id j14-20020a170902da8e00b001e2bbc0a66fsm5557125plx.234.2024.04.14.00.19.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 14 Apr 2024 00:19:46 -0700 (PDT) From: gemmaro To: 63483@debbugs.gnu.org Subject: [PATCH v2 4/4] self: Use po4a instead of po4a-translate. Date: Sun, 14 Apr 2024 16:18:53 +0900 Message-ID: <476279958a6c834565cc23952f2cdb2451bd383e.1713073114.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-Debbugs-Cc: Christopher Baines , Josselin Poiret , Ludovic Courtès , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: gemmaro X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/self.scm (translate-tmp-texi): Use po4a instead of po4a-translate. This eliminates the po4a-translate warning; "po4a-translate is deprecated. The unified po4a(1) program is more convenient and less error prone." Change-Id: Id85c7478b1b237f31010994fcd2d38765993c1ad --- guix/self.scm | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/guix/self.scm b/guix/self.scm index 19c6d08e01..153cdec7ad 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -317,9 +317,15 @@ (define (translate-texi-manuals source) (define (translate-tmp-texi po source output) "Translate Texinfo file SOURCE using messages from PO, and write the result to OUTPUT." - (invoke #+(file-append po4a "/bin/po4a-translate") - "-M" "UTF-8" "-L" "UTF-8" "-k" "0" "-f" "texinfo" - "-m" source "-p" po "-l" output)) + (invoke #+(file-append po4a "/bin/po4a") + "--no-update" + "--variable" (string-append "localized=" output) + "--variable" (string-append "master=" source) + "--variable" (string-append "po=" po) + "--variable" (string-append "pot=" (string-append (tmpnam) ".pot")) + (string-append "--srcdir=" #$source) + "--destdir=." + #+(file-append documentation-po "/po4a.cfg"))) (define (canonicalize-whitespace str) ;; Change whitespace (newlines, etc.) in STR to #\space. -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 15 12:05:08 2024 Received: (at 63483) by debbugs.gnu.org; 15 Apr 2024 16:05:09 +0000 Received: from localhost ([127.0.0.1]:38062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwOpO-00067H-MT for submit@debbugs.gnu.org; Mon, 15 Apr 2024 12:05:08 -0400 Received: from relay.yourmailgateway.de ([188.68.63.102]:42627) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwOpI-00065C-4i for 63483@debbugs.gnu.org; Mon, 15 Apr 2024 12:05:05 -0400 Received: from mors-relay-2502.netcup.net (localhost [127.0.0.1]) by mors-relay-2502.netcup.net (Postfix) with ESMTPS id 4VJBnp66Spz62DD; Mon, 15 Apr 2024 18:04:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1713197086; bh=yQJ98sVLk4uUq8hw6Rz9oGCNnsz+R1NhXG/x/KezxgM=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=LjWWYfh4rElOy+KhchVon2jQNX8vIfr3EQtmjrpmYXHoTgKujYasI7a5rldrAFFZ2 u20ypXQUfrenlFpBuJZUvkPoZPUPdl4N4xovLBHupqLpczTSkXTYNYBca3CAhof1ez EeB9pE1hzOb/XyUx2D1bFdJ8THqNnhKpxtBrhHMDiThnNrW1auudCk52hSLlRyLzgB Ol2+Qxef1DeZwMIcbPyg6IrLBQiWc0rwbvAgS9eRNxBmjiIBfBQjWaAEP1wD2qs5cK BRxamW3HbP0O5mzHAtZlzVVntDTCTMTVOtNwLjE32RIA2qOQ23dpd6lI4iPzKB5Vt6 kdEljruTYPSKw== Received: from policy02-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-2502.netcup.net (Postfix) with ESMTPS id 4VJBnp5N2Mz4xJL; Mon, 15 Apr 2024 18:04:46 +0200 (CEST) Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy02-mors.netcup.net (Postfix) with ESMTPS id 4VJBnn44kjz8sch; Mon, 15 Apr 2024 18:04:45 +0200 (CEST) Received: from florianrock64 (ip92344de0.dynamic.kabel-deutschland.de [146.52.77.224]) by mxe217.netcup.net (Postfix) with ESMTPSA id 5FAC482D8A; Mon, 15 Apr 2024 18:04:31 +0200 (CEST) From: "pelzflorian (Florian Pelz)" To: gemmaro Subject: Re: [bug#63483] [PATCH v2 0/4] build: Update po4a process. In-Reply-To: (gemmaro's message of "Sun, 14 Apr 2024 16:18:49 +0900") References: Date: Mon, 15 Apr 2024 18:04:30 +0200 Message-ID: <877cgyzk6p.fsf@pelzflorian.de> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain X-Rspamd-Queue-Id: 5FAC482D8A X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: Ob/jv8Rdcj3lPZULUynwlsv9LcYXg9WsPmPIoc2AoCnH8SbbLsf5hbEz X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 63483 Cc: Josselin Poiret , Simon Tournier , Mathieu Othacehe , Ludovic =?utf-8?Q?Court=C3=A8s?= , Tobias Geerinckx-Rice , Julien Lepiller , Ricardo Wurmus , Christopher Baines , 63483@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Thank you, gemmaro, for driving this necessary change. It is a good idea to switch to the actual PO4A script that still gets updates by PO4A maintainers. You will have to coordinate with Julien Lepiller (added to Cc) who controls the Guix-translations repository. [1] Guix-translations is the repository that Weblate has access to (because we do not want Weblate to push directly to Guix.git directly). It will need your po4a.cfg and the same kind of Makefile updates. In your original v1 patch, you had updated contributing.texi. contributing.texi is already out of date, but I believe we better update it at a later time when we can refer people adding new languages to prior commits where new languages have been added. Regards, Florian [1] https://framagit.org/tyreunom/guix-translations From debbugs-submit-bounces@debbugs.gnu.org Sun Apr 28 04:55:46 2024 Received: (at 63483) by debbugs.gnu.org; 28 Apr 2024 08:55:46 +0000 Received: from localhost ([127.0.0.1]:50090 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s10K2-0003Qn-0Q for submit@debbugs.gnu.org; Sun, 28 Apr 2024 04:55:46 -0400 Received: from mail-ot1-x32b.google.com ([2607:f8b0:4864:20::32b]:52458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1s10Jy-0003Qe-4i for 63483@debbugs.gnu.org; Sun, 28 Apr 2024 04:55:44 -0400 Received: by mail-ot1-x32b.google.com with SMTP id 46e09a7af769-6ea2375d8d0so2914536a34.0 for <63483@debbugs.gnu.org>; Sun, 28 Apr 2024 01:55:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714294517; x=1714899317; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :from:to:cc:subject:date:message-id:reply-to; bh=0ndCW/NTzYwnIMl2BcTS53SK8DfESI2N4O+4pe1oLB0=; b=TwqQc5/Jf+ZDkOG6aFotQLUQShlqlzFe2LzkOxlbaXSMo3DVZ7gUpKiTc+QGVcZu1Q t6vjUore1CYWQwrgPbQd3dM3vGX+bwO7ZJFIRu3L84ZI/V/H4erWYZwFIoXYbi35yOmo 4IqxSWLAGGkm49yQguJ2dYHtY0JMrIn/TXU+FfxCR9CZwEZFw9Bj4L7qpZwyBIP2+7lC p2JDUjkY/k0n7/FfeCety4Mzk9+XE1ZEhSLlPu5uRN3XiEbgbqYI9ozeXpuQQZY6sK3w 8DWMf6zVzpfO8J9Sv2YsBwJae3VmdHros+c0FpVvbvD3heMsaMZIRk9wtSzQ9FhcKwzB gTKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714294517; x=1714899317; h=mime-version:message-id:date:references:in-reply-to:subject:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0ndCW/NTzYwnIMl2BcTS53SK8DfESI2N4O+4pe1oLB0=; b=jvowiB19MRGyQom9DBqiXo215bI7S11buozjWipaGyhgHqoYeMhVJoezuCX3JXdzBl Y9DzHyHWu+TaVTdQc+8HvQ0REQpYsaN6vR3LkVuxrjoEeGUJGxuZVxVxMf6FIDycgN/U ErWLRfVUE0KkEPazQaZL+0RxRSpbNTmYS1qjgae3Zvi3ADq7VkwuzS9WdBQwvdVLM6KC Z4KQukbhWLz/kpFCafwmTkdTE2wvWrxZHBpYTbD6LLh7cF9J26ULhlCogpoQ+DRm7CEa NAQtENhiazdf8rc+s7omAUYpOy7ozYE2DhwW6UfaWx6+rkbyVjVyWlvoFklqilH2rsNf V/og== X-Gm-Message-State: AOJu0YwI+/H37g2W7TGI4PAQc4LvyRH7S1U5qB0itwZvZjoIjRPe+oDf mYU6qhWekCrkXzsBrFoaSe/5kyLmn5CsqFohNMJxZkdTWI8UMS0LqV9RJA== X-Google-Smtp-Source: AGHT+IFzOMcRhubJg2uVdCurPAWSx+OMTwlRBupGlggqdtsHCXVU9Fg9MGwONvN2KWpGjOm+GPavbQ== X-Received: by 2002:a9d:3e51:0:b0:6ee:26ea:17e7 with SMTP id h17-20020a9d3e51000000b006ee26ea17e7mr383936otg.22.1714294516725; Sun, 28 Apr 2024 01:55:16 -0700 (PDT) Received: from localhost ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id cb17-20020a056a02071100b0060063c4be3bsm9599126pgb.14.2024.04.28.01.55.15 for <63483@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Apr 2024 01:55:16 -0700 (PDT) From: gemmaro To: 63483@debbugs.gnu.org Subject: Re: [bug#63483] [PATCH v2 0/4] build: Update po4a process. In-Reply-To: <877cgyzk6p.fsf@pelzflorian.de> References: <877cgyzk6p.fsf@pelzflorian.de> X-Debbugs-Cc: pelzflorian (Florian Pelz) , Julien Lepiller , Christopher Baines , Josselin Poiret , Ludovic =?utf-8?Q?Court=C3=A8s?= , Mathieu Othacehe , Ricardo Wurmus , Simon Tournier , Tobias Geerinckx-Rice Date: Sun, 28 Apr 2024 17:55:13 +0900 Message-ID: <87r0ep3lzi.fsf@mac.gemmaro.name> MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 63483 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Hello Florian Pelz and Julien Lepiller, "pelzflorian (Florian Pelz)" writes: > Thank you, gemmaro, for driving this necessary change. It is a good > idea to switch to the actual PO4A script that still gets updates by > PO4A maintainers. > > You will have to coordinate with Julien Lepiller (added to Cc) who > controls the Guix-translations repository. [1] Thank you very much for telling me about the repository. I also got an idea of the translation flow in Guix using Weblate; Weblate refers to and updates the PO files in the Guix-translations repository, and that the PO files in the Guix.git cloned in it are updated by the Makefile. > Guix-translations is the repository that Weblate has access to (because > we do not want Weblate to push directly to Guix.git directly). It will > need your po4a.cfg and the same kind of Makefile updates. The changes in revision 2 don't alter the location of PO files and the scripts under the scripts directory. I couldn't find additional changes to the po4a.cfg and the Makefiles. What do you think, Julien Lepiller? If there are any changes that should be made, I would appreciate it if you could correct me. The po4a.cfg added by this change allows quite flexible specification of file paths by passing variables (with po4a's "--variable key=value" option.) It would be therefore possible to make the Guix-translations repository also use the integrated po4a program anytime. The Texinfo parser used by po4a (and po4a-* scripts) is the same before and after the change, so there should be no side-effect on the PO files. > In your original v1 patch, you had updated contributing.texi. > contributing.texi is already out of date, but I believe we better update > it at a later time when we can refer people adding new languages to > prior commits where new languages have been added. > > Regards, > Florian > > [1] https://framagit.org/tyreunom/guix-translations When I was writing this, I noticed that I have transferred some configuration to po4a.cfg and now there is one more place to specify the languages (in the po4a_langs section.) The documentation will need to be updated in the future in this respect. Regards, gemmaro. From debbugs-submit-bounces@debbugs.gnu.org Mon Jun 03 02:00:54 2024 Received: (at 63483-done) by debbugs.gnu.org; 3 Jun 2024 06:00:54 +0000 Received: from localhost ([127.0.0.1]:47736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE0kY-00067N-Bv for submit@debbugs.gnu.org; Mon, 03 Jun 2024 02:00:54 -0400 Received: from relay.yourmailgateway.de ([188.68.61.103]:34241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sE0kV-000674-Hd for 63483-done@debbugs.gnu.org; Mon, 03 Jun 2024 02:00:52 -0400 Received: from mors-relay-8403.netcup.net (localhost [127.0.0.1]) by mors-relay-8403.netcup.net (Postfix) with ESMTPS id 4Vt3450KY9z80WZ; Mon, 3 Jun 2024 08:00:37 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1717394437; bh=0UAvA/o64lofm+8Ro5x8uIXJBf2cPKkvgG/sdm3sgRY=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=ZWZSMReIzofw/+y/SjVaK4mr2qD/PbtqR80X2zAFqbvNU9mNdtIAiGmLWijkiYw3R 3U51xyPtWJPMpmAHuLLSYmw3J2EEtaAgu8/1Y0orII4+FXtnHDzCNJzf/rViqEGocT BEdV+U/xdst/NGleLrW7TQwb11TtAtEj20cuzSHLHstBk4dGYBOjQ8dIlcS8E6uGrJ 36HaHevbov3C9He5548NmbFxmeZOmSptQuDM3Pg7ur4c/hGqoBXsiJtq+mAs3WwTfV Newrr5H93UroyrhC2OTite7jmE3gLznZRUOmhHG/d5nkB5Z4+XuYOd0LaDIKnU6L62 K0HfTWABGiVkQ== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8403.netcup.net (Postfix) with ESMTPS id 4Vt344732zz80Sd; Mon, 3 Jun 2024 08:00:36 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net X-Spam-Flag: NO X-Spam-Score: -2.9 X-Spam-Level: X-Spam-Status: No, score=-2.9 required=6.31 tests=[ALL_TRUSTED=-1, BAYES_00=-1.9] autolearn=ham autolearn_force=no Received: from mxe217.netcup.net (unknown [10.243.12.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by policy01-mors.netcup.net (Postfix) with ESMTPS id 4Vt343318Nz8sbY; Mon, 3 Jun 2024 08:00:35 +0200 (CEST) Received: from florianrock64 (ipb2186896.dynamic.kabel-deutschland.de [178.24.104.150]) by mxe217.netcup.net (Postfix) with ESMTPSA id 8F7A683EE0; Mon, 3 Jun 2024 08:00:20 +0200 (CEST) From: "pelzflorian (Florian Pelz)" To: gemmaro Subject: Re: [bug#63483] [PATCH v2 0/4] build: Update po4a process. In-Reply-To: <87r0ep3lzi.fsf@mac.gemmaro.name> (gemmaro's message of "Sun, 28 Apr 2024 17:55:13 +0900") References: <877cgyzk6p.fsf@pelzflorian.de> <87r0ep3lzi.fsf@mac.gemmaro.name> Date: Mon, 03 Jun 2024 08:00:19 +0200 Message-ID: <87a5k2efbg.fsf@pelzflorian.de> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 8F7A683EE0 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: sZXeVOHiCIGhneAFUv6UgGdOZ7DSoC2EbiusTR88A80eya4lxA+73rOQ X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: 63483-done Cc: Julien Lepiller , Simon Tournier , Mathieu Othacehe , Ludovic =?utf-8?Q?Court=C3=A8s?= , Tobias Geerinckx-Rice , Josselin Poiret , Ricardo Wurmus , Christopher Baines , 63483-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Pushed as commits 77c79bf5daff2e8041453b7a7112656d6409264b to 368e58afcb3b363098e52907c1ea9a385566f7d4 along with the monthly translations. Big thanks to you, gemmaro, for taking the time, and sorry it took so long. The documentation I will update soon. I have written to Julien once more, but you are right that the guix.git repo and guix-translations.repo can be changed separately. > Hello Julien, not urgent at all, but could you update your > guix-translations repository along the lines of commit > > commit 2d4af5247057505956e841d396ec78af9f769837 > Author: gemmaro > Date: Sun Apr 14 16:18:51 2024 +0900 >=20 > build: Update the POT creation task with the po4a command. >=20 > , that is, add gemmaro=E2=80=99s po4a.cfg and, in the Makefile, replacing > po4a-updatepo with po4a, so Guix will benefit when po4a gets new changes > missing from its less-maintained po4a-updatepo? >=20 > Thank you for maintaining guix-translations.git. >=20 > Regards, > Florian Regards, Florian From unknown Sat Jun 21 03:02:48 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 01 Jul 2024 11:24:09 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator