From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id YFR3GmOWJ2c8aAAA62LTzQ:P1 (envelope-from ) for ; Sun, 03 Nov 2024 15:27:31 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id YFR3GmOWJ2c8aAAA62LTzQ (envelope-from ) for ; Sun, 03 Nov 2024 16:27:31 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="I/kQnizf"; dkim=fail ("headers rsa verify failed") header.d=pelzflorian.de header.s=key2 header.b=G86sLURX; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1730647651; a=rsa-sha256; cv=none; b=LUteXryEJ+pViHdvmi96GkKDPp+Vu6nxAvbsF2WVy+4NF1i6AfrH6KpBNovMBuzeQru3Fa XZOIAiZCsvHCGRXLIbRuMojX7U7OIJCC1r8H8KJDfNhf2BnGL9oWFisvpAGq0r0S8XnTro bHc8K2X6EFTK5XxaE8czPugWw05/hyWQ1abBEDh5jRf8exOdsR1I4liJUBgP/nr3rpobqJ cyyRPdzxFRyKuE51BX6Q0II8+zgcpRoySbF3kFm7Ion5HpiAiesPtMZMtG6DleuUNlea4I 9WRgMHaNW4M89DvGojJWIr8k8QhJybdwrx80rUCo8Agv2Hl7DBcG1yA6qPvwIA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="I/kQnizf"; dkim=fail ("headers rsa verify failed") header.d=pelzflorian.de header.s=key2 header.b=G86sLURX; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1730647651; 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=QkflxEKa8wjkBl4FKFBlHt1RM/34Wbp7uq3usMps4hM=; b=BkJAXeAD/69+Od8iJCPJdnQX0lgvl41gBQwLfblzfEpQkRwIRxFFfF+U0Z7cZY65x+EJHv rShT30Sls4jrWPxgT8eLhC1QKHPEtDUBsjuHP1LzEgzPWdEYgHJDZL+BAtSYFdURPHLPja nsuzY5B7WBQfq9IMT7Y9VnjCMDdl36Yy8H1tZscLn9w1b2XfbRTrHXlNppIQyDAQtkX4/b IEhDRj/+caDm600JQL/A8sYrdcSR4bG4nzywpE86IpSDTeJSWFw2degwuXgRgvLXjJUm+9 Zca1SCHEjA+axciCj/V3SsKo7P8FBOnz5kUHyCYgpSF4Zj1WuKw61aCTSShK4A== 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 EE0A072EF8 for ; Sun, 03 Nov 2024 16:27:30 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t7cVN-0002ce-HP; Sun, 03 Nov 2024 10:27:05 -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 1t7cVL-0002cG-Tk for guix-patches@gnu.org; Sun, 03 Nov 2024 10:27:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t7cVK-0002Pm-RW; Sun, 03 Nov 2024 10:27:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=QkflxEKa8wjkBl4FKFBlHt1RM/34Wbp7uq3usMps4hM=; b=I/kQnizf5QeuALBfNFfTO2Q8p0Uv1Qb9fldYrBXYbtXxoml7TQeMd3g7XQkyPvXB3aPj2gms/CKYjEb9xTbioFu4X1oBPejdaK4VXCnLZDCsG5HBvoiIlsCoast5zZlFXOC+E0jAoQydXe7oRyaK0cPdbnYNO4olZcvyEfGsB5CGR11dxm6gnUZfGE4GJNWvAKjhEmmIk++U5yT4ajTHGWFttGs4ZAqd8w38Q03bf88gdfcZYhbjgzvWvwu28GQju50ncDQUiQ0dFXw/U3rBzHCN5AQXDil9+geXDHG8UhIupLEqUc0VcrBIDr8g5So/x6XoCX1Lz1cinMVRmVHRYg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t7cVK-0002Za-Jy; Sun, 03 Nov 2024 10:27:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74190] [PATCH 2/3] install: Change the territory when we have learned it. Resent-From: Florian Pelz Original-Sender: "Debbugs-submit" Resent-CC: dev@jpoiret.xyz, ludo@gnu.org, othacehe@gnu.org, guix-patches@gnu.org Resent-Date: Sun, 03 Nov 2024 15:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74190 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74190@debbugs.gnu.org Cc: Florian Pelz , Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe X-Debbugs-Original-Xcc: Josselin Poiret , Ludovic =?UTF-8?Q?Court=C3=A8s?= , Mathieu Othacehe Received: via spool by 74190-submit@debbugs.gnu.org id=B74190.17306476109872 (code B ref 74190); Sun, 03 Nov 2024 15:27:02 +0000 Received: (at 74190) by debbugs.gnu.org; 3 Nov 2024 15:26:50 +0000 Received: from localhost ([127.0.0.1]:32826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7cV7-0002ZA-NZ for submit@debbugs.gnu.org; Sun, 03 Nov 2024 10:26:50 -0500 Received: from relay.yourmailgateway.de ([188.68.61.107]:51889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t7cV5-0002Yz-HM for 74190@debbugs.gnu.org; Sun, 03 Nov 2024 10:26:48 -0500 Received: from mors-relay-8405.netcup.net (localhost [127.0.0.1]) by mors-relay-8405.netcup.net (Postfix) with ESMTPS id 4XhJNk45Rtz71Bn for <74190@debbugs.gnu.org>; Sun, 3 Nov 2024 16:26:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=pelzflorian.de; s=key2; t=1730647606; bh=cwzsmX+nM8Bf9wnAVVz4vkiF2PNfTAeF3QtTUWc3+Rk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=G86sLURXF26C3vp8x5DWSJNl0AJdLyQt4kO6LvQy11OgHE1B8nK2z4c9esgKDbT1y TvJpOqiEIMAVnZ673BoalZRIHt59zQuKR2i9fc/LZRLpLtx5LPfn8/vGY/0HtChmG1 BqMF9BzA7z72BIbTzwJA1NaGJ4oT1zM+PTrwyXLAmd7jZBppopeo4o8fDy9YG8Wesl TLe0JMWdom6peP+KAukUbdcK5FoT6X7dea1LJDWXwUkwLcg5Pe8itzV+ZcpfBccYZ/ 84h945lpzWg85Vuif4L1N5T468qypNmcowLGSnN56yYuWxjxxPTlWbsouy0K8TGF4l Iwdytj/PAdG9w== Received: from policy01-mors.netcup.net (unknown [46.38.225.35]) by mors-relay-8405.netcup.net (Postfix) with ESMTPS id 4XhJNk3QsBz7187 for <74190@debbugs.gnu.org>; Sun, 3 Nov 2024 16:26:46 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at policy01-mors.netcup.net 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 4XhJNj19sNz8t4H for <74190@debbugs.gnu.org>; Sun, 3 Nov 2024 16:26:43 +0100 (CET) Received: from florianhp.fritz.box (ipb218687b.dynamic.kabel-deutschland.de [178.24.104.123]) by mxe217.netcup.net (Postfix) with ESMTPSA id AEFA2842F6; Sun, 3 Nov 2024 16:26:37 +0100 (CET) From: Florian Pelz Date: Sun, 3 Nov 2024 16:25:42 +0100 Message-ID: <1e50d2858a80c891f3b7fa377e5b876c475f9e92.1730645617.git.pelzflorian@pelzflorian.de> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AEFA2842F6 X-Rspamd-Server: rspamd-worker-8404 X-NC-CID: gVj4tK9NxrA6xBMvQW/7bISjoMRGbG1/NQfvp6wqzgkSQlZMlZ0KbX3O X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -0.52 X-Spam-Score: -0.52 X-Migadu-Queue-Id: EE0A072EF8 X-Migadu-Scanner: mx10.migadu.com X-TUID: KONIgNBwzCK3 Typically, the LANGUAGE has already been set in the run-language-page step. But for languages like pt, we must know the territory. gnu/installer/newt/locale.scm (run-territory-page): Switch to the territory before returning it. Change-Id: Ie6308c359e0bdb2d37fac0c844cfd879e96e231a --- gnu/installer/newt/locale.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/installer/newt/locale.scm b/gnu/installer/newt/locale.scm index 01171e253f..1743e0d582 100644 --- a/gnu/installer/newt/locale.scm +++ b/gnu/installer/newt/locale.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Mathieu Othacehe ;;; Copyright © 2019 Ludovic Courtès +;;; Copyright © 2024 Florian Pelz ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,11 +23,7 @@ (define-module (gnu installer newt locale) #:use-module (gnu installer steps) #:use-module (gnu installer newt page) #:use-module (guix i18n) - #:use-module (newt) #:use-module (srfi srfi-1) - #:use-module (srfi srfi-26) - #:use-module (srfi srfi-34) - #:use-module (srfi srfi-35) #:use-module (ice-9 match) #:export (run-locale-page)) @@ -52,16 +49,22 @@ (define (run-language-page languages language->text) result) (define (run-territory-page territories territory->text) - (let ((title (G_ "Locale location"))) + (define result (run-listbox-selection-page - #:title title + #:title (G_ "Locale location") #:info-text (G_ "Choose a territory for this language.") #:listbox-items territories #:listbox-item->text territory->text #:button-text (G_ "Back") #:button-callback-procedure (lambda _ - (abort-to-prompt 'installer-step 'abort))))) + (abort-to-prompt 'installer-step 'abort)))) + + ;; Some languages, such as pt, cannot be installed early in the + ;; run-language-page step. Install them now, when we know the territory. + (setenv "LANGUAGE" (string-append (getenv "LANGUAGE") "_" result)) + + result) (define (run-codeset-page codesets) (let ((title (G_ "Locale codeset"))) -- 2.46.0