June 2013 - tor-commits - lists.torproject.org

[translation/tor-launcher-progress] Update translations for tor-launcher-progress
by translation＠torproject.org 10 Jun '13

10 Jun '13

commit d731aeb484a1c66f0518652b5bea8043d03bf70f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 10 01:46:23 2013 +0000 Update translations for tor-launcher-progress --- fa/progress.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fa/progress.dtd b/fa/progress.dtd index 81dfdfe..cd7ca8d 100644 --- a/fa/progress.dtd +++ b/fa/progress.dtd @@ -1,4 +1,4 @@ <!ENTITY torprogress.dialog.title "وضعیت تور"> -<!ENTITY torprogress.openSettings ""> +<!ENTITY torprogress.openSettings "تنظیمات‌را باز کنید"> <!ENTITY torprogress.heading "درحال اتصال به شبکه تُر"> -<!ENTITY torprogress.pleaseWait ""> +<!ENTITY torprogress.pleaseWait "مرورگر تور باز می‌شود بعد از این که ارتباطی با شبکهٔ تور برقرار شده‌باشد.">

1 0

[flashproxy/master] Style changes.
by dcf＠torproject.org 10 Jun '13

10 Jun '13

commit c09483a7772e76be543dde23f5a4445369cec38e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 9 18:26:28 2013 -0700 Style changes. --- proxy/flashproxy.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index b7444e1..d52a24b 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -379,10 +379,9 @@ function get_langs() { if (param !== undefined) result.push(param); - // https://developer.mozilla.org/en/docs/DOM/window.navigator.language - if (typeof navigator !== undefined && navigator.language) { - result.push(navigator.language) - } + /* https://developer.mozilla.org/en/docs/DOM/window.navigator.language */ + if (window.navigator.language) + result.push(window.navigator.language); return result; }

1 0

[flashproxy/master] Use navigator.language for badge localization
by dcf＠torproject.org 10 Jun '13

10 Jun '13

commit ac0e310b0b4527240a418fc53ddd0b700046a917 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat May 4 15:23:33 2013 -0700 Use navigator.language for badge localization See #8827 --- ChangeLog | 4 ++++ proxy/flashproxy.js | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/ChangeLog b/ChangeLog index 57696cc..5e03710 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,10 @@ o Language tags for badge localization are now case-insensitive. Patch by Eduardo Stalinho. Fixes bug 8829. + o The badge localization is taken from the JavaScript property + window.navigator.language when possible. Patch by Arlo Breault. + Fixes bug 8827. + Changes in version 1.1 o Programs that use certificate pins now take a --disable-pin option that causes pins to be ignored. diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index c6dc0cc..b7444e1 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -379,6 +379,11 @@ function get_langs() { if (param !== undefined) result.push(param); + // https://developer.mozilla.org/en/docs/DOM/window.navigator.language + if (typeof navigator !== undefined && navigator.language) { + result.push(navigator.language) + } + return result; }

1 0

[flashproxy/master] Export localized badges.
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit 0836c7c9479ca62d43d8a0d87624a6bff5b63c8f Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 9 12:08:22 2013 -0700 Export localized badges. --- proxy/badge-pt.png | Bin 414 -> 356 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/proxy/badge-pt.png b/proxy/badge-pt.png index e799117..84dc454 100644 Binary files a/proxy/badge-pt.png and b/proxy/badge-pt.png differ

1 0

[flashproxy/master] Automatic export of localized badge graphics
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit b0a74b6d793e79811467d714a042609027c3c816 Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat May 4 22:36:47 2013 -0700 Automatic export of localized badge graphics See #8830 --- proxy/Makefile | 14 +++++++++++++- proxy/export_badges.scm | 27 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/proxy/Makefile b/proxy/Makefile index e34df0c..9fad8e5 100644 --- a/proxy/Makefile +++ b/proxy/Makefile @@ -4,4 +4,16 @@ all: test: ./flashproxy-test.js -.PHONY: all test +LANGS = de en ru +badges: $(addprefix badge-, $(addsuffix .png, $(LANGS))) link + +link: + ln -s badge-en.png badge.png + +badge-%.png: badge.xcf + gimp -i -b '$(shell cat export_badges.scm) (eb "$*") (exit)' + +clean: + rm badge*.png + +.PHONY: all test badges link clean diff --git a/proxy/export_badges.scm b/proxy/export_badges.scm new file mode 100644 index 0000000..3a2aece --- /dev/null +++ b/proxy/export_badges.scm @@ -0,0 +1,27 @@ +(define (exit) + (gimp-quit 0)) + +(define file "badge.xcf") + +(define (find_layer_by_name image layers name) + (define (loop ls) + (cond + ((null? ls) (error "Could not find layer?")) + ((string=? (car (gimp-drawable-get-name (car ls))) name) (car ls)) + (else (loop (cdr ls))) + )) + (loop (vector->list layers))) + +(define (eb lang) + (let* ( + (image (car (gimp-file-load RUN-NONINTERACTIVE file file))) + (layers (cadr (gimp-image-get-layers image))) + (layer (find_layer_by_name image layers (string-append "text-" lang))) + (filename (string-append "badge-" lang ".png")) + ) + (gimp-drawable-set-visible layer TRUE) + (gimp-image-merge-visible-layers image CLIP-TO-IMAGE) + (file-png-save RUN-NONINTERACTIVE image + (car (gimp-image-get-active-layer image)) + filename filename FALSE 9 FALSE FALSE FALSE FALSE FALSE) + )) \ No newline at end of file

1 0

[flashproxy/master] Changes to badge exports.
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit 02fd753587926fc84b627719f9b654ac5d811e4d Author: Arlo Breault <arlolra(a)gmail.com> Date: Sat May 4 22:36:47 2013 -0700 Changes to badge exports. --- proxy/Makefile | 18 +++++------------- proxy/badge-export-lang.scm | 21 +++++++++++++++++++++ proxy/export_badges.scm | 27 --------------------------- 3 files changed, 26 insertions(+), 40 deletions(-) diff --git a/proxy/Makefile b/proxy/Makefile index 9fad8e5..8f3c9c7 100644 --- a/proxy/Makefile +++ b/proxy/Makefile @@ -1,19 +1,11 @@ -all: - : +LANGS = de en pt ru + +all: $(addprefix badge-, $(addsuffix .png, $(LANGS))) test: ./flashproxy-test.js -LANGS = de en ru -badges: $(addprefix badge-, $(addsuffix .png, $(LANGS))) link - -link: - ln -s badge-en.png badge.png - badge-%.png: badge.xcf - gimp -i -b '$(shell cat export_badges.scm) (eb "$*") (exit)' - -clean: - rm badge*.png + (cat badge-export-lang.scm; echo '(export "$*") (gimp-quit 0)') | gimp -i -b - -.PHONY: all test badges link clean +.PHONY: all test diff --git a/proxy/badge-export-lang.scm b/proxy/badge-export-lang.scm new file mode 100644 index 0000000..51f78f1 --- /dev/null +++ b/proxy/badge-export-lang.scm @@ -0,0 +1,21 @@ +; This is a Gimp script-fu script that selects and exports the appropriate +; language layers from an input XCF containing multiple layers. + +(define xcf-filename "badge.xcf") + +(define (export lang) + (let* ((image (car (gimp-file-load RUN-NONINTERACTIVE xcf-filename xcf-filename))) + (shine-layer (car (gimp-image-get-layer-by-name image "shine"))) + (text-layer (car (gimp-image-get-layer-by-name image (string-append "text-" lang)))) + (output-filename (string-append "badge-" lang ".png"))) + ; Turn off all layers. + (for-each (lambda (x) (gimp-item-set-visible x FALSE)) + (vector->list (cadr (gimp-image-get-layers image)))) + ; Except the shine and the wanted text. + (gimp-item-set-visible shine-layer TRUE) + (gimp-item-set-visible text-layer TRUE) + (gimp-image-merge-visible-layers image CLIP-TO-IMAGE) + (file-png-save RUN-NONINTERACTIVE image + (car (gimp-image-get-active-layer image)) + output-filename output-filename FALSE 9 FALSE FALSE FALSE FALSE FALSE) + )) diff --git a/proxy/export_badges.scm b/proxy/export_badges.scm deleted file mode 100644 index 3a2aece..0000000 --- a/proxy/export_badges.scm +++ /dev/null @@ -1,27 +0,0 @@ -(define (exit) - (gimp-quit 0)) - -(define file "badge.xcf") - -(define (find_layer_by_name image layers name) - (define (loop ls) - (cond - ((null? ls) (error "Could not find layer?")) - ((string=? (car (gimp-drawable-get-name (car ls))) name) (car ls)) - (else (loop (cdr ls))) - )) - (loop (vector->list layers))) - -(define (eb lang) - (let* ( - (image (car (gimp-file-load RUN-NONINTERACTIVE file file))) - (layers (cadr (gimp-image-get-layers image))) - (layer (find_layer_by_name image layers (string-append "text-" lang))) - (filename (string-append "badge-" lang ".png")) - ) - (gimp-drawable-set-visible layer TRUE) - (gimp-image-merge-visible-layers image CLIP-TO-IMAGE) - (file-png-save RUN-NONINTERACTIVE image - (car (gimp-image-get-active-layer image)) - filename filename FALSE 9 FALSE FALSE FALSE FALSE FALSE) - )) \ No newline at end of file

1 0

[flashproxy/master] Sort badge.xcf layers by language.
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit 383e78e72647d332bf55bda73b2ba45d5b630009 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 9 11:04:02 2013 -0700 Sort badge.xcf layers by language. --- proxy/badge.xcf | Bin 3690 -> 3690 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/proxy/badge.xcf b/proxy/badge.xcf index a8b3090..cc3af06 100644 Binary files a/proxy/badge.xcf and b/proxy/badge.xcf differ

1 0

[flashproxy/master] adding portuguese translation for badge
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit cba67ee6a1f89811b548f98607d326d0a3f082a0 Author: Eduardo Stalinho <eduardooc.86(a)gmail.com> Date: Thu Jun 6 02:01:32 2013 -0300 adding portuguese translation for badge --- proxy/badge-pt.png | Bin 0 -> 414 bytes proxy/badge.xcf | Bin 2962 -> 3690 bytes proxy/flashproxy.js | 1 + 3 files changed, 1 insertion(+) diff --git a/proxy/badge-pt.png b/proxy/badge-pt.png new file mode 100644 index 0000000..e799117 Binary files /dev/null and b/proxy/badge-pt.png differ diff --git a/proxy/badge.xcf b/proxy/badge.xcf index 24bd745..a8b3090 100644 Binary files a/proxy/badge.xcf and b/proxy/badge.xcf differ diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 17e1a29..c6dc0cc 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -885,6 +885,7 @@ function escape_html(s) { var LOCALIZATIONS = { "en": { filename: "badge-en.png", text: "Internet Freedom" }, "de": { filename: "badge-de.png", text: "Internetfreiheit" }, + "pt": { filename: "badge-pt.png", text: "Internet Livre" }, "ru": { filename: "badge-ru.png", text: "Свобода Интернета" } }; var DEFAULT_LOCALIZATION = { filename: "badge.png", text: "Internet Freedom" };

1 0

[flashproxy/master] Brace position in flashproxy-test.js.
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit 991f97479f93b037fa639a27f1af2e678af8086c Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 9 10:52:01 2013 -0700 Brace position in flashproxy-test.js. --- proxy/flashproxy-test.js | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index e17df66..1456319 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -15,8 +15,7 @@ var document = {cookie: ""}; load("flashproxy.js"); -function objects_equal(a, b) -{ +function objects_equal(a, b) { if ((a === null) != (b === null)) return false; if (typeof a != typeof b) @@ -37,8 +36,7 @@ function objects_equal(a, b) } var top = true; -function announce(test_name) -{ +function announce(test_name) { if (VERBOSE) { if (!top) print(); @@ -47,22 +45,19 @@ function announce(test_name) top = false; } -function pass(test) -{ +function pass(test) { num_tests++; if (VERBOSE) print("PASS " + repr(test)); } -function fail(test, expected, actual) -{ +function fail(test, expected, actual) { num_tests++; num_failed++; print("FAIL " + repr(test) + " expected: " + repr(expected) + " actual: " + repr(actual)); } -function test_build_url() -{ +function test_build_url() { var TESTS = [ { args: ["http", "example.com"], expected: "http://example.com" }, @@ -112,8 +107,7 @@ function test_build_url() several properties about this string, for example cookie names are unique with no trailing whitespace. See http://www.ietf.org/rfc/rfc2965.txt for the grammar. */ -function test_parse_cookie_string() -{ +function test_parse_cookie_string() { var TESTS = [ { cs: "", expected: { } }, @@ -150,8 +144,7 @@ function test_parse_cookie_string() } } -function test_parse_query_string() -{ +function test_parse_query_string() { var TESTS = [ { qs: "", expected: { } }, @@ -203,8 +196,7 @@ function test_parse_query_string() } } -function test_get_param_boolean() -{ +function test_get_param_boolean() { var TESTS = [ { qs: "param=true", expected: true }, @@ -239,8 +231,7 @@ function test_get_param_boolean() } } -function test_parse_addr_spec() -{ +function test_parse_addr_spec() { var TESTS = [ { spec: "", expected: null }, @@ -281,8 +272,7 @@ function test_parse_addr_spec() } } -function test_get_param_addr() -{ +function test_get_param_addr() { var DEFAULT = { host: "1.1.1.1", port: 2222 }; var TESTS = [ { query: { }, @@ -308,8 +298,7 @@ function test_get_param_addr() } } -function test_lang_keys() -{ +function test_lang_keys() { var TESTS = [ { code: "de", expected: ["de"] }, { code: "DE", expected: ["de"] },

1 0

[flashproxy/master] Make language tags case-insensitive.
by dcf＠torproject.org 09 Jun '13

09 Jun '13

commit dc77ed376ca0dc35bce4779ca4742f64c20a2229 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 9 10:50:45 2013 -0700 Make language tags case-insensitive. --- ChangeLog | 3 +++ proxy/flashproxy-test.js | 2 ++ proxy/flashproxy.js | 1 + 3 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 01e12bd..57696cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -15,6 +15,9 @@ o The badge localization now understands language subtags such as "ru-RU". Fixes bug 8828. + o Language tags for badge localization are now case-insensitive. + Patch by Eduardo Stalinho. Fixes bug 8829. + Changes in version 1.1 o Programs that use certificate pins now take a --disable-pin option that causes pins to be ignored. diff --git a/proxy/flashproxy-test.js b/proxy/flashproxy-test.js index 9615588..e17df66 100755 --- a/proxy/flashproxy-test.js +++ b/proxy/flashproxy-test.js @@ -312,7 +312,9 @@ function test_lang_keys() { var TESTS = [ { code: "de", expected: ["de"] }, + { code: "DE", expected: ["de"] }, { code: "de-at", expected: ["de-at", "de"] }, + { code: "de-AT", expected: ["de-at", "de"] }, ]; for (var i = 0; i < TESTS.length; i++) { var test = TESTS[i]; diff --git a/proxy/flashproxy.js b/proxy/flashproxy.js index 0ecc4dd..17e1a29 100644 --- a/proxy/flashproxy.js +++ b/proxy/flashproxy.js @@ -891,6 +891,7 @@ var DEFAULT_LOCALIZATION = { filename: "badge.png", text: "Internet Freedom" }; /* Return an array of progressively less specific language tags, canonicalized for lookup in LOCALIZATIONS. */ function lang_keys(code) { + code = code.toLowerCase(); var result = [code]; var m = code.match(/^(\w+)/); if (m !== null) {

1 0