GNU bug report logs - #68503
[PATCH] gnu: torbrowser: Add support for language localisation.

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Clément Lassieur <clement <at> lassieur.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#68503: closed ([PATCH] gnu: torbrowser: Add support for
 language localisation.)
Date: Sun, 21 Jan 2024 00:17:01 +0000

[Message part 1 (text/plain, inline)]

Your message dated Sun, 21 Jan 2024 01:15:54 +0100
with message-id <87edeb1qyt.fsf <at> lassieur.org>
and subject line Re: [bug#68503] [PATCH v3] gnu: torbrowser: Add support for language localisation.
has caused the debbugs.gnu.org bug report #68503,
regarding [PATCH] gnu: torbrowser: Add support for language localisation.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
68503: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68503
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Clément Lassieur <clement <at> lassieur.org>
To: guix-patches <at> gnu.org
Cc: Clément Lassieur <clement <at> lassieur.org>
Subject: [PATCH] gnu: torbrowser: Add support for language localisation.
Date: Tue, 16 Jan 2024 13:22:30 +0100

* 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 <dani.behzi <at> ubuntu.com>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
 ;;; Copyright © 2022 Jim Newsome <jnewsome <at> torproject.org>
-;;; Copyright © 2023 Clément Lassieur <clement <at> lassieur.org>
+;;; Copyright © 2023, 2024 Clément Lassieur <clement <at> lassieur.org>
 ;;;
 ;;; 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

[Message part 3 (message/rfc822, inline)]

From: Clément Lassieur <clement <at> lassieur.org>
To: André Batista <nandre <at> riseup.net>
Cc: 68503-done <at> debbugs.gnu.org
Subject: Re: [bug#68503] [PATCH v3] gnu: torbrowser: Add support for
 language localisation.
Date: Sun, 21 Jan 2024 01:15:54 +0100

Hi André,

On Sat, Jan 20 2024, André Batista wrote:

> Hi Clément,
>
>> +;; 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=67512

> 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ément

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.