Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
01391c77 by Pier Angelo Vendrame at 2023-02-14T19:12:26+01:00
Bug 40781: Move translations to new paths
- - - - -
1 changed file:
- projects/firefox/build
Changes:
=====================================
projects/firefox/build
=====================================
@@ -57,15 +57,6 @@ tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
mkdir -p $distdir/[% IF ! c("var/macos") %]Browser[% END %]
-[% IF !c("var/testbuild") -%]
- tar -xf $rootdir/[% c('input_files_by_name/translation-base-browser') %]
- transl_base_browser=$rootdir/translation-base-browser
- [% IF c("var/tor-browser") -%]
- tar -xf $rootdir/[% c('input_files_by_name/translation-tor-browser') %]
- transl_tor_browser=$rootdir/translation-tor-browser
- [% END -%]
-[% END -%]
-
cd /var/tmp/build/[% project %]-[% c("version") %]
cat > .mozconfig << 'MOZCONFIG_EOF'
[% INCLUDE mozconfig %]
@@ -106,43 +97,6 @@ fi
sed -i 's|^URL=https://aus1\.torproject\.org/.*|URL=https://nightlies.tbb.torprojec… c("var/nightly_updates_osname") %]/%CHANNEL%/%BUILD_TARGET%/%VERSION%/ALL|' build/application.ini.in
[% END -%]
-add_translation () {
- transl_dir=$1
- component=$2
- lang=$3
- filename=$4
-
- mkdir "browser/components/$component/locale/$lang"
- cp "$transl_dir/$lang/$filename" "browser/components/$component/locale/$lang/"
- echo "% locale $component $lang %locale/$lang/" >> "browser/components/$component/jar.mn"
- echo " locale/$lang/$filename (locale/$lang/$filename)" >> "browser/components/$component/jar.mn"
-}
-
-[% IF c("var/testbuild") -%]
- supported_locales=""
-[% ELSE -%]
- supported_locales="[% tmpl(c('var/locales').join(' ')) %]"
-[% END -%]
-[% IF c("var/tor-browser") -%]
- torbutton_locales="toolkit/torbutton/chrome/locale/"
- torbutton_jar="toolkit/torbutton/jar.mn"
-[% END -%]
-for lang in $supported_locales; do
- [% IF c("var/macos") -%]
- if [ "$lang" == "ja-JP-mac" ]; then
- lang="ja"
- fi
- [% END-%]
-
- add_translation $transl_base_browser newidentity $lang newIdentity.properties
- add_translation $transl_base_browser securitylevel $lang securityLevel.properties
-
- [% IF c("var/tor-browser") -%]
- mv "$transl_tor_browser/$lang" "$torbutton_locales/"
- echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar"
- echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar"
- [% END -%]
-done
rm -f configure
rm -f js/src/configure
@@ -153,24 +107,60 @@ export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
mkdir "$HOME/.mozbuild"
[% IF !c("var/testbuild") -%]
+ supported_locales="[% tmpl(c('var/locales').join(' ')) %]"
+
l10ncentral="$HOME/.mozbuild/l10n-central"
mkdir "$l10ncentral"
for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do
tar -C "$l10ncentral" -xf "$tarball"
done
- tar -C $rootdir -xf $rootdir/[% c('input_files_by_name/translation-base-browser-fluent') %]
- base_browser_fluent=$rootdir/translation-base-browser-fluent
+ tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-base-browser') %]"
+ pushd "$rootdir/translation-base-browser"
+ ln -s ja ja-JP-mac
for lang in $supported_locales; do
- source_lang="$lang"
- if [ $lang = "ja-JP-mac" ]; then
- source_lang="ja"
- elif [ $lang = "es-ES" ]; then
- source_lang="es"
- fi
- cp "$base_browser_fluent/$source_lang/languageNotification.ftl" "$l10ncentral/$lang/browser/browser/"
+ # Please notice that Fluent and DTDs use different directories in
+ # l10n-central! This is something we have to keep in mind when we will join
+ # the two branches!
+ mv $lang/* "$l10ncentral/$lang/browser/chrome/browser/"
done
-[% END %]
+ popd
+
+ tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-base-browser-fluent') %]"
+ pushd "$rootdir/translation-base-browser-fluent"
+ ln -s ja ja-JP-mac
+ # TODO: These two sources will be unified eventually; at that point, this link
+ # will go away, too.
+ ln -s es es-ES
+ for lang in $supported_locales; do
+ mv $lang/languageNotification.ftl "$l10ncentral/$lang/browser/browser/"
+ done
+ popd
+
+ [% IF c("var/tor-browser") -%]
+ # We will have to keep the torbutton.jar until we stop using dtds, because
+ # if we move them to the browser locale directory, browser.xhtml is not
+ # loaded.
+ tar -C "$rootdir" -xf "$rootdir/[% c('input_files_by_name/translation-tor-browser') %]"
+ transl_tor_browser="$rootdir/translation-tor-browser"
+ torbutton_locales="toolkit/torbutton/chrome/locale/"
+ torbutton_jar="toolkit/torbutton/jar.mn"
+ for lang in $supported_locales; do
+ central_lang=$lang
+ [% IF c("var/macos") -%]
+ if [ "$lang" == "ja-JP-mac" ]; then
+ lang="ja"
+ fi
+ [% END -%]
+ mv "$transl_tor_browser/$lang/cryptoSafetyPrompt.properties" "$l10ncentral/$central_lang/browser/chrome/browser/"
+ mv "$transl_tor_browser/$lang" "$torbutton_locales/"
+ echo "% locale torbutton $lang %locale/$lang/" >> "$torbutton_jar"
+ echo " locale/$lang (chrome/locale/$lang/*)" >> "$torbutton_jar"
+ done
+ [% END -%]
+[% ELSE -%]
+ supported_locales=""
+[% END -%]
# PyYAML tries to read files as ASCII, otherwise
export LC_ALL=C.UTF-8
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0…
You're receiving this email because of your account on gitlab.torproject.org.
Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
1dace7f6 by Richard Pospesel at 2023-02-14T18:05:21+00:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
fixed substring calculation to get short name of locale for bridge emojii names
- - - - -
1 changed file:
- browser/components/torpreferences/content/connectionPane.js
Changes:
=====================================
browser/components/torpreferences/content/connectionPane.js
=====================================
@@ -741,7 +741,7 @@ const gConnectionPane = (function() {
const annotations = await res.json();
const bcp47 = Services.locale.appLocaleAsBCP47;
const dash = bcp47.indexOf("-");
- const lang = dash !== -1 ? bcp47.substring(dash) : bcp47;
+ const lang = dash !== -1 ? bcp47.substring(0, dash) : bcp47;
if (bcp47 in annotations) {
emojiAnnotations = annotations[bcp47];
} else if (lang in annotations) {
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1dace7f…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1dace7f…
You're receiving this email because of your account on gitlab.torproject.org.
Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.5-1 at The Tor Project / Applications / Tor Browser
Commits:
4c6590c3 by Dan Ballard at 2023-02-13T11:46:54-08:00
fixup! Add TorStrings module for localization
bug 41080: Add new string for connection assist 'Unblock the Internet it'
- - - - -
494c9781 by Dan Ballard at 2023-02-13T11:47:45-08:00
fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
bug 41084: change top error bar color to purple
- - - - -
d1328cd0 by Dan Ballard at 2023-02-13T11:48:06-08:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
bug 41080: change 'your location' to 'unblock the internet in'
- - - - -
cf3ca81b by Dan Ballard at 2023-02-13T11:48:22-08:00
fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
bug 41084: change brdge error tryBridgeButton color to purple and dropdown label
- - - - -
5 changed files:
- browser/components/torconnect/content/aboutTorConnect.css
- browser/components/torconnect/content/aboutTorConnect.js
- browser/components/torpreferences/content/torPreferences.css
- browser/modules/TorStrings.jsm
- toolkit/torbutton/chrome/locale/en-US/torConnect.properties
Changes:
=====================================
browser/components/torconnect/content/aboutTorConnect.css
=====================================
@@ -142,7 +142,19 @@ button {
}
#locationDropdownLabel.error {
- color: var(--in-content-danger-button-background)
+ color: var(--in-content-error-text-color)
+}
+
+#tryBridgeButton.danger-button {
+ background-color: var(--purple-70);
+}
+
+#tryBridgeButton.danger-button:hover {
+ background-color: var(--purple-80);
+}
+
+#tryBridgeButton.danger-button:active {
+ background-color: var(--purple-90);
}
/* this follows similar css in error-pages.css for buttons */
=====================================
browser/components/torconnect/content/aboutTorConnect.js
=====================================
@@ -764,7 +764,7 @@ class AboutTorConnect {
});
this.elements.locationDropdownLabel.textContent =
- TorStrings.torConnect.yourLocation;
+ TorStrings.torConnect.unblockInternetIn;
this.elements.tryBridgeButton.textContent = TorStrings.torConnect.tryBridge;
this.elements.tryBridgeButton.addEventListener("click", () => {
=====================================
browser/components/torpreferences/content/torPreferences.css
=====================================
@@ -26,7 +26,7 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before {
}
#torPreferences-connectMessageBox.error {
- background-color: var(--red-60);
+ background-color: var(--purple-50);
color: white;
}
@@ -93,15 +93,15 @@ html:dir(rtl) input[type="checkbox"].toggle-button::before {
}
#torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-button {
- background-color: var(--red-70);
+ background-color: var(--purple-70);
}
#torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-button:hover {
- background-color: var(--red-80);
+ background-color: var(--purple-80);
}
#torPreferences-connectMessageBox.error #torPreferences-connectMessageBox-button:active {
- background-color: var(--red-90);
+ background-color: var(--purple-90);
}
#torPreferences-connectMessageBox.warning #torPreferences-connectMessageBox-button {
=====================================
browser/modules/TorStrings.jsm
=====================================
@@ -253,6 +253,7 @@ const Loader = {
tryAgainMessage:
"Tor Browser has failed to establish a connection to the Tor Network",
yourLocation: "Your Location",
+ unblockInternetIn: "Unblock the Internet in",
tryBridge: "Try a Bridge",
=====================================
toolkit/torbutton/chrome/locale/en-US/torConnect.properties
=====================================
@@ -40,6 +40,7 @@ torConnect.tryAgain=Try Again
torConnect.connectMessage=Changes to Tor Settings will not take effect until you connect
torConnect.tryAgainMessage=Tor Browser has failed to establish a connection to the Tor Network
torConnect.yourLocation=Your Location
+torConnect.unblockInternetIn=Unblock the Internet in
torConnect.tryBridge=Try a Bridge
torConnect.automatic=Automatic
torConnect.selectCountryRegion=Select Country or Region
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0aac5d…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/0aac5d…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
72a7273f by Pier Angelo Vendrame at 2023-02-14T09:20:11+01:00
Update Privacy Browser installer icon
- - - - -
1 changed file:
- projects/browser/windows-installer/privacybrowser.ico
Changes:
=====================================
projects/browser/windows-installer/privacybrowser.ico
=====================================
Binary files a/projects/browser/windows-installer/privacybrowser.ico and b/projects/browser/windows-installer/privacybrowser.ico differ
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/7…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
6211ac98 by Pier Angelo Vendrame at 2023-02-13T09:41:26+01:00
Bug 40772: Support HiDPI displays in the installer
- - - - -
1 changed file:
- projects/browser/windows-installer.nsi
Changes:
=====================================
projects/browser/windows-installer.nsi
=====================================
@@ -28,6 +28,9 @@
;Request application privileges for Windows Vista
RequestExecutionLevel user
+ ;Support HiDPI displays
+ ManifestDPIAware true
+
;--------------------------------
;Interface Configuration
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/6…
You're receiving this email because of your account on gitlab.torproject.org.
Richard Pospesel pushed to branch tor-browser-102.8.0esr-12.0-1 at The Tor Project / Applications / Tor Browser
Commits:
1003e89a by Pier Angelo Vendrame at 2023-02-10T13:17:04+00:00
fixup! Firefox preference overrides.
Document why we are locking toolkit.telemetry.enabled.
(cherry picked from commit 933d8c65af7f04677f7bc0ec672088f66ed0a9c9)
- - - - -
1 changed file:
- browser/app/profile/001-base-profile.js
Changes:
=====================================
browser/app/profile/001-base-profile.js
=====================================
@@ -116,6 +116,7 @@ pref("datareporting.healthreport.uploadEnabled", false);
pref("datareporting.policy.dataSubmissionEnabled", false);
// Make sure Unified Telemetry is really disabled, see: #18738.
pref("toolkit.telemetry.unified", false);
+// This needs to be locked, or nightly builds will automatically lock it to true
pref("toolkit.telemetry.enabled", false, locked);
pref("toolkit.telemetry.server", "data:,");
pref("toolkit.telemetry.archive.enabled", false);
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1003e89…
--
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1003e89…
You're receiving this email because of your account on gitlab.torproject.org.