Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: includes/index.tmpl

Issue 29424810: Issue 5191 - Add Terms of Use to adblockplus.org homepage (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org
Patch Set: Fixed has_string Created May 2, 2017, 8:43 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « globals/platforms.py ('k') | locales/fr/index.json » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 title=Adblock Plus - Surf the web without annoying ads! 1 title=Adblock Plus - Surf the web without annoying ads!
2 noheading=True 2 noheading=True
3 localefile=index 3 localefile=index
4 4
5 {# 5 {#
6 # This file is part of the Adblock Plus website, 6 # This file is part of the Adblock Plus website,
7 # Copyright (C) 2006-2017 eyeo GmbH 7 # Copyright (C) 2006-2017 eyeo GmbH
8 # 8 #
9 # Adblock Plus is free software: you can redistribute it and/or modify 9 # Adblock Plus is free software: you can redistribute it and/or modify
10 # it under the terms of the GNU General Public License version 3 as 10 # it under the terms of the GNU General Public License version 3 as
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 <div class="sprite"></div> 60 <div class="sprite"></div>
61 {{"It's free for users and open source (<a href=\"https://www.gnu.org/ licenses/gpl.html\">GPLv3</a>)"|translate("gplv3-license")}} 61 {{"It's free for users and open source (<a href=\"https://www.gnu.org/ licenses/gpl.html\">GPLv3</a>)"|translate("gplv3-license")}}
62 </li> 62 </li>
63 <li id="feature-maxthon" itemprop="featureList"> 63 <li id="feature-maxthon" itemprop="featureList">
64 <div class="sprite"></div> 64 <div class="sprite"></div>
65 {{"Integrated by default in"|translate("s11")}} <a href="http://www.ma xthon.com/" target="_blank">{{"Maxthon Cloud Browser"|translate("s12")}}</a> 65 {{"Integrated by default in"|translate("s11")}} <a href="http://www.ma xthon.com/" target="_blank">{{"Maxthon Cloud Browser"|translate("s12")}}</a>
66 </li> 66 </li>
67 </ul> 67 </ul>
68 </div> 68 </div>
69 69
70 {% if locale == "en" or has_string("terms-message", "index") %}
saroyanm 2017/05/02 09:26:37 We should check against "defaultlocale" I think in
saroyanm 2017/05/02 09:26:37 This is wrong, the string can be translated while
juliandoucette 2017/05/02 10:22:12 I agree. But I don't know how to do this without c
juliandoucette 2017/05/02 10:22:12 Acknowledged.
juliandoucette 2017/05/02 10:32:01 Done.
juliandoucette 2017/05/02 10:32:01 Detail: I think that we have to check if the messa
71 <p class="terms-message">
72 {{ "By clicking the Agree and Install button below, you agree to our <a href='terms'>Terms of Use</a>." | translate("terms-message", "Terms of use messa ge") }}
73 </p>
74 {% endif %}
75
70 <h3 class="edge-message"> 76 <h3 class="edge-message">
71 {{"Adblock Plus for Microsoft Edge requires Windows 10 Anniversary Update" |translate("edge-message")}} 77 {{"Adblock Plus for Microsoft Edge requires Windows 10 Anniversary Update" |translate("edge-message")}}
72 </h3> 78 </h3>
73 79
74 <div id="install"> 80 <div id="install">
75 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplusfirefox.xpi" id="install-firefox">{{"Install for Firefox"|translate("s13" )}}</a> 81 {% for platform_id in platforms %}
76 <a class="install-button" href="https://chrome.google.com/webstore/detail/ cfhdojbkjhnklbpkdaibdccddilifddb" id="install-chrome" onclick="chrome.webstore.i nstall(); return false;">{{"Install for Chrome"|translate("s14")}}</a> 82 {% set platform = platforms[platform_id] %}
77 <a class="install-button" href="https://addons.opera.com/extensions/detail s/opera-adblock/?display=en-US" id="install-opera">{{"Install for Opera"|transla te("s15")}}</a> 83 <a
78 <a class="install-button" href="android-install" id="install-android">{{"I nstall for Android"|translate("s16")}}</a> 84 id="install-{{ platform_id }}"
79 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplusie.exe" id="install-internet-explorer">{{"Install for Internet Explorer"| translate("s17")}}</a> 85 class="install-button"
80 <a class="install-button" href="https://update.adblockplus.org/latest/adbl ockplussafari.safariextz" id="install-safari">{{"Install for Safari"|translate(" s18")}}</a> 86 {% if platform_id in ('chrome', 'yandex-browser') %}
81 <a class="install-button" href="https://chrome.google.com/webstore/detail/ cfhdojbkjhnklbpkdaibdccddilifddb" id="install-yandex-browser" onclick="chrome.we bstore.install(); return false;">{{"Install for Yandex Browser"|translate("s19") }}</a> 87 onclick="chrome.webstore.install(); return false;"
82 <a class="install-button" href="ms-windows-store://pdp/?ProductId=9nblggh4 r9nz" id="install-edge">{{"Install for Microsoft Edge"|translate("install-edge") }}</a> 88 {% endif %}
89 href="{{ platform.href }}">
90 {% if locale == "en" or has_string(("agree-install-%s" % platform_id), "index") %}
91 {{ ("Agree and Install for <fix>%s</fix>" % platform.label) | transl ate(("agree-install-%s" % platform_id), "button label") }}
92 {% else %}
93 {{ ("Install for <fix>%s</fix>" % platform.label) | translate(("inst all-%s" % platform_id), "button label") }}
94 {% endif %}
95 </a>
96 {% endfor %}
83 </div> 97 </div>
84 98
85 <div id="other-platform"> 99 <div id="other-platform">
86 <div>{{"Download Adblock Plus for another platform"|translate("other-pla tform")}}</div> 100 <div>{{"Download Adblock Plus for another platform"|translate("other-pla tform")}}</div>
87 <ul> 101 <ul>
88 <li> 102 <li>
89 <a class="sprite" href="firefox" id="platform-firefox" title="{{"Adb lock Plus for Firefox"|translate("s20")}}"></a> 103 <a class="sprite" href="firefox" id="platform-firefox" title="{{"Adb lock Plus for Firefox"|translate("s20")}}"></a>
90 </li> 104 </li>
91 <li> 105 <li>
92 <a class="sprite" href="chrome" id="platform-chrome" title="{{"Adblo ck Plus for Chrome"|translate("s21")}}"></a> 106 <a class="sprite" href="chrome" id="platform-chrome" title="{{"Adblo ck Plus for Chrome"|translate("s21")}}"></a>
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 <h2>{{"Be notified when Adblock Plus for Microsoft Edge is available!"|tra nslate("abp-for-edge-be-notified")}}</h2> 376 <h2>{{"Be notified when Adblock Plus for Microsoft Edge is available!"|tra nslate("abp-for-edge-be-notified")}}</h2>
363 377
364 <p> 378 <p>
365 {{"Microsoft Edge <a href='https://wpdev.uservoice.com/forums/257854-mic rosoft-edge-developer/suggestions/6508820-javascript-browser-extensions'>does no t yet support extensions</a>. However, you can be sure that a version of Adblock Plus for Microsoft Edge will be released as soon as possible. While you're wait ing, you may want to try the latest version of Adblock Plus for Internet Explore r."|translate("ms-edge-description")}} 379 {{"Microsoft Edge <a href='https://wpdev.uservoice.com/forums/257854-mic rosoft-edge-developer/suggestions/6508820-javascript-browser-extensions'>does no t yet support extensions</a>. However, you can be sure that a version of Adblock Plus for Microsoft Edge will be released as soon as possible. While you're wait ing, you may want to try the latest version of Adblock Plus for Internet Explore r."|translate("ms-edge-description")}}
366 </p> 380 </p>
367 </div> 381 </div>
368 </div> 382 </div>
369 </section> 383 </section>
370 384
371 <script src="/js/index.js"></script> 385 <script src="/js/index.js"></script>
OLDNEW
« no previous file with comments | « globals/platforms.py ('k') | locales/fr/index.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld