From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id aF15NG9jzWNeKgAAbAwnHQ (envelope-from ) for ; Sun, 22 Jan 2023 17:25:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id OLebM29jzWNp7QAAG6o9tA (envelope-from ) for ; Sun, 22 Jan 2023 17:25:19 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 5869E32CC4 for ; Sun, 22 Jan 2023 17:25:19 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJd9a-0000zd-JU; Sun, 22 Jan 2023 11:25:10 -0500 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 1pJd9T-0000yO-8q for bug-guix@gnu.org; Sun, 22 Jan 2023 11:25:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pJd9T-0001Kz-0N for bug-guix@gnu.org; Sun, 22 Jan 2023 11:25:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJd9S-0004CA-R3 for bug-guix@gnu.org; Sun, 22 Jan 2023 11:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#58880: Patch impacting translation (was Re: bug#58880: 'guix gc' does not round the amount of disk space freed) Resent-From: zimoun Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 22 Jan 2023 16:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58880 X-GNU-PR-Package: guix X-GNU-PR-Keywords: patch easy To: Remco van 't Veer Cc: 58880@debbugs.gnu.org, Julien Lepiller Received: via spool by 58880-submit@debbugs.gnu.org id=B58880.167440464716024 (code B ref 58880); Sun, 22 Jan 2023 16:25:02 +0000 Received: (at 58880) by debbugs.gnu.org; 22 Jan 2023 16:24:07 +0000 Received: from localhost ([127.0.0.1]:52491 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJd8Z-0004AJ-G2 for submit@debbugs.gnu.org; Sun, 22 Jan 2023 11:24:07 -0500 Received: from mail-wm1-f53.google.com ([209.85.128.53]:56033) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJd8V-00049Y-K4 for 58880@debbugs.gnu.org; Sun, 22 Jan 2023 11:24:06 -0500 Received: by mail-wm1-f53.google.com with SMTP id q8so7339383wmo.5 for <58880@debbugs.gnu.org>; Sun, 22 Jan 2023 08:24:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=5eJqQj9VbedeyABwAlFjCbjAevwn3pzKtZl0UEMOSA4=; b=CTecR8gS5uRQkIgfdCZ4Ef4Sin1l8G++/pwdw39cgo5Vedg0HHVd7xw0P0nJWlubra +KY7QuxJIXANH2LwEGKpYKcN5toCa1yVHYnz7PGKrH0ci8il2hm7Ho5IfwwpL3jBrzp9 B5vnGjWvRUEp9AcZFdwQGldm4wujflnOHKBVrfGWgA8+8Ue0O+Ahu2IW1BMGmTBMs5PI NVgqMJrLpS90R9Jir0vjva/RqXs0y9ID6UL2GlH8eCz2EITl6bJB5ZDHQnLDiq7ccVk5 rH6lqyiUGh3q0dS2MkwetJhm43wL4SZZ/nfXgaRHmNOg9aGhc9rx1dXN4giBQd27lnqF 2fAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5eJqQj9VbedeyABwAlFjCbjAevwn3pzKtZl0UEMOSA4=; b=a6HKb5Bg3nrhLH4jWn153xrZ7bW7j0bOAwE9cNpLuZPSLwswxPwFjnK8s6MfB9BHnM XZ0gqi/iHwg2kQaAD94KuC55jNH0OOyo9Ysd92GJLmus43MeNrk7HvEBFq8Ge40TXzvb ytcR75eHH0WQaVsHYEYkOJhOYQRWPxpGuEYwONIfjImcNhHTLaf9A2t76ProAuloOZMs CddPZvS1MuzbYm/k7WlVQhnNGJV+foiKsyhvOGPC5MU23ZwaTRuMgJL30qNFZ7bJiC/B 15crLWbbkGT1mrm6kYuQrzDcOdM4UP34WhvVL0AHWEiMndxCzS16S69v1G/WWZKuJa9M +uFQ== X-Gm-Message-State: AFqh2ko/lKTZvk2AWkUoV88tS15Ox8/Kb1zA3wmNzf5eHfM+f2djZCsp +MHLWoVPN5J1VYyh6UGJCE8= X-Google-Smtp-Source: AMrXdXtOXhRH4M3SwfDpBibYoTzPfWmBAEJ60PD511qUtGGIyAksXRH8oYQGvD1CSJWRuq2n0pm7Vw== X-Received: by 2002:a05:600c:1c83:b0:3cf:cfce:9d93 with SMTP id k3-20020a05600c1c8300b003cfcfce9d93mr5727426wms.2.1674404637549; Sun, 22 Jan 2023 08:23:57 -0800 (PST) Received: from lili ([2a01:e0a:59b:9120:65d2:2476:f637:db1e]) by smtp.gmail.com with ESMTPSA id l7-20020a7bc447000000b003dafa04ecc4sm8235530wmi.6.2023.01.22.08.23.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Jan 2023 08:23:57 -0800 (PST) From: zimoun In-Reply-To: <87mt6bkez2.fsf@remworks.net> References: <5z3zneF8G6Y-8ua-MISE2H5Kth7yWekIe_gGm8a9F35IewpTkm_rscQL5eIP0tKeUJM7LGsNWlELU0DON2pYG5EfMkQoyXM5cA8NRVZRy8k=@proton.me> <20221125203328.21379-1-remco@remworks.net> <86zgab26ru.fsf_-_@gmail.com> <87mt6bkez2.fsf@remworks.net> Date: Sun, 22 Jan 2023 15:49:55 +0100 Message-ID: <86v8ky1v58.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1674404719; a=rsa-sha256; cv=none; b=UfzkPFysdwcXb19g+ZZ85pw57uLPT++4d/DvbudxXvA4zG4Iiq/IeMaggFw1fxZwR2ZUE0 UEx22DVyQqPJ7sddmJIFuXgjCbGl9xd4aB7WAeUKdHtiBRwfsYUbc2WCt6x6hboWIUuf0E mIeTYpAhwlowMdC+Mr9BmNPAYUeceM/0/jJmefgqvZUXJrRmBMiXUc5KOAHODkcxwNg5P/ gh2TL/sP5uChz1nGcRf1SfuKF+yE8uOwnsMSnJv+P6qNXgtfHY5vZc5OO+68rvDhHzNvkW fq/35fPL54t+lj7DVxdsgSfPwc2IALM7qtzRgWVuaQ8JpQ6ZfEtj0Ys7mZfPCQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=CTecR8gS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674404719; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:in-reply-to:in-reply-to:references:references: list-id:list-help:list-unsubscribe:list-subscribe:list-post: dkim-signature; bh=5eJqQj9VbedeyABwAlFjCbjAevwn3pzKtZl0UEMOSA4=; b=Gl+IC+TBVrFY2wfBCemamZrz8jW/lyVmGhXDyr/n4ru3zXG+CN7Ls30PjnYU0KcTdj1TZk O8f6mOZf2YytOFhtW32S/9Yu0p+O2N4AomhPWuKqc8GQHPwaJ6zTocO51p5LiUG5oBPxGs pOBp2Kj4egACMpTcOtzHyYhejekamvR8bXvVNy7Z9kBRcZIc+ujXZJ19ea8Sz/8sHgE/JL LjyTpjw5gZGA48781K7ZMzm+doBUf+l/vRtFhpL5WEdK5CU05a73zADeAO9LScqNVp7WEd l1u/7knsvnzmPy5pdRYUi4wvn0o1Sv/51fmUTWL6FtdXUJbLFAvbcQQcDvsMCQ== X-Spam-Score: 6.61 X-Migadu-Queue-Id: 5869E32CC4 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=CTecR8gS; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Scanner: scn0.migadu.com X-Migadu-Spam-Score: 6.61 X-TUID: lIkaH2x1RY9x Hi, On Sat, 21 Jan 2023 at 17:52, Remco van 't Veer wrote: >>> * guix/scripts/gc.scm (guix-gc): Round MiBs in user feedback. >>> * po/*/*.po (guix/scripts/gc.scm)a: Round MiBs in user feedback. >> >> If the way to go with the translation dance? > > I don't know. I figured since the translation key was changed this > would be the best way to do this but to be honest I don't understand how > to do this using "weblate" (from info:guix#Translating Guix). Julien, WDYT? >> The only change is: >> >>> diff --git a/guix/scripts/gc.scm b/guix/scripts/gc.scm >>> index 5e775c5cdb..2bbfb26d5d 100644 >>> --- a/guix/scripts/gc.scm >>> +++ b/guix/scripts/gc.scm >>> @@ -260,10 +260,10 @@ (define-command (guix-gc . args) >>> ;; Attempt to have at least SPACE bytes available in STORE. >>> (let ((free (free-disk-space (%store-prefix)))) >>> (if (> free space) >>> - (info (G_ "already ~h MiBs available on ~a, nothing to do~%") >>> + (info (G_ "already ~,2h MiBs available on ~a, nothing to do~%") >>> (/ free 1024. 1024.) (%store-prefix)) >>> (let ((to-free (- space free))) >>> - (info (G_ "freeing ~h MiBs~%") (/ to-free 1024. 1024.)) >>> + (info (G_ "freeing ~,2h MiBs~%") (/ to-free 1024. 1024.)) >>> (collect-garbage store to-free))))) >>> >>> (define (delete-generations store pattern) >>> @@ -327,10 +327,10 @@ (define-command (guix-gc . args) >>> (ensure-free-space store free-space)) >>> (min-freed >>> (let-values (((paths freed) (collect-garbage store min-freed))) >>> - (info (G_ "freed ~h MiBs~%") (/ freed 1024. 1024.)))) >>> + (info (G_ "freed ~,2h MiBs~%") (/ freed 1024. 1024.)))) >>> (else >>> (let-values (((paths freed) (collect-garbage store))) >>> - (info (G_ "freed ~h MiBs~%") (/ freed 1024. 1024.))))))) >>> + (info (G_ "freed ~,2h MiBs~%") (/ freed 1024. 1024.))))))) >>> ((list-roots) >>> (assert-no-extra-arguments) >>> (list-roots)) >> >> and captured by G_ so does this only to be applied and then all the >> msgid updated by the translation process? > > Yes, this is the only change. The old keys will be orphaned though and > remain in the po files. I'd be happy to drop the po/*/*.po part of the > patch if that helps. Julien, what is the best solution? Apply a patch touching all PO files or apply a patch touching only the messages captured by G_ and then update separately the translations? Cheers, simon