From unknown Wed Jun 18 23:10:13 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#68503 <68503@debbugs.gnu.org> To: bug#68503 <68503@debbugs.gnu.org> Subject: Status: [PATCH] gnu: torbrowser: Add support for language localisation. Reply-To: bug#68503 <68503@debbugs.gnu.org> Date: Thu, 19 Jun 2025 06:10:13 +0000 retitle 68503 [PATCH] gnu: torbrowser: Add support for language localisatio= n. reassign 68503 guix-patches submitter 68503 Cl=C3=A9ment Lassieur severity 68503 normal tag 68503 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 16 07:24:35 2024 Received: (at submit) by debbugs.gnu.org; 16 Jan 2024 12:24:35 +0000 Received: from localhost ([127.0.0.1]:47984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPiUc-0006jm-4B for submit@debbugs.gnu.org; Tue, 16 Jan 2024 07:24:35 -0500 Received: from lists.gnu.org ([2001:470:142::17]:56358) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPiUa-0006jQ-6C for submit@debbugs.gnu.org; Tue, 16 Jan 2024 07:24:32 -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 1rPiUQ-0006zm-Tk for guix-patches@gnu.org; Tue, 16 Jan 2024 07:24:23 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rPiUO-0008CG-O4 for guix-patches@gnu.org; Tue, 16 Jan 2024 07:24:22 -0500 Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id 583915C00D4; Tue, 16 Jan 2024 07:24:18 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Tue, 16 Jan 2024 07:24:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:message-id:mime-version:reply-to :subject:subject:to:to; s=fm2; t=1705407858; x=1705494258; bh=Gz Tmy1mMOpAGfxWkvMjgCbx0RRUxdR7LmuQnM34W/CQ=; b=j/D+FbW2kyw30PiaEt PDrHWGjGhbFldcS62Ug9bvaRWtVaHpfWw49NBBS+wKBHx+QGlUOtGr389bj5SpIj QUpkifrCApNw0s42VzDkVjH0FpMqAnIa7haj+SPlFTLEZlTa+pnkMt5HEoMEdPs3 erOTidDwlsBYS+mqZFqyWZAsckXot9wfou6khnFwZkfR1HUKdSHGQDqrBwbibBTc 25NQY2aLeNgifX4PQQEuSoeqnecU4Ppy54cBb/6Fn6DGCpkPkrL7V9wYnfd+N2qt erk5AqqBZWMptAOoaW0Cf8vETl3sUx7HAUf+cpcQ2WuFtrysXeDofRdtsL8v9ZVc 1O5w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:message-id:mime-version:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1705407858; x=1705494258; bh=GzTmy1mMOpAGf xWkvMjgCbx0RRUxdR7LmuQnM34W/CQ=; b=KXneJokqS0H9dChgB8Matfa9wMTvV W0BUIX8OprfNq22dRsJtbibn4H48Z+EaXhZvywJghdyN9htuV8lMNHZgUV/ybMWu gODffykkTwN4IGAIZxkOdwg2dlR2d6Pfq9ssKNaWpQbNeGZ+p0JPFMemQvvyA1cr FkFx3JiSBOZe0QF0JJXWt3GTzGzOY00TVh5lzxyjMbggmPD1qI5Yoh+Hfji+3f7c YFJgzz7wsM6qiqooLjeBPx8loNkOjaqbPx3jpyFvy6j9A4nijLYGPmO2+CpnwHF/ quKCgUTTqHRyDzO2/eCSF1k2mZjXqJCFa9RHx2YwOZa/3OGgpE+KoiAzw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejfedggedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffogggtgfesthekre dtredtjeenucfhrhhomhepvehlrohmvghnthcunfgrshhsihgvuhhruceotghlvghmvghn theslhgrshhsihgvuhhrrdhorhhgqeenucggtffrrghtthgvrhhnpeevhfetleevkeduie etudegheegteegffeggfeiteehuefhleegfffgudejveelgfenucffohhmrghinhepthho rhhprhhojhgvtghtrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpe hmrghilhhfrhhomheptghlvghmvghntheslhgrshhsihgvuhhrrdhorhhg X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 16 Jan 2024 07:24:16 -0500 (EST) From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= To: guix-patches@gnu.org Subject: [PATCH] gnu: torbrowser: Add support for language localisation. Date: Tue, 16 Jan 2024 13:22:30 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: André Batista X-Debbugs-Cc: Clément Lassieur , Jonathan Brielmaier Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=66.111.4.28; envelope-from=clement@lassieur.org; helo=out4-smtp.messagingengine.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_PASS=-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: 0.6 (/) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= 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: -0.4 (/) * gnu/packages/gnuzilla.scm (all-mozilla-locales): Make public. * gnu/packages/tor.scm (%torbrowser-locales, translation-base-browser, translation-tor-browser): New variables. (torbrowser)[arguments]: Add ‘copy-locales’ and ‘build-locales’ phases. Change-Id: Ia5b28fa5d885f24140893dc270e57e83b0250c67 --- gnu/packages/gnuzilla.scm | 2 +- gnu/packages/tor.scm | 101 +++++++++++++++++++++++++++++++++++++- 2 files changed, 101 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ea5de680e5d0..441e0526c4b8 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -438,7 +438,7 @@ (define (update-mozilla-locales changesets.json) (format #t "~{~s~%~}" data) data)))) -(define all-mozilla-locales +(define-public all-mozilla-locales (mozilla-locales ;; sha256 changeset locale ;;--------------------------------------------------------------------------- diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index b20e17e4cea8..8752cd67ef37 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2021-2023 Danial Behzadi ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Jim Newsome -;;; Copyright © 2023 Clément Lassieur +;;; Copyright © 2023, 2024 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -503,6 +503,36 @@ (define %torbrowser-version "13.0.8") ;; "src-firefox-tor-browser-". (define %torbrowser-firefox-version "115.6.0esr-13.0-1-build2") +;; Use the list in tor-browser-build/rbm.conf. +(define %torbrowser-locales + '("ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" "ga-IE" "he" "hu" + "id" "is" "it" "ja" "ka" "ko" "lt" "mk" "ms" "my" "nb-NO" "nl" "pl" + "pt-BR" "ro" "ru" "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) + +;; See tor-browser-build/projects/translation/config. +(define translation-base-browser + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.torproject.org/tpo/translation.git") + (commit "5490489a8d356a44d792300b4dfddba792d10f2e"))) + (file-name "translation-base-browser") + (sha256 + (base32 + "1knxary2zp2705xzzs76gpy37ri69yp32ajpmpxki3z5hp7mla7q")))) + +;; See tor-browser-build/projects/translation/config. +(define translation-tor-browser + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.torproject.org/tpo/translation.git") + (commit "e92772b4a11ced855c27eafd299cf972bef5cd8f"))) + (file-name "translation-tor-browser") + (sha256 + (base32 + "0q3gcq7s58110d9y4x8zyby6cn36msry6z3va7xw8sam3pp7p8nj")))) + (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. (package @@ -591,6 +621,68 @@ (define-public torbrowser (for-each (lambda (flag) (format #t "ac_add_options ~a~%" flag)) configure-flags))))) + ;; See tor-browser-build/projects/firefox/build. + (add-before 'configure 'copy-locales + (lambda _ + (let ((l10ncentral ".mozbuild/l10n-central")) + ;; Temporary copy so that we can use ‘mv’ to mimic + ;; tor-browser-build/projects/firefox/build. + (copy-recursively #$translation-base-browser + "translation-base-browser") + (copy-recursively #$translation-tor-browser + "translation-tor-browser") + (mkdir-p l10ncentral) + (for-each + (lambda (lang) + ;; Firefox locales + (copy-recursively (find (lambda (path) + (string-suffix? lang path)) + '#$all-mozilla-locales) + (in-vicinity l10ncentral lang)) + ;; Base Browser locales + (system + (format + #f (string-join + '("mv" + "translation-base-browser/~a/base-browser.ftl" + "~a/~a/browser/browser/")) + lang l10ncentral lang)) + (system + (format + #f (string-join + '("mv" + "translation-base-browser/~a/*" + "~a/~a/browser/chrome/browser/")) + lang l10ncentral lang)) + ;; Tor Browser locales + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a/tor-browser.ftl" + "~a/~a/browser/browser/")) + lang l10ncentral lang)) + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a/cryptoSafetyPrompt.properties" + "~a/~a/browser/chrome/browser/")) + lang l10ncentral lang)) + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a" + "toolkit/torbutton/chrome/locale/")) + lang)) + (let ((port (open-file "toolkit/torbutton/jar.mn" "a"))) + (format port "% locale torbutton ~a %locale/~a/~%" + lang lang) + (format port " locale/~a/ (chrome/locale/~a/*)~%" + lang lang) + (close port))) + '#$%torbrowser-locales)))) (replace 'configure (lambda _ (invoke "./mach" "configure"))) @@ -607,6 +699,13 @@ (define-public torbrowser "#include ../../../tools/torbrowser/bridges.js" port) (newline port) (close port)))) + ;; See tor-browser-build/projects/firefox/build. + (add-after 'build 'build-locales + (lambda _ + (setenv "MOZ_CHROME_MULTILOCALE" + (string-join '#$%torbrowser-locales)) + (apply invoke "./mach" "package-multi-locale" "--locales" + "en-US" '#$%torbrowser-locales))) (add-after 'install 'deploy-assets (lambda* (#:key inputs #:allow-other-keys) (let ((assets #$(this-package-input "torbrowser-assets")) base-commit: 551d013a56bf7d22bac80e0fd21d971973c3cf6f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 16 07:40:29 2024 Received: (at 68503) by debbugs.gnu.org; 16 Jan 2024 12:40:29 +0000 Received: from localhost ([127.0.0.1]:48024 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPik1-0001UR-3X for submit@debbugs.gnu.org; Tue, 16 Jan 2024 07:40:29 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:37297) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPijz-0001UC-2m for 68503@debbugs.gnu.org; Tue, 16 Jan 2024 07:40:27 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 89B355C010E; Tue, 16 Jan 2024 07:40:21 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 16 Jan 2024 07:40:21 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1705408821; x=1705495221; bh=n65PfP9HPdOVlv8WSoXGmxbgQU/moMX1oNZrY7hwcnc=; b= A8lDAl1VikaoHP5vrgK+2HX+EDoS2XS3Bp1v+HPDKv41/mjPyFszEXC40/y+ejUb zhduxKojRZeU2v+kZz58hS2VxR0NdNXF22oCjb2Evl+YNIjwQqM65zEPjQfcUiKt U2QGGIQQ858sDs5upWzjNiHt1LhBVccEnPro5/K/3ULnQFL5ziS6fbEoXMQPOfma Rx1HNP8Ar9ppNlqQugXt6tAiMIywmNFREMY6JHpSMYjQujM7OV+L2xxZSrapdhNC k1T9MgYpie3MKmAVez+9i0TZsA/9OorcDEYoVAIOWvv3yEN9Pm8fp8athK4CrK51 Pdt6tSBNRr4puygGcbt3wQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705408821; x= 1705495221; bh=n65PfP9HPdOVlv8WSoXGmxbgQU/moMX1oNZrY7hwcnc=; b=P KPZinrWBRt37Ll+WzYh+xQIsyjOGP8TsIGdI4NjvNf08vdJG2vPyDAJYJKCvtFZG R9e2oKuwxMXGgURs5o5+nKOF/Nk2Puj+jvk3QJ/bP8Gy4vO8fI/M4FK5mME9ZEp5 czmTF5oYw8KcspObbJlW/AuE9HjSIRCRvVaek4uDI1bHyLkDk3q6Bj6gTG/U4wIe st3TsKhVwy4dqg/ZvbZ2Xv1zOVz+6oaYhQkahJD6CKGjnTCVQ+AbIk81KNtO/PmX nBteut9oS/mCgXP41QNFSGgSEZQ7H10IhEjg47b+m3khUxemvGxIbsyeiKvBkAQp Dz5ntVOhHOhpGfMqX7/8A== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejfedggeefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefujghffffkfgggtgfgsehtqhertddtreejnecuhfhrohhmpeevlhor mhgvnhhtucfnrghsshhivghurhcuoegtlhgvmhgvnhhtsehlrghsshhivghurhdrohhrgh eqnecuggftrfgrthhtvghrnhepgeekheefffdtfeffueevkefgfffhtddugfdugeeugeev gfduteffudfgfefhjedunecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrg hilhhfrhhomheptghlvghmvghntheslhgrshhsihgvuhhrrdhorhhg X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 16 Jan 2024 07:40:20 -0500 (EST) From: =?utf-8?Q?Cl=C3=A9ment_Lassieur?= To: 68503@debbugs.gnu.org Subject: Re: [bug#68503] [PATCH] gnu: torbrowser: Add support for language localisation. In-Reply-To: (=?utf-8?Q?=22Cl=C3=A9ment?= Lassieur"'s message of "Tue, 16 Jan 2024 13:22:30 +0100") References: Date: Tue, 16 Jan 2024 13:40:18 +0100 Message-ID: <87wms9qwnh.fsf@lassieur.org> 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 68503 Cc: =?utf-8?Q?Andr=C3=A9?= Batista , Jonathan Brielmaier 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.7 (-) On Tue, Jan 16 2024, Cl=C3=A9ment Lassieur wrote: > * gnu/packages/gnuzilla.scm (all-mozilla-locales): Make public. > * gnu/packages/tor.scm (%torbrowser-locales, translation-base-browser, > translation-tor-browser): New variables. > (torbrowser)[arguments]: Add =E2=80=98copy-locales=E2=80=99 and =E2=80=98= build-locales=E2=80=99 phases. > > Change-Id: Ia5b28fa5d885f24140893dc270e57e83b0250c67 > --- > gnu/packages/gnuzilla.scm | 2 +- > gnu/packages/tor.scm | 101 +++++++++++++++++++++++++++++++++++++- > 2 files changed, 101 insertions(+), 2 deletions(-) Ccing Andr=C3=A9. From debbugs-submit-bounces@debbugs.gnu.org Tue Jan 16 08:31:59 2024 Received: (at 68503) by debbugs.gnu.org; 16 Jan 2024 13:31:59 +0000 Received: from localhost ([127.0.0.1]:48157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPjXq-0005I8-Es for submit@debbugs.gnu.org; Tue, 16 Jan 2024 08:31:59 -0500 Received: from out4-smtp.messagingengine.com ([66.111.4.28]:36881) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rPjXl-0005Ed-7H for 68503@debbugs.gnu.org; Tue, 16 Jan 2024 08:31:56 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 4A0B55C0211; Tue, 16 Jan 2024 08:31:47 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Tue, 16 Jan 2024 08:31:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1705411907; x=1705498307; bh=uE35jKLbKYx0v7Uz9x0lzAbPx6fnuXsakCo5dSs7qdY=; b= EqKEqfXzBnuP7L/oj3Na935uyEkpyENXn1GligVrM+ErgvM6+LScK3ZAC2U/C/Ss uSKJp6iqyMrISFJWeQosFT6OHaXnvE0SywcmtF5WgIBn4eVpKGaOLJLHGEVzF7pB LW51yI0/ShBDg3fT7LJLCHEaKgT2pThLnXB/U2qO96WtsYoco1bCKsZkYAHoaX4q Ssetd7Z2diMkkiPC9aIRu3lK80u+y2MGmO0jKvRTghe7V0EGeH9w6wtY6uk868Cb AdL2vcSNF8uFlORSLbNBRPQvv56t1k3YI985AhZJ/s0VRhCfG6tWvdmISQ9JNo3Q cgYm9FgMSuwHAUIoS0FnYw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705411907; x= 1705498307; bh=uE35jKLbKYx0v7Uz9x0lzAbPx6fnuXsakCo5dSs7qdY=; b=Z YHgEtJfKx3GP4GA+Dfzp/cFURa17KriJIw4gEAzgSQLPZiP3t6dMXrGiV7J8SqmK rCe7mRIIhlE0ZJJcxUSyqsfgFoDkUc1eGw3L+v0jTpE49w2KTLvmSP541G+3Em9v K5xVK9gLRyFJKzIbSqVMaJk8ySudxZSc/bNSa8hCn/IwQW8z2KkZbzqANjbvl7AD by3CizMTb83/wHOa8PQcyg+VBTIqVntctaKo0Fle9C9frmaER09GgTNIp0Pe9H4z 4TNSWNpj7vsDgf/SkIjulDW7PDROtsrVUKColc1ixvsheRXXpC66JdMVvhavzGGk kklqQ1IB7d2MBAHz1+OTA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejfedgheefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvehlrohmvghnthcunfgrshhsihgvuhhruceotghlvghm vghntheslhgrshhsihgvuhhrrdhorhhgqeenucggtffrrghtthgvrhhnpeegtdefkedtve egueehkedukeffkeetieffleevudfggedvteekkedvveeujeekveenucffohhmrghinhep thhorhhprhhojhgvtghtrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomheptghlvghmvghntheslhgrshhsihgvuhhrrdhorhhg X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 16 Jan 2024 08:31:45 -0500 (EST) From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= To: 68503@debbugs.gnu.org Subject: [PATCH v2] gnu: torbrowser: Add support or language localisation. Date: Tue, 16 Jan 2024 14:31:17 +0100 Message-ID: <3ac58217a296eea03f2709937526f7e0eab10d52.1705411299.git.clement@lassieur.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Debbugs-Cc: André Batista Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 68503 Cc: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= 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.7 (-) * gnu/packages/gnuzilla.scm (all-mozilla-locales): Export it. * gnu/packages/tor.scm (%torbrowser-locales, translation-base-browser, translation-tor-browser): New variables. (torbrowser)[arguments]: Add ‘copy-locales’ and ‘build-locales’ phases. Change-Id: Ia5b28fa5d885f24140893dc270e57e83b0250c67 --- gnu/packages/gnuzilla.scm | 3 +- gnu/packages/tor.scm | 101 +++++++++++++++++++++++++++++++++++++- 2 files changed, 102 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ea5de680e5d0..e3bc625bc0f5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -98,7 +98,8 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline) #:use-module (gnu packages sqlite) - #:autoload (json parser) (json->scm)) + #:autoload (json parser) (json->scm) + #:export (all-mozilla-locales)) (define-public mozjs (package diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index b20e17e4cea8..8752cd67ef37 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2021-2023 Danial Behzadi ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Jim Newsome -;;; Copyright © 2023 Clément Lassieur +;;; Copyright © 2023, 2024 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -503,6 +503,36 @@ (define %torbrowser-version "13.0.8") ;; "src-firefox-tor-browser-". (define %torbrowser-firefox-version "115.6.0esr-13.0-1-build2") +;; Use the list in tor-browser-build/rbm.conf. +(define %torbrowser-locales + '("ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" "ga-IE" "he" "hu" + "id" "is" "it" "ja" "ka" "ko" "lt" "mk" "ms" "my" "nb-NO" "nl" "pl" + "pt-BR" "ro" "ru" "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) + +;; See tor-browser-build/projects/translation/config. +(define translation-base-browser + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.torproject.org/tpo/translation.git") + (commit "5490489a8d356a44d792300b4dfddba792d10f2e"))) + (file-name "translation-base-browser") + (sha256 + (base32 + "1knxary2zp2705xzzs76gpy37ri69yp32ajpmpxki3z5hp7mla7q")))) + +;; See tor-browser-build/projects/translation/config. +(define translation-tor-browser + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.torproject.org/tpo/translation.git") + (commit "e92772b4a11ced855c27eafd299cf972bef5cd8f"))) + (file-name "translation-tor-browser") + (sha256 + (base32 + "0q3gcq7s58110d9y4x8zyby6cn36msry6z3va7xw8sam3pp7p8nj")))) + (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. (package @@ -591,6 +621,68 @@ (define-public torbrowser (for-each (lambda (flag) (format #t "ac_add_options ~a~%" flag)) configure-flags))))) + ;; See tor-browser-build/projects/firefox/build. + (add-before 'configure 'copy-locales + (lambda _ + (let ((l10ncentral ".mozbuild/l10n-central")) + ;; Temporary copy so that we can use ‘mv’ to mimic + ;; tor-browser-build/projects/firefox/build. + (copy-recursively #$translation-base-browser + "translation-base-browser") + (copy-recursively #$translation-tor-browser + "translation-tor-browser") + (mkdir-p l10ncentral) + (for-each + (lambda (lang) + ;; Firefox locales + (copy-recursively (find (lambda (path) + (string-suffix? lang path)) + '#$all-mozilla-locales) + (in-vicinity l10ncentral lang)) + ;; Base Browser locales + (system + (format + #f (string-join + '("mv" + "translation-base-browser/~a/base-browser.ftl" + "~a/~a/browser/browser/")) + lang l10ncentral lang)) + (system + (format + #f (string-join + '("mv" + "translation-base-browser/~a/*" + "~a/~a/browser/chrome/browser/")) + lang l10ncentral lang)) + ;; Tor Browser locales + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a/tor-browser.ftl" + "~a/~a/browser/browser/")) + lang l10ncentral lang)) + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a/cryptoSafetyPrompt.properties" + "~a/~a/browser/chrome/browser/")) + lang l10ncentral lang)) + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a" + "toolkit/torbutton/chrome/locale/")) + lang)) + (let ((port (open-file "toolkit/torbutton/jar.mn" "a"))) + (format port "% locale torbutton ~a %locale/~a/~%" + lang lang) + (format port " locale/~a/ (chrome/locale/~a/*)~%" + lang lang) + (close port))) + '#$%torbrowser-locales)))) (replace 'configure (lambda _ (invoke "./mach" "configure"))) @@ -607,6 +699,13 @@ (define-public torbrowser "#include ../../../tools/torbrowser/bridges.js" port) (newline port) (close port)))) + ;; See tor-browser-build/projects/firefox/build. + (add-after 'build 'build-locales + (lambda _ + (setenv "MOZ_CHROME_MULTILOCALE" + (string-join '#$%torbrowser-locales)) + (apply invoke "./mach" "package-multi-locale" "--locales" + "en-US" '#$%torbrowser-locales))) (add-after 'install 'deploy-assets (lambda* (#:key inputs #:allow-other-keys) (let ((assets #$(this-package-input "torbrowser-assets")) base-commit: 551d013a56bf7d22bac80e0fd21d971973c3cf6f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Jan 18 17:49:53 2024 Received: (at 68503) by debbugs.gnu.org; 18 Jan 2024 22:49:54 +0000 Received: from localhost ([127.0.0.1]:56913 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQbCr-0000Uv-8w for submit@debbugs.gnu.org; Thu, 18 Jan 2024 17:49:53 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:51249) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rQbCo-0000Ug-Hw for 68503@debbugs.gnu.org; Thu, 18 Jan 2024 17:49:52 -0500 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 06C485C0167; Thu, 18 Jan 2024 17:49:43 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Thu, 18 Jan 2024 17:49:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1705618183; x=1705704583; bh=XXS2dU1cZOWej46RDLNJKLrworaGA7sHiDYt36whYUY=; b= YUshavz8dS8Dp1pjIvph2Ci3wWs8Ap7FDxAcxJ1238ZFWgJlc1Js6v2MzXKlaOTD RoPSpe630aHYjSnUQzZ7vBodEogPZeaV5BpLF02qhxPcJLTaNwtBXxdioh5nIc05 tlb+BuA9WFI0lB51/kEISfEE3EDwtnhfRTP8suP5Qn0+Snn+y4aRG5SXstEc7I// Lltk22KuRIS8bSt0wlO1Ig2GmFWTigcFzwr7sPmrel7k8nYI5Op15TwUL6ZK7hoY iOzDVnpe9wMMNMi113Ed9As0UZyl6eE/F8vVa5+6sbl9k1nSeOeAzcJhx4jPdsyr YXWj60EhOFsiy/qcaaFDgA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705618183; x= 1705704583; bh=XXS2dU1cZOWej46RDLNJKLrworaGA7sHiDYt36whYUY=; b=X XIKLvaW4H6TW9pWieWEUHJLUDQs5z4JPOLkmf042lEq46hAlRm7tse1sXexdvSzG olXQVwKzv5svjO8X80i7UnDlKxvr8ihO1lESRpsDPAPbWmY6QnEuJzg4bTvx+3UX hc+2tiONhhcJ+BuN3SX4NPWy+2agYnK3Ih1ha8xhV2Xycr2MVh+bxmm/pa71uJB6 2qZwx/5cZolgI5bDrfcKfbIyI3K5w96hI9KTDgo2CmeegVaX/55Cx3hbpQsZk1rE 6FilreQF1rygCvGccXG4nt2aNmlvNv4oF8AKGSaZVQMfL590B25ydhna7AouQoWu Hdd+kafX6ZuF5W2y8K89Q== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdejledgtdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesth ekredtredtjeenucfhrhhomhepvehlrohmvghnthcunfgrshhsihgvuhhruceotghlvghm vghntheslhgrshhsihgvuhhrrdhorhhgqeenucggtffrrghtthgvrhhnpeegtdefkedtve egueehkedukeffkeetieffleevudfggedvteekkedvveeujeekveenucffohhmrghinhep thhorhhprhhojhgvtghtrdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrg hmpehmrghilhhfrhhomheptghlvghmvghntheslhgrshhsihgvuhhrrdhorhhg X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 18 Jan 2024 17:49:41 -0500 (EST) From: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= To: 68503@debbugs.gnu.org Subject: [PATCH v3] gnu: torbrowser: Add support for language localisation. Date: Thu, 18 Jan 2024 23:46:49 +0100 Message-ID: <5134d59e3a0e6749baaff2581f12cffa1fd0f363.1705615319.git.clement@lassieur.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <3ac58217a296eea03f2709937526f7e0eab10d52.1705411299.git.clement@lassieur.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 68503 Cc: =?UTF-8?q?Cl=C3=A9ment=20Lassieur?= 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.7 (-) * gnu/packages/gnuzilla.scm (all-mozilla-locales): Export it. * gnu/packages/tor.scm (%torbrowser-locales, translation-base-browser, translation-tor-browser): New variables. (torbrowser)[arguments]: In ‘setenv’ phase, set MOZ_CHROME_MULTILOCALE. Add ‘copy-firefox-locales’, ‘copy-basebrowser-locales’, ‘copy-torbrowser-locales’ and ‘build-locales’ phases. Change-Id: Ia5b28fa5d885f24140893dc270e57e83b0250c67 --- gnu/packages/gnuzilla.scm | 3 +- gnu/packages/tor.scm | 112 +++++++++++++++++++++++++++++++++++++- 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index ea5de680e5d0..e3bc625bc0f5 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -98,7 +98,8 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages xdisorg) #:use-module (gnu packages readline) #:use-module (gnu packages sqlite) - #:autoload (json parser) (json->scm)) + #:autoload (json parser) (json->scm) + #:export (all-mozilla-locales)) (define-public mozjs (package diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm index b20e17e4cea8..fbd5f0a0af78 100644 --- a/gnu/packages/tor.scm +++ b/gnu/packages/tor.scm @@ -13,7 +13,7 @@ ;;; Copyright © 2021-2023 Danial Behzadi ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Jim Newsome -;;; Copyright © 2023 Clément Lassieur +;;; Copyright © 2023, 2024 Clément Lassieur ;;; ;;; This file is part of GNU Guix. ;;; @@ -503,6 +503,36 @@ (define %torbrowser-version "13.0.8") ;; "src-firefox-tor-browser-". (define %torbrowser-firefox-version "115.6.0esr-13.0-1-build2") +;; Use the list in tor-browser-build/rbm.conf. +(define %torbrowser-locales + '("ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" "ga-IE" "he" "hu" + "id" "is" "it" "ja" "ka" "ko" "lt" "mk" "ms" "my" "nb-NO" "nl" "pl" + "pt-BR" "ro" "ru" "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) + +;; See tor-browser-build/projects/translation/config. +(define translation-base-browser + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.torproject.org/tpo/translation.git") + (commit "5490489a8d356a44d792300b4dfddba792d10f2e"))) + (file-name "translation-base-browser") + (sha256 + (base32 + "1knxary2zp2705xzzs76gpy37ri69yp32ajpmpxki3z5hp7mla7q")))) + +;; See tor-browser-build/projects/translation/config. +(define translation-tor-browser + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.torproject.org/tpo/translation.git") + (commit "e92772b4a11ced855c27eafd299cf972bef5cd8f"))) + (file-name "translation-tor-browser") + (sha256 + (base32 + "0q3gcq7s58110d9y4x8zyby6cn36msry6z3va7xw8sam3pp7p8nj")))) + (define torbrowser-assets ;; This is a prebuilt Torbrowser from which we take the assets we need. (package @@ -581,6 +611,8 @@ (define-public torbrowser ;; $HOME/.mozbuild). (setenv "MOZBUILD_STATE_PATH" (in-vicinity (getcwd) ".mozbuild")) + (setenv "MOZ_CHROME_MULTILOCALE" + (string-join '#$%torbrowser-locales)) ;; Make build reproducible. (setenv "MOZ_BUILD_DATE" #$%moz-build-date))) (add-before 'configure 'mozconfig @@ -594,6 +626,79 @@ (define-public torbrowser (replace 'configure (lambda _ (invoke "./mach" "configure"))) + ;; See tor-browser-build/projects/firefox/build. + (add-before 'configure 'copy-firefox-locales + (lambda _ + (let ((l10ncentral ".mozbuild/l10n-central")) + (mkdir-p l10ncentral) + (for-each + (lambda (lang) + (copy-recursively (find (lambda (path) + (string-suffix? lang path)) + '#$all-mozilla-locales) + (in-vicinity l10ncentral lang))) + '#$%torbrowser-locales)))) + (add-after 'copy-firefox-locales 'copy-basebrowser-locales + (lambda _ + (let ((l10ncentral ".mozbuild/l10n-central")) + ;; Temporary copy so that we can use ‘mv’ to mimic + ;; tor-browser-build/projects/firefox/build. + (copy-recursively #$translation-base-browser + "translation-base-browser") + (for-each + (lambda (lang) + (system + (format + #f (string-join + '("mv" + "translation-base-browser/~a/base-browser.ftl" + "~a/~a/browser/browser/")) + lang l10ncentral lang)) + (system + (format + #f (string-join + '("mv" + "translation-base-browser/~a/*" + "~a/~a/browser/chrome/browser/")) + lang l10ncentral lang))) + '#$%torbrowser-locales)))) + (add-after 'copy-basebrowser-locales 'copy-torbrowser-locales + (lambda _ + (let ((l10ncentral ".mozbuild/l10n-central")) + ;; Temporary copy so that we can use ‘mv’ to mimic + ;; tor-browser-build/projects/firefox/build. + (copy-recursively #$translation-tor-browser + "translation-tor-browser") + (for-each + (lambda (lang) + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a/tor-browser.ftl" + "~a/~a/browser/browser/")) + lang l10ncentral lang)) + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a/cryptoSafetyPrompt.properties" + "~a/~a/browser/chrome/browser/")) + lang l10ncentral lang)) + (system + (format + #f (string-join + '("mv" + "translation-tor-browser/~a" + "toolkit/torbutton/chrome/locale/")) + lang)) + (let ((port (open-file "toolkit/torbutton/jar.mn" "a"))) + (format port "% locale torbutton ~a %locale/~a/~%" + lang lang) + (format port " locale/~a/ (chrome/locale/~a/*)~%" + lang lang) + (close port))) + '#$%torbrowser-locales)))) (add-before 'build 'fix-addons-placeholder (lambda _ (substitute* @@ -607,6 +712,11 @@ (define-public torbrowser "#include ../../../tools/torbrowser/bridges.js" port) (newline port) (close port)))) + ;; See tor-browser-build/projects/firefox/build. + (add-after 'build 'build-locales + (lambda _ + (system (string-join '("./mach package-multi-locale --locales" + "en-US $MOZ_CHROME_MULTILOCALE"))))) (add-after 'install 'deploy-assets (lambda* (#:key inputs #:allow-other-keys) (let ((assets #$(this-package-input "torbrowser-assets")) base-commit: 551d013a56bf7d22bac80e0fd21d971973c3cf6f -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 20 16:30:11 2024 Received: (at 68503) by debbugs.gnu.org; 20 Jan 2024 21:30:12 +0000 Received: from localhost ([127.0.0.1]:35995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRIup-00007z-FW for submit@debbugs.gnu.org; Sat, 20 Jan 2024 16:30:11 -0500 Received: from mx0.riseup.net ([198.252.153.6]:46796) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRIum-00006H-Kr for 68503@debbugs.gnu.org; Sat, 20 Jan 2024 16:30:09 -0500 Received: from fews02-sea.riseup.net (fews02-sea-pn.riseup.net [10.0.1.112]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx0.riseup.net (Postfix) with ESMTPS id 4THV4k6Kfcz9wJ1; Sat, 20 Jan 2024 21:29:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1705786198; bh=bB0lv9jnTTRtbFjI0xCptUYr0H37oDeORiHtGpW4Amc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dISu6cwEf+sJj14pwUx77oOn1T5eh8vUWuBnmDLhInbyJDcJaRiD3eCi3YDE8vwqy Nvrlc4C0cYZhqUBvmjrtHhm0+ShPdLj1dS+3LZzaKQXDVjjbmWQJv7y7DK5w4PdyQk Wh4VPP6FHrfSZlEeQb5pT1F0gqCmox1LD5plpzoM= X-Riseup-User-ID: 66AB2C8D862CC8DD570BF600C70ED00544D895AD9C6018083847AE81537717D1 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews02-sea.riseup.net (Postfix) with ESMTPSA id 4THV4j4mNVzFvms; Sat, 20 Jan 2024 21:29:57 +0000 (UTC) Date: Sat, 20 Jan 2024 18:29:52 -0300 From: =?iso-8859-1?Q?Andr=E9?= Batista To: =?iso-8859-1?Q?Cl=E9ment?= Lassieur Subject: Re: [PATCH v3] gnu: torbrowser: Add support for language localisation. Message-ID: References: <3ac58217a296eea03f2709937526f7e0eab10d52.1705411299.git.clement@lassieur.org> <5134d59e3a0e6749baaff2581f12cffa1fd0f363.1705615319.git.clement@lassieur.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="YORPUkObTxspdoEV" Content-Disposition: inline In-Reply-To: <5134d59e3a0e6749baaff2581f12cffa1fd0f363.1705615319.git.clement@lassieur.org> X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 68503 Cc: 68503@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.7 (-) --YORPUkObTxspdoEV Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Cl=E9ment, qui 18 jan 2024 =E0s 23:46:49 (1705632409), clement@lassieur.org enviou: > ... > > diff --git a/gnu/packages/tor.scm b/gnu/packages/tor.scm > index b20e17e4cea8..fbd5f0a0af78 100644 > --- a/gnu/packages/tor.scm > +++ b/gnu/packages/tor.scm > ... > > @@ -503,6 +503,36 @@ (define %torbrowser-version "13.0.8") > ;; "src-firefox-tor-browser-". > (define %torbrowser-firefox-version "115.6.0esr-13.0-1-build2") > =20 > +;; Use the list in tor-browser-build/rbm.conf. > +(define %torbrowser-locales > + '("ar" "ca" "cs" "da" "de" "el" "es-ES" "fa" "fi" "fr" "ga-IE" "he" "h= u" > + "id" "is" "it" "ja" "ka" "ko" "lt" "mk" "ms" "my" "nb-NO" "nl" "pl" > + "pt-BR" "ro" "ru" "sq" "sv-SE" "th" "tr" "uk" "vi" "zh-CN" "zh-TW")) > + > +;; See tor-browser-build/projects/translation/config. > +(define translation-base-browser > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://gitlab.torproject.org/tpo/translation.git") > + (commit "5490489a8d356a44d792300b4dfddba792d10f2e"))) > + (file-name "translation-base-browser") > + (sha256 > + (base32 > + "1knxary2zp2705xzzs76gpy37ri69yp32ajpmpxki3z5hp7mla7q")))) > + > +;; See tor-browser-build/projects/translation/config. > +(define translation-tor-browser > + (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://gitlab.torproject.org/tpo/translation.git") > + (commit "e92772b4a11ced855c27eafd299cf972bef5cd8f"))) The above commit is the one on the 'main' branch, but the current stable browser follows 'maint-13.0' (which has now changed in preparation for v13.0.9 release next Tuesday) and there is a tag for each release. The release tag for version 13.0.8 (tbb-13.0.8-build1) contains a different commit number (273592eca488ca3bf535d3789b1130fd1970f09a). Other than that, everything seems to perfectly mirror upstream build process. I've also built it, did some testing and it's working as expected. You are doing an awesome work, thanks! PS: I'm sorry to have left you hanging on the lyrebird patch. I'll review it and, if I find anything worth of attention, I'll ping back. For now, I can only say that bridges are working just fine. Cheers! --YORPUkObTxspdoEV Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQG5BAABCgAjFiEEXo3OJhMk/jL9rLM1Nj97Uq5OMvYFAmWsO1AFgwPCZwAACgkQ Nj97Uq5OMvYYTwv/QIRIDT4/aiOnke0AbnnhUXXBm898jPWQlAq9akkP7feejBxN NKMHcLahu0hBGL2OBB2TpXbFJMh1x6blvMTEf/0goYicdOO9zKzPbPkMDlj1sn8I loMcVylQ0SM6RC2r+4Og2QzpEWmWgZsUB4l4G5j74oCFviFOAajUOrhkJtv0lKYJ /PJ9DVa+VCZHUtnb/tKkd703m9L3AB2lrWNXGJMbumG8QnzBs3cxtaHNM84YhZWq hXJlFsdFkIawq5PYYJ7B7Rk2X8nNvtwMmBY6nTD6IQUxOcFxygOToPbRFbxPYDYZ wk8q3BjbgnK1etRXqKlD7RKP+75s0CrVxdQ0myxzmxTBtbzrPgjXN1sb4NkaVgSx YHQelxFBYqk4j/Zb34LU3iur+a3RUG7tbrp3HyYi6xc3S82JLlTKuJGhA7ASNPWS NKTDrzM9NgOsoB6ZHaopt53xMnDD0ARloJKUhJidv9w2QWEjpqnApVNCNRQCefz+ /5CKZp55TiWA/kIY =iKtq -----END PGP SIGNATURE----- --YORPUkObTxspdoEV-- From debbugs-submit-bounces@debbugs.gnu.org Sat Jan 20 19:16:15 2024 Received: (at 68503-done) by debbugs.gnu.org; 21 Jan 2024 00:16:15 +0000 Received: from localhost ([127.0.0.1]:36165 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRLVX-0007bd-4L for submit@debbugs.gnu.org; Sat, 20 Jan 2024 19:16:15 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:38723) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRLVR-0007b2-7s for 68503-done@debbugs.gnu.org; Sat, 20 Jan 2024 19:16:13 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id B1FCC5C0183; Sat, 20 Jan 2024 19:16:00 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Sat, 20 Jan 2024 19:16:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lassieur.org; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm2; t=1705796160; x=1705882560; bh=ppMisO57CVKGere9BZ8El206Yyc4CbNZiAwXM1lYTsQ=; b= ooahCJKPzf+SVKBOqJHAjUcXi74DaFZuh8UlBu3rLbE94ndDypYfza1MZkJ1TnVo ics6KVOjz/yfEZ2/Xd9wuFhn/XgVUPlsDWiJ+3TurhKE7MXOMNqKsrM8HhiXxIZY r17mU8UPEmR1UmZsoLrPfl1q/uLJXF7SF3fp/1/1tVJtBtWKBAuAVyUNg9nAxV+q 1fSNfMg3Q4tt5t73ehYFTWE6CqypLIjvpxguzAO9MPmnhCWVtviT9MyzJ19lAKm/ jOPSYQPius+oBqvVZ4OPA9VLg2QNgjx3z7zXwLqkUNpA5PRao613DWclcRBW7bGK e0WaGc9oB0y8QzxbhV/luA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm3; t=1705796160; x= 1705882560; bh=ppMisO57CVKGere9BZ8El206Yyc4CbNZiAwXM1lYTsQ=; b=X zuQn7Fs/PuxQIOqqNRoXmEKOMr5BZoDWjSK4odvu8a1wvG1dx3U3R27DiUhYAA0L PdOYjweNgFvQ1oOa17F873trPLIiEtuSnYTilfXVb9OYd/6cMsakA7XtR7AzKMY8 7X4py9wgB4ECG1SNJp1a28IIPV193xsXRhSbGfeCrr5XrODNgxi+/SD5U/kvp64S taP3V1AUdq9qlYjpmu9ZeHNQi2i63v0O/is7TueYcDcymJnDC73N+lZU8FtqvEMB +ICFe5hvqYybaGdaENM+P9ZTu/wGR/LGqn3EeNyfQQ5hfGFi7NvA6CE2iku1FDlR olY2Ih5Oh9jxejlFpd5gA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrvdekfedgudekucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhephffvvefujghffffkfgggtgfgsehtqhertddtreejnecuhfhrohhmpeevlhor mhgvnhhtucfnrghsshhivghurhcuoegtlhgvmhgvnhhtsehlrghsshhivghurhdrohhrgh eqnecuggftrfgrthhtvghrnheptdevtdfguddvieektedvffdutddvheejkeejvdeiffdv gffhvdelgeffudejieeknecuffhomhgrihhnpehtohhrphhrohhjvggtthdrohhrghdpgh hnuhdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhr ohhmpegtlhgvmhgvnhhtsehlrghsshhivghurhdrohhrgh X-ME-Proxy: Feedback-ID: i4c21472a:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sat, 20 Jan 2024 19:15:59 -0500 (EST) From: =?utf-8?Q?Cl=C3=A9ment_Lassieur?= To: =?utf-8?Q?Andr=C3=A9?= Batista Subject: Re: [bug#68503] [PATCH v3] gnu: torbrowser: Add support for language localisation. In-Reply-To: (=?utf-8?Q?=22Andr=C3=A9?= Batista"'s message of "Sat, 20 Jan 2024 18:29:52 -0300") References: <3ac58217a296eea03f2709937526f7e0eab10d52.1705411299.git.clement@lassieur.org> <5134d59e3a0e6749baaff2581f12cffa1fd0f363.1705615319.git.clement@lassieur.org> Date: Sun, 21 Jan 2024 01:15:54 +0100 Message-ID: <87edeb1qyt.fsf@lassieur.org> 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-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 68503-done Cc: 68503-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.7 (-) Hi Andr=C3=A9, On Sat, Jan 20 2024, Andr=C3=A9 Batista wrote: > Hi Cl=C3=A9ment, > >> +;; See tor-browser-build/projects/translation/config. >> +(define translation-tor-browser >> + (origin >> + (method git-fetch) >> + (uri (git-reference >> + (url "https://gitlab.torproject.org/tpo/translation.git") >> + (commit "e92772b4a11ced855c27eafd299cf972bef5cd8f"))) > > The above commit is the one on the 'main' branch, but the current stable > browser follows 'maint-13.0' (which has now changed in preparation for > v13.0.9 release next Tuesday) and there is a tag for each release. The > release tag for version 13.0.8 (tbb-13.0.8-build1) contains a different > commit number (273592eca488ca3bf535d3789b1130fd1970f09a). Well spotted! I corrected this. > Other than that, everything seems to perfectly mirror upstream build > process. I've also built it, did some testing and it's working as > expected. I'm pretty sure we can get even closer to their build process. For example there are those Wasm patches that allow to have support for Wasm sandboxed libraries if I understand clearly. (They are already in nonguix.) https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D67512 > You are doing an awesome work, thanks! Thank you :) > PS: I'm sorry to have left you hanging on the lyrebird patch. I'll > review it and, if I find anything worth of attention, I'll ping back. > For now, I can only say that bridges are working just fine. Okay! I'd be glad to hear any remarks. I'm not that confident with Go packages. This one is pushed. Thanks for reviewing! Cl=C3=A9ment From unknown Wed Jun 18 23:10:13 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 18 Feb 2024 12:24:04 +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