August 2019 - tor-commits - lists.torproject.org

[snowflake/master] Add translation submodule
by arlo＠torproject.org 26 Aug '19

26 Aug '19

commit a0dd3d9edcd9421ac82f33960815e5fab7d00d53 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Aug 22 10:52:57 2019 -0400 Add translation submodule At the head of the snowflakeaddon-messages.json_completed branch --- .gitmodules | 3 +++ proxy/translation | 1 + 2 files changed, 4 insertions(+) diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..c217344 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "proxy/translation"] + path = proxy/translation + url = https://git.torproject.org/translation.git diff --git a/proxy/translation b/proxy/translation new file mode 160000 index 0000000..b4ac40c --- /dev/null +++ b/proxy/translation @@ -0,0 +1 @@ +Subproject commit b4ac40c1c71c691864388257c82bdeb881501c9e

1 0

[snowflake/master] Copy completed translations over when building
by arlo＠torproject.org 26 Aug '19

26 Aug '19

commit 9c20ab398484301a8eb2b45db2aa2320a0b44b40 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Aug 22 11:23:15 2019 -0400 Copy completed translations over when building --- proxy/make.js | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/proxy/make.js b/proxy/make.js index 58b7fce..2aa0bf4 100755 --- a/proxy/make.js +++ b/proxy/make.js @@ -37,11 +37,15 @@ var SHARED_FILES = [ ]; var concatJS = function(outDir, init, outFile) { - var files; - files = FILES.concat(`init-${init}.js`); + var files = FILES.concat(`init-${init}.js`); execSync(`cat ${files.join(' ')} > ${outDir}/${outFile}`); }; +var copyTranslations = function(outDir) { + execSync('git submodule update --init -- translation') + execSync(`cp -rf translation/* ${outDir}/_locales/`); +}; + var tasks = new Map(); var task = function(key, msg, func) { @@ -68,16 +72,20 @@ task('test', 'snowflake unit tests', function() { }); task('build', 'build the snowflake proxy', function() { - execSync('rm -rf build'); - execSync('cp -r ' + STATIC + '/ build/'); - concatJS('build', 'badge', 'embed.js'); + const outDir = 'build'; + execSync(`rm -rf ${outDir}`); + execSync(`cp -r ${STATIC}/ ${outDir}/`); + copyTranslations(outDir); + concatJS(outDir, 'badge', 'embed.js'); console.log('Snowflake prepared.'); }); task('webext', 'build the webextension', function() { - execSync('mkdir -p webext'); - execSync(`cp -r ${STATIC}/{${SHARED_FILES.join(',')}} webext/`, { shell: '/bin/bash' }); - concatJS('webext', 'webext', 'snowflake.js'); + const outDir = 'webext'; + execSync(`git clean -f -x -d ${outDir}/`); + execSync(`cp -r ${STATIC}/{${SHARED_FILES.join(',')}} ${outDir}/`, { shell: '/bin/bash' }); + copyTranslations(outDir); + concatJS(outDir, 'webext', 'snowflake.js'); console.log('Webextension prepared.'); });

1 0

[snowflake/master] Get badge locale from navigator.language
by arlo＠torproject.org 26 Aug '19

26 Aug '19

commit 1e33ae830f739a7d61e03ea1626f5e71ba175cbc Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Aug 15 17:32:21 2019 -0400 Get badge locale from navigator.language --- proxy/init-badge.js | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/proxy/init-badge.js b/proxy/init-badge.js index b906f62..1acc923 100644 --- a/proxy/init-badge.js +++ b/proxy/init-badge.js @@ -82,6 +82,26 @@ function setSnowflakeCookie(val, expires) { document.cookie = `${COOKIE_NAME}=${val}; path=/; expires=${expires};`; } +const defaultLang = 'en_US'; +const availableLangs = new Set([ + 'en_US', +]); + +// Resolve as in, +// https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Inte… +function getLang() { + let lang = navigator.language || defaultLang; + lang = lang.replace(/-/g, '_'); + if (availableLangs.has(lang)) { + return lang; + } + lang = lang.split('_')[0]; + if (availableLangs.has(lang)) { + return lang; + } + return defaultLang; +} + var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotifications, query; (function() { @@ -171,8 +191,7 @@ var debug, snowflake, config, broker, ui, log, dbg, init, update, silenceNotific }; window.onload = function() { - const lang = 'en_US'; - fetch(`./_locales/${lang}/messages.json`) + fetch(`./_locales/${getLang()}/messages.json`) .then((res) => { if (!res.ok) { return; } return res.json();

1 0

[snowflake/master] Automate generating the list of available languages for the badge
by arlo＠torproject.org 26 Aug '19

26 Aug '19

commit 1c550599b8239161fe8ea2bb8bb2541225770453 Author: Arlo Breault <arlolra(a)gmail.com> Date: Thu Aug 22 12:28:26 2019 -0400 Automate generating the list of available languages for the badge Note that getMessage in the badge depends on having a complete set of translations, unlike the webextension, which will fallback to the default for a string. --- proxy/init-badge.js | 5 +---- proxy/make.js | 27 ++++++++++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) diff --git a/proxy/init-badge.js b/proxy/init-badge.js index 1acc923..ed6dee9 100644 --- a/proxy/init-badge.js +++ b/proxy/init-badge.js @@ -1,4 +1,4 @@ -/* global Util, Params, Config, UI, Broker, Snowflake, Popup, Parse */ +/* global Util, Params, Config, UI, Broker, Snowflake, Popup, Parse, availableLangs */ /* UI @@ -83,9 +83,6 @@ function setSnowflakeCookie(val, expires) { } const defaultLang = 'en_US'; -const availableLangs = new Set([ - 'en_US', -]); // Resolve as in, // https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Inte… diff --git a/proxy/make.js b/proxy/make.js index 2aa0bf4..928c9ba 100755 --- a/proxy/make.js +++ b/proxy/make.js @@ -2,6 +2,7 @@ /* global require, process */ +var { writeFileSync, readdirSync, statSync } = require('fs'); var { execSync, spawn } = require('child_process'); // All files required. @@ -36,9 +37,11 @@ var SHARED_FILES = [ '_locales', ]; -var concatJS = function(outDir, init, outFile) { +var concatJS = function(outDir, init, outFile, pre) { var files = FILES.concat(`init-${init}.js`); - execSync(`cat ${files.join(' ')} > ${outDir}/${outFile}`); + var outPath = `${outDir}/${outFile}`; + writeFileSync(outPath, pre, 'utf8'); + execSync(`cat ${files.join(' ')} >> ${outPath}`); }; var copyTranslations = function(outDir) { @@ -46,6 +49,20 @@ var copyTranslations = function(outDir) { execSync(`cp -rf translation/* ${outDir}/_locales/`); }; +var availableLangs = function() { + let out = "const availableLangs = new Set([\n"; + let dirs = readdirSync('translation').filter((f) => { + const s = statSync(`translation/${f}`); + return s.isDirectory(); + }); + dirs.push('en_US'); + dirs.sort(); + dirs = dirs.map(d => ` '${d}',`); + out += dirs.join("\n"); + out += "\n]);\n\n"; + return out; +}; + var tasks = new Map(); var task = function(key, msg, func) { @@ -76,7 +93,7 @@ task('build', 'build the snowflake proxy', function() { execSync(`rm -rf ${outDir}`); execSync(`cp -r ${STATIC}/ ${outDir}/`); copyTranslations(outDir); - concatJS(outDir, 'badge', 'embed.js'); + concatJS(outDir, 'badge', 'embed.js', availableLangs()); console.log('Snowflake prepared.'); }); @@ -85,13 +102,13 @@ task('webext', 'build the webextension', function() { execSync(`git clean -f -x -d ${outDir}/`); execSync(`cp -r ${STATIC}/{${SHARED_FILES.join(',')}} ${outDir}/`, { shell: '/bin/bash' }); copyTranslations(outDir); - concatJS(outDir, 'webext', 'snowflake.js'); + concatJS(outDir, 'webext', 'snowflake.js', ''); console.log('Webextension prepared.'); }); task('node', 'build the node binary', function() { execSync('mkdir -p build'); - concatJS('build', 'node', 'snowflake.js'); + concatJS('build', 'node', 'snowflake.js', ''); console.log('Node prepared.'); });

1 0

[snowflake/master] Bump proxy/translation to HEAD of snowflakeaddon-messages.json_completed
by arlo＠torproject.org 26 Aug '19

26 Aug '19

commit 9faf8293e6614d559758fcd1fa4a76419f92dd55 Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Aug 23 21:54:56 2019 -0400 Bump proxy/translation to HEAD of snowflakeaddon-messages.json_completed --- proxy/translation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/translation b/proxy/translation index b4ac40c..75d3b03 160000 --- a/proxy/translation +++ b/proxy/translation @@ -1 +1 @@ -Subproject commit b4ac40c1c71c691864388257c82bdeb881501c9e +Subproject commit 75d3b037adf2041b772265e7c1d4e7b3091bc5b8

1 0

[snowflake/master] Add branch to .gitmodule + bump to bbf11bb
by arlo＠torproject.org 26 Aug '19

26 Aug '19

commit 131cf4f8ea0faaa41774e52f5d81878803f45dbc Author: Arlo Breault <arlolra(a)gmail.com> Date: Mon Aug 26 12:09:41 2019 -0400 Add branch to .gitmodule + bump to bbf11bb This allows you to run `git submodule update --remote` to bump to the latest commit on that branch. --- .gitmodules | 1 + proxy/translation | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c217344..5f79304 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,4 @@ [submodule "proxy/translation"] path = proxy/translation url = https://git.torproject.org/translation.git + branch = snowflakeaddon-messages.json_completed diff --git a/proxy/translation b/proxy/translation index 75d3b03..bbf11bb 160000 --- a/proxy/translation +++ b/proxy/translation @@ -1 +1 @@ -Subproject commit 75d3b037adf2041b772265e7c1d4e7b3091bc5b8 +Subproject commit bbf11bb0c9f1aca4f6b18c6505645f85e2fa1986

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 26 Aug '19

26 Aug '19

commit 2ed4dd4338f2497f518584820acf7ec935a805eb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 26 18:58:25 2019 +0000 Update translations for torcheck --- ta/torcheck.po | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ta/torcheck.po b/ta/torcheck.po index baa305ca9..a3bd9e43e 100644 --- a/ta/torcheck.po +++ b/ta/torcheck.po @@ -4,13 +4,14 @@ # Translators: # Arun M S <arunistheking(a)yahoo.co.in>, 2015 # git12a <git12(a)openmailbox.org>, 2015 +# Stymy RAT, 2019 # Khaleel Jageer <jskcse4(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2019-04-09 01:51+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-08-26 18:57+0000\n" +"Last-Translator: Stymy RAT\n" "Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "Tor உலாவிக்கு ஒரு பாதுகாப்பு msgid "" "<a href=\"https://www.torproject.org/download/\">Click here to go to the " "download page</a>" -msgstr "" +msgstr "<a href=\"https://www.torproject.org/download/\">பதிவிறக்கு பக்கத்திற்குச் செல்ல இங்கே கிளிக் செய்க</a>" msgid "Sorry. You are not using Tor." msgstr "மன்னிக்கவும். நீங்கள் Tor பயன்படுத்தவில்லை." @@ -91,7 +92,7 @@ msgid "Run a Relay" msgstr "ஓரு ரிலே இயக்கவும்" msgid "Stay Anonymous" -msgstr "அநாமதேயமாக இருன்கல்" +msgstr "அநாமதேயமாக இருங்கள்" msgid "Relay Search" -msgstr "" +msgstr "இடைமாற்றுத் தேடல்"

1 0

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 26 Aug '19

26 Aug '19

commit 6afffebd013c9678e1aab40851c52e3a01f80cbe Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 26 18:57:50 2019 +0000 Update translations for torbutton-abouttbupdatedtd --- ta/abouttbupdate.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ta/abouttbupdate.dtd b/ta/abouttbupdate.dtd index 72252229b..6ad7d2828 100644 --- a/ta/abouttbupdate.dtd +++ b/ta/abouttbupdate.dtd @@ -1,8 +1,8 @@ -<!ENTITY aboutTBUpdate.changelogTitle "Tor Browser Changelog"> +<!ENTITY aboutTBUpdate.changelogTitle "Tor உலாவியின் மாற்றப்பதிவேடு"> <!ENTITY aboutTBUpdate.updated "Tor உலாவி புதுப்பிக்கப்பட்டது."> <!ENTITY aboutTBUpdate.linkPrefix "இந்த வெளியீடு பற்றிய தற்சமய தகவல்களுக்கு,"> <!ENTITY aboutTBUpdate.linkLabel "எங்கள் வலைதளத்தை வருகை தருக"> <!ENTITY aboutTBUpdate.linkSuffix "."> <!ENTITY aboutTBUpdate.version "பதிப்பு"> -<!ENTITY aboutTBUpdate.releaseDate "Release Date"> -<!ENTITY aboutTBUpdate.releaseNotes "Release Notes"> +<!ENTITY aboutTBUpdate.releaseDate "வெளியிடு தேதி"> +<!ENTITY aboutTBUpdate.releaseNotes "வெளியிடு குறிப்புகள்">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 26 Aug '19

26 Aug '19

commit 51b5b92eb53ea72d9339203b5f93409f5ab8c93c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 26 18:45:05 2019 +0000 Update translations for abouttor-homepage --- ta/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ta/aboutTor.dtd b/ta/aboutTor.dtd index 630f3fb5c..7d4482424 100644 --- a/ta/aboutTor.dtd +++ b/ta/aboutTor.dtd @@ -6,7 +6,7 @@ <!ENTITY aboutTor.title "Tor ஐ பற்றி"> -<!ENTITY aboutTor.viewChangelog.label "View Changelog"> +<!ENTITY aboutTor.viewChangelog.label "மாற்றப்பதிவேட்டைக் காண்க"> <!ENTITY aboutTor.ready.label "உலாவுக. தனியுரிமையுடன்."> <!ENTITY aboutTor.ready2.label "நீங்கள் உலகின் மிகவும் தனிப்பட்ட உலாவல் அனுபவத்திற்கு தயாராக உள்ளீர்கள்."> @@ -31,5 +31,5 @@ <!ENTITY aboutTor.donationBanner.line2e "Tor ஐ வலிமையாக வைத்திருங்கள்."> <!ENTITY aboutTor.donationBanner.buttonA "இப்போதே நன்கொடையளியுங்கள்"> -<!ENTITY aboutTor.donationBanner3.line1 "Automatic monthly donations keep Tor strong."> -<!ENTITY aboutTor.donationBanner3.line2 "Become a Defender of Privacy today."> +<!ENTITY aboutTor.donationBanner3.line1 "தானியக்க மாத நன்கொடைகள் Tor-ஐ வலுவாக வைத்திருக்கும்"> +<!ENTITY aboutTor.donationBanner3.line2 "இன்றே ஒரு தனியுரிமைக் காப்பாளராகுக">

1 0

[tor/master] Merge branch 'tor-github/pr/1239'
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit d819dfbdede4aafe78b61c02ad8d712fc9e4fc72 Merge: 859514d47 0bf980705 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Aug 26 14:35:27 2019 -0400 Merge branch 'tor-github/pr/1239' src/test/test_circuitbuild.c | 1 + 1 file changed, 1 insertion(+)

1 0