From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id iLBqJetnzWMDvwAAbAwnHQ (envelope-from ) for ; Sun, 22 Jan 2023 17:44:27 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id AFqQJOtnzWOaAAAAG6o9tA (envelope-from ) for ; Sun, 22 Jan 2023 17:44:27 +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 0913B3E769 for ; Sun, 22 Jan 2023 17:44:26 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pJdRs-0004dK-4t; Sun, 22 Jan 2023 11:44:04 -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 1pJdRq-0004dB-Vg for bug-guix@gnu.org; Sun, 22 Jan 2023 11:44:02 -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 1pJdRq-0007AK-Ml for bug-guix@gnu.org; Sun, 22 Jan 2023 11:44:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pJdRq-0004hM-5Y for bug-guix@gnu.org; Sun, 22 Jan 2023 11:44: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: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Sun, 22 Jan 2023 16:44: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: zimoun , Remco van 't Veer Cc: 58880@debbugs.gnu.org Received: via spool by 58880-submit@debbugs.gnu.org id=B58880.167440579217982 (code B ref 58880); Sun, 22 Jan 2023 16:44:02 +0000 Received: (at 58880) by debbugs.gnu.org; 22 Jan 2023 16:43:12 +0000 Received: from localhost ([127.0.0.1]:52530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJdR1-0004fx-FW for submit@debbugs.gnu.org; Sun, 22 Jan 2023 11:43:11 -0500 Received: from lepiller.eu ([89.234.186.109]:41234) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pJdQx-0004fm-FB for 58880@debbugs.gnu.org; Sun, 22 Jan 2023 11:43:10 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 4b01d14b; Sun, 22 Jan 2023 16:43:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:in-reply-to:references:message-id:mime-version :content-type:content-transfer-encoding; s=dkim; bh=cpAQWAsvFDCe Auox7wg61y0Glk2Pt0+a6uC59R9JxbM=; b=Wqr23vmKtpOL69RnPLaZqFNKgd5A QBYkXdQiX95vgtrjTImyyw28a155V+vUwj+dAbkoW3E73kJOxAHyRGk0QFrpNKTF MzkEASLuwEz5EY6Orn3aSUN8U0gAGRsosPFTen6+ozX9fsU+l9a/CDXA1EMnbKo5 QMNmND1tIfCutpWqIN7mTHEDg6fMO6lnZfKrGffyxwWLqUAdsvqiWAt6Vo+Q3zwz xtHVoCbcgyV1Y4xRaddy5peJWfyewHte9/MvjixjbFrJEe6iv3pnE3KCm0Umc+Z8 hnIFhS3Bh260w5FsVT+ZMYcXU9uKRROpTZp5dkk1F+VNv79a3POZ4Gy30g== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id ef6b1fbd (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Sun, 22 Jan 2023 16:43:03 +0000 (UTC) Date: Sun, 22 Jan 2023 17:43:00 +0100 From: Julien Lepiller User-Agent: K-9 Mail for Android In-Reply-To: <86v8ky1v58.fsf@gmail.com> References: <5z3zneF8G6Y-8ua-MISE2H5Kth7yWekIe_gGm8a9F35IewpTkm_rscQL5eIP0tKeUJM7LGsNWlELU0DON2pYG5EfMkQoyXM5cA8NRVZRy8k=@proton.me> <20221125203328.21379-1-remco@remworks.net> <86zgab26ru.fsf_-_@gmail.com> <87mt6bkez2.fsf@remworks.net> <86v8ky1v58.fsf@gmail.com> Message-ID: MIME-Version: 1.0 Content-Type: multipart/alternative; boundary=----XL4LHBCQ4LKLQNAWGM8Q3YO5D7N4P3 Content-Transfer-Encoding: 7bit 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-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1674405867; 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: content-transfer-encoding:content-transfer-encoding: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=OTcnD7CcpNicziyWzYYfpcr6ueqRxJtd92wy1vWUTz4=; b=iFzUJ79MQkScNJfi7pTDenYUOmbRnwhnAovavN0bw74DETr4Jr9NK8o5SMiYLKmP9O05bt Zj/qA1KOM8wHgnzqYQANrXF3c37+4BNKMqDmj3FjviCEx6okrURKseP/JUhpITsv9F6s0n O5ZS5sC9bGWkWTLcTrlqPPmHH1AMMGjgPva8VCWO8+ZkemdS+CF0tfaU9fIRq5eqOrnvmA YfvycZHP4Xib7DdRRzwPiV8W8UO3TnzFus4dDdj3I5Duey5T3olRTRM44fffUHTuNw2A19 K5ohm+znWyfzEgM2TbRQg+9EKx149qGUCeYvXNxOJocKWv2378lqM7GfWC2z8g== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Wqr23vmK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (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-Seal: i=1; s=key1; d=yhetil.org; t=1674405867; a=rsa-sha256; cv=none; b=RbwJ2ubr9KDWAQNU5T1GZafM6q6K1vPzWdW3aOZRCfwP+PqfZNQVY8Y4KfnNLacUi829vm uVAUM/87hVTGRLQebZxGa9Hi4vU/gOSqeZYYrbv05m/05w9FkxoKExq3VKUqucvAZUld1i L/tErI2QzB0slzRkOSUe9mKaJzF/6j+jVX0lxnHPIxQ+MNJxvXJ9uUdnoPJUQvuiqxSru8 CZUf5vfn3ClEmcPP7QfCYw7GA+GQihOgrJxKhhtHcEvUWrINJr5ySCqHjB88igya+Lipu1 Nsw/OYXM1+PX6jl+qcDHRfJTu6kuqq20yybk2wRVgjkNOoKY75jAJ09EXbzUKA== X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: 7.41 X-Spam-Score: 7.41 X-Migadu-Queue-Id: 0913B3E769 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=lepiller.eu header.s=dkim header.b=Wqr23vmK; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (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-TUID: m0RXGv+bmhu2 ------XL4LHBCQ4LKLQNAWGM8Q3YO5D7N4P3 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Changing the po files in guix repo will work at first, it'll be negated nex= t time I push changes from weblate=2E We could change the po files to ensur= e continuity, but we have to also apply the change to the repo behind webla= te=2E I can take care of it after the patch is pushed=2E Le 22 janvier 2023 15:49:55 GMT+01:00, zimoun a =C3=A9crit=C2=A0: >Hi, > >On Sat, 21 Jan 2023 at 17:52, Remco van 't Veer wr= ote: > >>>> * guix/scripts/gc=2Escm (guix-gc): Round MiBs in user feedback=2E >>>> * po/*/*=2Epo (guix/scripts/gc=2Escm)a: Round MiBs in user feedback= =2E >>> >>> If the way to go with the translation dance? >> >> I don't know=2E 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 ho= w >> to do this using "weblate" (from info:guix#Translating Guix)=2E > >Julien, WDYT? > > >>> The only change is: >>> >>>> diff --git a/guix/scripts/gc=2Escm b/guix/scripts/gc=2Escm >>>> index 5e775c5cdb=2E=2E2bbfb26d5d 100644 >>>> --- a/guix/scripts/gc=2Escm >>>> +++ b/guix/scripts/gc=2Escm >>>> @@ -260,10 +260,10 @@ (define-command (guix-gc =2E args) >>>> ;; Attempt to have at least SPACE bytes available in STORE=2E >>>> (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 d= o~%") >>>> (/ free 1024=2E 1024=2E) (%store-prefix)) >>>> (let ((to-free (- space free))) >>>> - (info (G_ "freeing ~h MiBs~%") (/ to-free 1024=2E 1024= =2E)) >>>> + (info (G_ "freeing ~,2h MiBs~%") (/ to-free 1024=2E 1024= =2E)) >>>> (collect-garbage store to-free))))) >>>> >>>> (define (delete-generations store pattern) >>>> @@ -327,10 +327,10 @@ (define-command (guix-gc =2E 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=2E 1024=2E)= ))) >>>> + (info (G_ "freed ~,2h MiBs~%") (/ freed 1024=2E 1024= =2E)))) >>>> (else >>>> (let-values (((paths freed) (collect-garbage store))) >>>> - (info (G_ "freed ~h MiBs~%") (/ freed 1024=2E 1024=2E)= )))))) >>>> + (info (G_ "freed ~,2h MiBs~%") (/ freed 1024=2E 1024= =2E))))))) >>>> ((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=2E The old keys will be orphaned though a= nd >> remain in the po files=2E I'd be happy to drop the po/*/*=2Epo part of= the >> patch if that helps=2E > >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 ------XL4LHBCQ4LKLQNAWGM8Q3YO5D7N4P3 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable Changing the po files in guix repo will work at fi= rst, it'll be negated next time I push changes from weblate=2E We could cha= nge the po files to ensure continuity, but we have to also apply the change= to the repo behind weblate=2E I can take care of it after the patch is pus= hed=2E

Le 22 janvier 2023 15:49:55 GMT+01= :00, zimoun <zimon=2Etoutoune@gmail=2Ecom> a =C3=A9crit=C2=A0: 
Hi,

On Sat, 21 Jan 2023 at 17:52=
, Remco van 't Veer <remco@remworks=2Enet> wrote:

* guix/scripts/=
gc=2Escm (guix-gc): Round MiBs in user feedback=2E
* po/*/*=2Epo (guix/s=
cripts/gc=2Escm)a: Round MiBs in user feedback=2E

 If t=
he way to go with the translation dance?

 I don't know=
=2E  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)=2E

Ju=
lien, WDYT?


 The only change is:

<=
blockquote class=3D"gmail_quote" style=3D"margin: 0pt 0pt 1ex 0=2E8ex; bord=
er-left: 1px solid #8ae234; padding-left: 1ex;"> diff --git a/guix/scripts/=
gc=2Escm b/guix/scripts/gc=2Escm
 index 5e775c5cdb=2E=2E2bbfb26d5d 10064=
4
 --- a/guix/scripts/gc=2Escm
 +++ b/guix/scripts/gc=2Escm
 @@ -2=
60,10 +260,10 @@ (define-command (guix-gc =2E args)
      ;; Attempt to =
have at least SPACE bytes available in STORE=2E
      (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=2E 1024=2E) (%store-prefix))
            (le=
t ((to-free (- space free)))
 -            (info (G_ "freeing ~h MiBs~%"=
) (/ to-free 1024=2E 1024=2E))
 +            (info (G_ "freeing ~,2h MiB=
s~%") (/ to-free 1024=2E 1024=2E))
              (collect-garbage store =
to-free)))))

    (define (delete-generations store pattern)
 @@ -=
327,10 +327,10 @@ (define-command (guix-gc =2E args)
               (ens=
ure-free-space store free-space))
              (min-freed
          =
     (let-values (((paths freed) (collect-garbage store min-freed)))
 - =
             (info (G_ "freed ~h MiBs~%") (/ freed 1024=2E 1024=2E))))
 =
+              (info (G_ "freed ~,2h MiBs~%") (/ freed 1024=2E 1024=2E))))<=
br>              (else
               (let-values (((paths freed) (colle=
ct-garbage store)))
 -              (info (G_ "freed ~h MiBs~%") (/ free=
d 1024=2E 1024=2E)))))))
 +              (info (G_ "freed ~,2h MiBs~%") =
(/ freed 1024=2E 1024=2E)))))))
          ((list-roots)
           (a=
ssert-no-extra-arguments)
           (list-roots))

 =
and captured by G_ so does this only to be applied and then all the
 msg=
id updated by the translation process?

 Yes, this is th=
e only change=2E  The old keys will be orphaned though and
 remain in th=
e po files=2E  I'd be happy to drop the po/*/*=2Epo part of the
 patch i=
f that helps=2E

Julien, what is the best solution?  App=
ly a patch touching all PO files
or apply a patch touching only the mess=
ages captured by G_ and then
update separately the translations?

=

Cheers,
simon
------XL4LHBCQ4LKLQNAWGM8Q3YO5D7N4P3--