apply jeremy's patch for osx tbb and language issues.
Andrew Lewman commited on 2011-09-06 20:49:32
Zeige 2 geänderte Dateien mit 29 Einfügungen und 42 Löschungen.
- download/en/download.wml a57ae7737..0cee57ec4
- include/dlhead.wmi ad02c8fec..56e89de5e
| ... | ... |
@@ -1,15 +1,24 @@ |
| 1 | 1 |
## translation metadata |
| 2 | 2 |
# Revision: $Revision$ |
| 3 | 3 |
# Translation-Priority: 3-low |
| 4 |
-#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" |
|
| 5 | 4 |
|
| 6 | 5 |
#<!-- ATTENTION TRANSLATOR --> |
| 7 |
-#<!-- You MUST copy 'dlhead.wmi' and 'lang.wmi' along with this file! --> |
|
| 6 |
+#<!-- You MUST copy '/include/lang.wmi' along with this file! --> |
|
| 8 | 7 |
|
| 9 | 8 |
#<!-- TBB DEFAULT LANGUAGE: Change 'en-US' below to your language code (if package exists)--> |
| 10 | 9 |
#<!-- IMPORTANT: You MUST also change the default selection in 'lang.wmi' --> |
| 11 | 10 |
<define-tag lang>en-US</define-tag> |
| 12 | 11 |
|
| 12 |
+#<!-- Download button text for language enabled packages --> |
|
| 13 |
+<define-tag button-win-tbb32>Tor Browser Bundle</define-tag> |
|
| 14 |
+<define-tag button-win-tbb64>Currently Unused</define-tag> |
|
| 15 |
+<define-tag button-osx-tbb32>Tor Browser Bundle (Beta)</define-tag> |
|
| 16 |
+<define-tag button-osx-tbb64>64-bit (Beta)</define-tag> |
|
| 17 |
+<define-tag button-lin-tbb32>Tor Browser Bundle (Beta)</define-tag> |
|
| 18 |
+<define-tag button-lin-tbb64>64-bit (Beta)</define-tag> |
|
| 19 |
+ |
|
| 20 |
+#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" |
|
| 21 |
+ |
|
| 13 | 22 |
<div id="content" class="clearfix"> |
| 14 | 23 |
<div id="breadcrumbs"><a href="<page index>">Home » </a><a href="<page download/download>">Download</a></div> |
| 15 | 24 |
<div id="maincol-left"> |
| ... | ... |
@@ -28,9 +37,10 @@ |
| 28 | 37 |
<div class="accordionContent"> |
| 29 | 38 |
<div class="fauxhead"></div> |
| 30 | 39 |
<!-- TOR BROWSER BUNDLE --> |
| 40 |
+#<!-- NOTE - change language enabled button text at the top of this page --> |
|
| 31 | 41 |
<div class="package" style="padding-top: 13px; border-top: 0px;"> |
| 32 | 42 |
<form class="downloads"> |
| 33 |
- <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal">Tor Browser Bundle</span></a> |
|
| 43 |
+ <a class="button win-tbb" href="../dist/torbrowser/tor-browser-<version-torbrowserbundle>_<lang>.exe"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a> |
|
| 34 | 44 |
<select name="language" id="win-tbb" class="lang"> |
| 35 | 45 |
#include <lang.wmi> |
| 36 | 46 |
</select> |
| ... | ... |
@@ -119,21 +129,22 @@ |
| 119 | 129 |
<div class="accordionContent"> |
| 120 | 130 |
<div class="fauxhead"></div> |
| 121 | 131 |
<!-- TOR BROWSER BUNDLE --> |
| 132 |
+#<!-- NOTE - change language enabled button text at the top of this page --> |
|
| 122 | 133 |
<div class="package" style="padding-top: 13px; border-top: 0px;"> |
| 123 | 134 |
<form class="downloads"> |
| 124 |
- <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (32-bit Beta)</span></a> |
|
| 135 |
+ <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a> |
|
| 125 | 136 |
<select name="language" id="osx-tbb" class="lang"> |
| 126 | 137 |
#include <lang.wmi> |
| 127 | 138 |
</select> |
| 128 | 139 |
<div class="sig"> |
| 129 | 140 |
(<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> |
| 130 | 141 |
</div> |
| 131 |
- <a class="button osx-tbb" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (64-bit Beta)</span></a> |
|
| 132 |
- <select name="language" id="osx-tbb" class="lang"> |
|
| 142 |
+ <a class="button osx-tbb64" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a> |
|
| 143 |
+ <select name="language" id="osx-tbb64" class="lang"> |
|
| 133 | 144 |
#include <lang.wmi> |
| 134 | 145 |
</select> |
| 135 | 146 |
<div class="sig"> |
| 136 |
- (<a class="osx-tbb-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> |
|
| 147 |
+ (<a class="osx-tbb64-sig" href="../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-<lang>.zip.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> |
|
| 137 | 148 |
</div> |
| 138 | 149 |
<a href="<page projects/torbrowser-details>#build">Source Code</a> |
| 139 | 150 |
</form> |
| ... | ... |
@@ -168,9 +179,10 @@ |
| 168 | 179 |
<div class="accordionContent"> |
| 169 | 180 |
<div class="fauxhead"></div> |
| 170 | 181 |
<!-- TOR BROWSER BUNDLE --> |
| 182 |
+#<!-- NOTE - change language enabled button text at the top of this page --> |
|
| 171 | 183 |
<div class="package" style="padding-top: 13px; border-top: 0px;"> |
| 172 | 184 |
<form class="downloads"> |
| 173 |
- <a class="button lin-tbb32" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal">i686 / 32-bit (Beta)</span></a> |
|
| 185 |
+ <a class="button lin-tbb32" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a> |
|
| 174 | 186 |
<select name="language" id="lin-tbb32" class="lang"> |
| 175 | 187 |
#include <lang.wmi> |
| 176 | 188 |
</select> |
| ... | ... |
@@ -178,7 +190,7 @@ |
| 178 | 190 |
(<a class="lin-tbb32-sig" href="../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-<lang>.tar.gz.asc">sig</a>) <a class="siginfo" href="<page docs/verifying-signatures>">What's This?</a> |
| 179 | 191 |
</div> |
| 180 | 192 |
|
| 181 |
- <a class="button lin-tbb64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal">x86_64 / 64-bit (Beta)</span></a> |
|
| 193 |
+ <a class="button lin-tbb64" href="../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-<lang>.tar.gz"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a> |
|
| 182 | 194 |
<select name="language" id="lin-tbb64" class="lang"> |
| 183 | 195 |
#include <lang.wmi> |
| 184 | 196 |
</select> |
| ... | ... |
@@ -61,19 +61,23 @@ type="application/rss+xml">"> |
| 61 | 61 |
var lang = caller.val(); |
| 62 | 62 |
var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe'; |
| 63 | 63 |
var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-'+lang+'.zip'; |
| 64 |
+ var osxtbb64 = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-x86_64-'+lang+'.zip'; |
|
| 64 | 65 |
var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz'; |
| 65 | 66 |
var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz'; |
| 66 | 67 |
if(pkg == 'win-tbb'){
|
| 67 |
- $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'"><span class="strong">Download</span><span class="normal">Tor Browser Bundle</span></a>');
|
|
| 68 |
+ $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'"><span class="strong">Download</span><span class="normal"><button-win-tbb32></span></a>');
|
|
| 68 | 69 |
$('.'+pkg+'-sig').replaceWith('<a class="win-tbb-sig" href="'+wintbb+'.asc">sig</a>');
|
| 69 | 70 |
}else if(pkg == 'osx-tbb'){
|
| 70 |
- $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'"><span class="strong">Download</span><span class="normal">Tor Browser Bundle (Beta)</span></a>');
|
|
| 71 |
+ $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'"><span class="strong">Download</span><span class="normal"><button-osx-tbb32></span></a>');
|
|
| 71 | 72 |
$('.'+pkg+'-sig').replaceWith('<a class="osx-tbb-sig" href="'+osxtbb+'.asc">sig</a>');
|
| 73 |
+ }else if(pkg == 'osx-tbb64'){
|
|
| 74 |
+ $('.'+pkg).replaceWith('<a class="button osx-tbb64" href="'+osxtbb64+'"><span class="strong">Download</span><span class="normal"><button-osx-tbb64></span></a>');
|
|
| 75 |
+ $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb64-sig" href="'+osxtbb64+'.asc">sig</a>');
|
|
| 72 | 76 |
}else if(pkg == 'lin-tbb32'){
|
| 73 |
- $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal">i686 / 32-bit (Beta)</span></a>');
|
|
| 77 |
+ $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb32></span></a>');
|
|
| 74 | 78 |
$('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>');
|
| 75 | 79 |
}else if(pkg == 'lin-tbb64'){
|
| 76 |
- $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal">x86_64 / 64-bit (Beta)</span></a>');
|
|
| 80 |
+ $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'"><span class="strong">Download</span><span class="normal"><button-lin-tbb64></span></a>');
|
|
| 77 | 81 |
$('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>');
|
| 78 | 82 |
} |
| 79 | 83 |
} |
| ... | ... |
@@ -85,35 +89,6 @@ type="application/rss+xml">"> |
| 85 | 89 |
$('.lang').css('display', 'block');
|
| 86 | 90 |
}); |
| 87 | 91 |
</script> |
| 88 |
- <script async type="text/javascript"> |
|
| 89 |
- function displayVals() {
|
|
| 90 |
- var t3 = $("#t3").val();
|
|
| 91 |
- var amount = $("#amount").val();
|
|
| 92 |
- if(t3 != 0){
|
|
| 93 |
- $('#a3').val(amount);
|
|
| 94 |
- $('#p3').val(1);
|
|
| 95 |
- $('#cmd').val('_xclick-subscriptions');
|
|
| 96 |
- $('#item_name').val('Tor Project Membership');
|
|
| 97 |
- $('#ppinfo').replaceWith('<h6 id="ppinfo"><small>(Requires a PayPal Account)</small></h6>');
|
|
| 98 |
- }else{
|
|
| 99 |
- $('#a3').val(0);
|
|
| 100 |
- $('#p3').val(0);
|
|
| 101 |
- $('#cmd').val('_donations');
|
|
| 102 |
- $('#item_name').val('Donation to the Tor Project');
|
|
| 103 |
- $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
|
|
| 104 |
- } |
|
| 105 |
- if( !t3 ) {
|
|
| 106 |
- $('#cmd').val('_donations');
|
|
| 107 |
- $('#item_name').val('Donation to the Tor Project');
|
|
| 108 |
- $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>');
|
|
| 109 |
- } |
|
| 110 |
- } |
|
| 111 |
- $(function(){
|
|
| 112 |
- $("#amount").change(displayVals);
|
|
| 113 |
- $("#t3").change(displayVals);
|
|
| 114 |
- displayVals(); |
|
| 115 |
- }); |
|
| 116 |
- </script> |
|
| 117 | 92 |
</head> |
| 118 | 93 |
<body onload="resetAll()" onunload=""> |
| 119 | 94 |
<div id="wrap"> |
| 120 | 95 |