Issue 5191 - Add Terms of Use to adblockplus.org homepage

includes/index.tmpl

 title=Adblock Plus - Surf the web without annoying ads!
 noheading=True
 localefile=index
 
 {#
  # This file is part of the Adblock Plus website,
  # Copyright (C) 2006-2017 eyeo GmbH
  #
  # Adblock Plus is free software: you can redistribute it and/or modify
  # it under the terms of the GNU General Public License version 3 as
@@ skipping 49 matching lines @@
           <div class="sprite"></div>
           {{"It's free for users and open source (<a href=\"https://www.gnu.org/licenses/gpl.html\">GPLv3</a>)"|translate("gplv3-license")}}
         </li>
         <li id="feature-maxthon" itemprop="featureList">
           <div class="sprite"></div>
           {{"Integrated by default in"|translate("s11")}} <a href="http://www.maxthon.com/" target="_blank">{{"Maxthon Cloud Browser"|translate("s12")}}</a>
         </li>
       </ul>
     </div>
 
-    {% if locale == "en" or has_string("terms-message", "index") %}

[saroyanm, 2017/05/02 09:26:37]

We should check against "defaultlocale" I think instead of the value of
"defaultlocale".
Imagine one day the locale might change into en-US ?

[saroyanm, 2017/05/02 09:26:37]

This is wrong, the string can be translated while the page is not.
We should check if the page is translated to current language or not.

Probably similar to what does linkify.

[juliandoucette, 2017/05/02 10:22:12]

I agree. But I don't know how to do this without changing CMS core.

Do you have any ideas Jon?

[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 message AND the page is translated

-      <p class="terms-message">
-        {{ "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 message") }}
-      </p>
-    {% endif %}
+    <p id="terms-message">
+      {{ "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 message") }}
+    </p>
 
     <h3 class="edge-message">
       {{"Adblock Plus for Microsoft Edge requires Windows 10 Anniversary Update"|translate("edge-message")}}
     </h3>
 
     <div id="install">
-      {% for platform_id in platforms %}
-        {% set platform = platforms[platform_id] %}
-        <a
-          id="install-{{ platform_id }}"
-          class="install-button"
-          {% if platform_id in ('chrome', 'yandex-browser') %}
-            onclick="chrome.webstore.install(); return false;"
-          {% endif %}
-          href="{{ platform.href }}">
-          {% if locale == "en" or has_string(("agree-install-%s" % platform_id), "index") %}
-            {{ ("Agree and Install for <fix>%s</fix>" % platform.label) | translate(("agree-install-%s" % platform_id), "button label") }}
-          {% else %}
-            {{ ("Install for <fix>%s</fix>" % platform.label) | translate(("install-%s" % platform_id), "button label") }}
-          {% endif %}
-        </a>
-      {% endfor %}
+      <a class="install-button" href="https://update.adblockplus.org/latest/adblockplusfirefox.xpi" id="install-firefox">{{"Agree and Install for Firefox"|translate("s13")}}</a>
+      <a class="install-button" href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddilifddb" id="install-chrome" onclick="chrome.webstore.install(); return false;">{{"Agree and Install for Chrome"|translate("s14")}}</a>
+      <a class="install-button" href="https://addons.opera.com/extensions/details/opera-adblock/?display=en-US" id="install-opera">{{"Agree and Install for Opera"|translate("s15")}}</a>
+      <a class="install-button" href="android-install" id="install-android">{{"Agree and Install for Android"|translate("s16")}}</a>
+      <a class="install-button" href="https://update.adblockplus.org/latest/adblockplusie.exe" id="install-internet-explorer">{{"Agree and Install for Internet Explorer"|translate("s17")}}</a>
+      <a class="install-button" href="https://update.adblockplus.org/latest/adblockplussafari.safariextz" id="install-safari">{{"Agree and Install for Safari"|translate("s18")}}</a>
+      <a class="install-button" href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddilifddb" id="install-yandex-browser" onclick="chrome.webstore.install(); return false;">{{"Agree and Install for Yandex Browser"|translate("s19")}}</a>
+      <a class="install-button" href="ms-windows-store://pdp/?ProductId=9nblggh4r9nz" id="install-edge">{{"Agree and Install for Microsoft Edge"|translate("install-edge")}}</a>
     </div>
 
     <div id="other-platform">
         <div>{{"Download Adblock Plus for another platform"|translate("other-platform")}}</div>
         <ul>
           <li>
             <a class="sprite" href="firefox" id="platform-firefox" title="{{"Adblock Plus for Firefox"|translate("s20")}}"></a>
           </li>
           <li>
             <a class="sprite" href="chrome" id="platform-chrome" title="{{"Adblock Plus for Chrome"|translate("s21")}}"></a>
@@ skipping 146 matching lines @@
     </div>
 
     <div class="more-tab" id="tab-chrome">
       <h2>{{"Ad Blocker for Chrome"|translate("s64")}}</h2>
 
       <p>
         {{"Adblock Plus is the most advanced adblocker for the Google Chrome browser. Are you fed up with advertisers infringing on your browsing experience? Simply install the extension and all annoying ads will be automatically blocked from the internet. Blinking banners, popups, video commercials on YouTube and Facebook ads: The Chrome Adblock Plus extension will automatically remove any unwanted ad from every website you visit. Want more? You can easily activate additional privacy and security <a href=\"features\">features</a> such as tracking and malware protection."|translate("s65")}}
       </p>
 
       <p>
-        {{"Installing the Chrome Adblock Plus add-on to your browser only takes a few seconds. Simply click the \"Install for Chrome\" button above and confirm the installation by clicking the \"Add\" button. Please note: The Chrome browser displays a warning that Adblock Plus can access the data on any website you visit. This is a standard warning for Chrome extensions running on every tab. We promise to never collect any data about you."|translate("s66")}}
+        {{"Installing the Chrome Adblock Plus add-on to your browser only takes a few seconds. Simply click the \"Agree and Install for Chrome\" button above and confirm the installation by clicking the \"Add\" button. Please note: The Chrome browser displays a warning that Adblock Plus can access the data on any website you visit. This is a standard warning for Chrome extensions running on every tab. We promise to never collect any data about you."|translate("s66")}}
       </p>
 
       <p>
         {{"The add-on is developed by the open source community and free to use for everybody. With more than <fix>100</fix> million active devices, <fix>Adblock Plus</fix> is one of the most popular browser extensions for <fix>Google Chrome</fix>."|translate("s67")}}
       </p>
     </div>
 
     <div class="more-tab" id="tab-opera">
       <h2>{{"Blocking ads on Opera"|translate("s72")}}</h2>
 
       <p>
         {{"<fix>Adblock Plus</fix> is one of the most popular add-ons available, and is used on over <fix>100</fix> million devices. The installation of <fix>Opera</fix> extensions only takes a few seconds. By adding <fix>Adblock Plus</fix> to your <fix>Opera</fix> browser, you can remove all online advertising such as banners, pop-ups, 30-second <fix>YouTube</fix> commercials, <fix>Facebook</fix> ads and any other unwanted online ad. After installing this extension, all annoying ads will automatically be removed from all websites, which makes browsing the internet less distracting and more enjoyable."|translate("s73")}}
       </p>
 
       <p>
         {{"Besides blocking all obtrusive advertising from your browsing experience, Adblock Plus significantly increases the speed of your Opera browser. By preventing advertisements from being loaded by your browser, the ad blocker helps you to save bandwidth and makes surfing the internet faster, especially if you are on a slow internet connection."|translate("s74")}}
       </p>
 
       <p>
-        {{"Add Adblock Plus to your Opera browser by clicking on the green button \"Install for Opera\" above. Click \"Install\" to confirm the installation and to add the extension to Opera. There are no additional steps or configurations necessary, you will automatically be protected against all obtrusive online advertising."|translate("s75")}}
+        {{"Add Adblock Plus to your Opera browser by clicking on the green button \"Agree and Install for Opera\" above. Click \"Install\" to confirm the installation and to add the extension to Opera. There are no additional steps or configurations necessary, you will automatically be protected against all obtrusive online advertising."|translate("s75")}}
       </p>
 
       <p>
         {{"Adblock Plus for Opera works great. Don't believe us? Don't just take our word for it. Here is what the popular download portal Softpedia has to say: \"Adblock Plus for Opera is a very useful add-on that was especially designed to help users get rid of nuisances like pop-up ads, flashing banners and other such things.\""|translate("s76")}}
       </p>
     </div>
 
     <div class="more-tab" id="tab-android">
       <h2>{{"Android Adblock app"|translate("s77")}}</h2>
 
@@ skipping 11 matching lines @@
     </div>
 
     <div class="more-tab" id="tab-internet-explorer">
       <h2>{{"Adblock Plus for Internet Explorer"|translate("s81")}}</h2>
 
       <p>
         {{"Although you might not expect it, Internet Explorer is still the world's second most popular browser with hundreds of millions of daily users. We developed Adblock Plus for Internet Explorer precisely for those users — so that they can finally experience the web without annoying ads."|translate("s82")}}
       </p>
 
       <p>
-        {{"Developing an extension for Internet Explorer is challenging — that’s one of the reasons there are not as many extensions on Internet Explorer as on Mozilla Firefox, Google Chrome and Opera. The installation of Adblock Plus for Internet Explorer is different than on other browsers. Usually, the extension is directly added to the browser; however, for Internet Explorer you need to install it through a so-called setup program. But don’t worry: it takes under 30 seconds to install Adblock Plus for Internet Explorer. Just click on the green button above called “Install for Internet Explorer” to protect yourself from annoying advertising."|translate("s83")}}
+        {{"Developing an extension for Internet Explorer is challenging — that’s one of the reasons there are not as many extensions on Internet Explorer as on Mozilla Firefox, Google Chrome and Opera. The installation of Adblock Plus for Internet Explorer is different than on other browsers. Usually, the extension is directly added to the browser; however, for Internet Explorer you need to install it through a so-called setup program. But don’t worry: it takes under 30 seconds to install Adblock Plus for Internet Explorer. Just click on the green button above called “Agree and Install for Internet Explorer” to protect yourself from annoying advertising."|translate("s83")}}
       </p>
 
       <p>
         {{"Current limitations: Due to the limitations of some of the fragmented versions of Internet Explorer, Adblock Plus currently doesn’t work for:"|translate("s84")}}
       </p>
 
       <ul>
         <li>{{"Metro Mode of Internet Explorer in Windows 8"|translate("s85")}}</li>
         <li>{{"Internet Explorer in Windows RT"|translate("s86")}}</li>
       </ul>
@@ skipping 24 matching lines @@
     </div>
 
     <div class="more-tab" id="tab-yandex-browser">
       <h2>{{"Ad Blocker for Yandex Browser"|translate("s93")}}</h2>
 
       <p>
         {{"Adblock Plus is the most advanced adblocker for Yandex Browser. Are you fed up with advertisers infringing on your browsing experience? Simply install the extension and all annoying ads will be automatically blocked from the internet. Blinking banners, popups, video commercials on YouTube, Facebook and Vkontakte ads: The Yandex Browser Adblock Plus extension will automatically remove any unwanted ad from every website you visit. Want more? You can easily activate additional privacy and security <a href=\"features\">features</a> such as tracking and malware protection."|translate("s94")}}
       </p>
 
       <p>
-        {{"Installing the Yandex Browser Adblock Plus add-on to your browser only takes a few seconds. Simply click the \"Install for Yandex Browser\" button above and confirm the installation by clicking the \"Add\" button. Please note: Yandex Browser displays a warning that Adblock Plus can access the data on any website you visit. This is a standard warning for Yandex Browser extensions running on every tab. We promise to never collect any data about you."|translate("s95")}}
+        {{"Installing the Yandex Browser Adblock Plus add-on to your browser only takes a few seconds. Simply click the \"Agree and Install Yandex Browser\" button above and confirm the installation by clicking the \"Add\" button. Please note: Yandex Browser displays a warning that Adblock Plus can access the data on any website you visit. This is a standard warning for Yandex Browser extensions running on every tab. We promise to never collect any data about you."|translate("s95")}}
       </p>
 
       <p>
         {{"The add-on is developed by the open source community and free to use for everybody. With more than <fix>100</fix> million devices, it is the most popular browser extension ever."|translate("s96")}}
       </p>
     </div>
 
     <div class="more-tab" id="tab-maxthon">
       <h2>{{"Adblock Plus for Maxthon"|translate("s97")}}</h2>
 
       <p>
         {{"Different from being as an extension on other browsers, Adblock Plus has been integrated by default for Maxthon users, and as an opt-in option for Chinese users. Are you fed up with advertisers infringing on your browsing experience? Simply install Maxthon Cloud Browser and all annoying ads will be automatically blocked from the internet. Blinking banners, popups, video commercials on YouTube and Facebook ads: Maxthon Cloud Browser with Adblock Plus integrated will automatically remove any unwanted ad from every website you visit. Want more? You can easily activate additional privacy and security features such as tracking and malware protection."|translate("s98")}}
       </p>
     </div>
     <div class="more-tab" id="tab-edge">
       <h2>{{"Be notified when Adblock Plus for Microsoft Edge is available!"|translate("abp-for-edge-be-notified")}}</h2>
 
       <p>
         {{"Microsoft Edge <a href='https://wpdev.uservoice.com/forums/257854-microsoft-edge-developer/suggestions/6508820-javascript-browser-extensions'>does not 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 waiting, you may want to try the latest version of Adblock Plus for Internet Explorer."|translate("ms-edge-description")}}
       </p>
     </div>
   </div>
 </section>
 
 <script src="/js/index.js"></script>