Issue 5803 - add privacy friendly acceptable ads preference

pages/preferences.tmpl

 title=Adblock Plus preferences
 
 {#
  # This file is part of the Adblock Plus website,
  # Copyright (C) 2006-present 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
  # published by the Free Software Foundation.
  #
@@ skipping 206 matching lines @@
 {% endmacro %}
 
 {% macro report_submiturlDescription() %}
 {{"Address on adblockplus.org to submit issue reports to."|translate("report_submiturl-s1")}}
 {% endmacro %}
 
 {% macro subscriptions_exceptionsurlDescription() %}
 {{"Location of the filter list used to\n<a href=\"acceptable-ads\">allow non-intrusive ads</a>."|translate("subscriptions_exceptionsurl-s1")}}
 {% endmacro %}
 
+{% macro subscriptions_exceptionsurlPrivacyDescription() %}
+{{"Location of the filter list used to allow only nonintrusive ads that are privacy-friendly."|translate("subscriptions_exceptionsurl-privacy")}}
+{% endmacro %}
+
 {% macro notificationurlDescription() %}
 {{"Location of the file containing emergency notifications."|translate("notificationurl-s1")}}
 {% endmacro %}
 
 {% macro notificationdataDescription() %}
 {{"Current emergency notification data."|translate("notificationdata-s1")}}
 {% endmacro %}
 
 {% macro subscriptions_antiadblockurlDescription() %}
 {{"Location of the subscription that hides anti adblock messages."|translate("subscriptions_antiadblockurl-s1")}}
@@ skipping 306 matching lines @@
         "name": "subscriptions_antiadblockurl",
         "default": "",
         "description": subscriptions_antiadblockurlDescription
       },
       {
         "name": "subscriptions_exceptionsurl",
         "default": "",
         "description": subscriptions_exceptionsurlDescription
       },
       {
+        "name": "subscriptions_exceptionsurl_privacy",

[ire, 2017/10/09 08:45:16]

This name doesn't match the translation id used above

`subscriptions_exceptionsurl-privacy` vs `subscriptions_exceptionsurl_privacy`

(you used a `-` instead of `_` above)

[saroyanm, 2017/10/09 11:07:44]

Yes it's not, It's the name which appears in the preferences page and used by
extension, but not the one that's used as a translation string.

To be consistent with other translation strings in this page I think we should
use "subscriptions_exceptionsurlPrivacy" instead for translation string.

If we will decide to use "name" as a string ID I think we should adapt the
macroses accordingly, but that's out of the scope of current review I think.

Side note: Also "-s1" in the end of the strings are leftover from the CMS
migration while ago, where we migrated all strings from the old CMS called
anwiki.

[ire, 2017/10/09 11:12:12]

Oh okay. My bad, I thought there were supposed to match. 

Your modification makes things clearer, thanks

+        "default": "",
+        "description": subscriptions_exceptionsurlPrivacyDescription
+      },
+      {
         "name": "subscriptions_fallbackerrors",
         "default": "5",
         "description": subscriptions_fallbackerrorsDescription
       },
       {
         "name": "subscriptions_fallbackurl",
         "default": "",
         "description": subscriptions_fallbackurlDescription
       },
       {
@@ skipping 134 matching lines @@
     "title": 'Preferences for administrators'|translate('preferences_for_administratorsTitle'),
     "preferences": [
       {
         "name": "suppress_first_run_page",
         "default": "false",
         "description": suppress_first_run_pageDescription
       }
     ]
   }
 ]) }}