includes/index.tmpl - Issue 29511696: Issue 5447 - Add missing essential meta data to adblockplus.org

Side by Side Diff: includes/index.tmpl

Issue 29511696: Issue 5447 - Add missing essential meta data to adblockplus.org (Closed) Base URL: https://hg.adblockplus.org/web.adblockplus.org

Patch Set: Created Aug. 10, 2017, 9:21 p.m.

Left:
Right:

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

View unified diff | Download patch

OLD	NEW
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

11 # published by the Free Software Foundation.	11 # published by the Free Software Foundation.

12 #	12 #

13 # Adblock Plus is distributed in the hope that it will be useful,	13 # Adblock Plus is distributed in the hope that it will be useful,

14 # but WITHOUT ANY WARRANTY; without even the implied warranty of	14 # but WITHOUT ANY WARRANTY; without even the implied warranty of

15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

16 # GNU General Public License for more details.	16 # GNU General Public License for more details.

17 #	17 #

18 # You should have received a copy of the GNU General Public License	18 # You should have received a copy of the GNU General Public License

19 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.	19 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.

20 #}	20 #}

21	21

22 <head>	22 <head>

23 <link class="cssfx" href="/css/index.css" rel="stylesheet">	23 <link class="cssfx" href="/css/index.css" rel="stylesheet">

24 <link class="cssfx" href="/css/index-desktop.css" media="(min-width: 1000px)" re l="stylesheet">	24 <link class="cssfx" href="/css/index-desktop.css" media="(min-width: 1000px)" re l="stylesheet">

25 <link href="/css/index-mobile.css" media="(max-width: 1000px)" rel="stylesheet">	25 <link href="/css/index-mobile.css" media="(max-width: 1000px)" rel="stylesheet">

26	26

27 <link href="https://adblockplus.org/" rel="canonical">	27 <link href="https://adblockplus.org/" rel="canonical">

28 <link href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddi lifddb" rel="chrome-webstore-item">	28 <link href="https://chrome.google.com/webstore/detail/cfhdojbkjhnklbpkdaibdccddi lifddb" rel="chrome-webstore-item">

29 <meta content="product" property="og:type">	29 <meta content="website" property="og:type">
	juliandoucette 2017/08/10 21:32:43 Because there is no og:type "product"? Because there is no og:type "product"? Thomas Greiner 2017/08/11 13:15:41 Pretty much but I don't fully remember anymore. L Show quoted text On 2017/08/10 21:32:43, juliandoucette wrote: > Because there is no og:type "product"? Pretty much but I don't fully remember anymore. Looking into it again, I noticed the following statement at http://ogp.me/#types: "Any non-marked up webpage should be treated as og:type website." So it shouldn't make a difference whether or not we even specify "og:type", it seems, but it doesn't hurt either. juliandoucette 2017/08/11 20:26:58 Acknowledged. On second thought, I think that thi Show quoted text On 2017/08/11 13:15:41, Thomas Greiner wrote: > On 2017/08/10 21:32:43, juliandoucette wrote: > > Because there is no og:type "product"? > > Pretty much but I don't fully remember anymore. > > Looking into it again, I noticed the following statement at > http://ogp.me/#types: "Any non-marked up webpage should be treated as og:type > website." So it shouldn't make a difference whether or not we even specify > "og:type", it seems, but it doesn't hurt either. Acknowledged. On second thought, I think that this change was unnecessary (in this changeset; at least).
30 <meta content="https://adblockplus.org/img/adblockplus_promo.png" property="og:i mage">	30 <meta content="https://adblockplus.org/img/adblockplus_promo.png" property="og:i mage">

31 <meta content="https://adblockplus.org/" property="og:url">
juliandoucette 2017/08/10 21:32:42 Because og:url is in the default template now. Because og:url is in the default template now. Thomas Greiner 2017/08/11 13:15:41 From what I see in the code, this would mean that Show quoted text On 2017/08/10 21:32:42, juliandoucette wrote: > Because og:url is in the default template now. From what I see in the code, this would mean that we'll end up having different canonical URLs for each language variant of the page. Is that true? If so, we may need to be very careful because while it'll likely help us with the Facebook issue that the wrong language is shown in snippets, it could also have a negative impact on SEO because (a) search engines would split the traffic up among the individual languages rather than focusing it on a single page and (b) they might punish us for having duplicate content regarding pages that are almost exactly the same in all languages or that might not have been fully translated from english yet. juliandoucette 2017/08/11 20:26:58 That would be true if: - I set an og:url that incl Show quoted text On 2017/08/11 13:15:41, Thomas Greiner wrote: > From what I see in the code, this would mean that we'll end up having different > canonical URLs for each language variant of the page. Is that true? That would be true if: - I set an og:url that included the locale - I removed the og:url all-together However, I added og:url to default.tmpl using get_canonical_url (a [new, core, global] function that accepts a page name and generates a full page url with no locale based on the siteurl in settings.ini) Show quoted text > If so, we may need to be very careful because while it'll likely help us with > the Facebook issue that the wrong language is shown in snippets, it could also > have a negative impact on SEO because (a) search engines would split the traffic > up among the individual languages rather than focusing it on a single page and > (b) they might punish us for having duplicate content regarding pages that are > almost exactly the same in all languages or that might not have been fully > translated from english yet. You have the right idea. Thomas Greiner 2017/08/14 11:20:53 You're right… seems like that's hardcoded in there Show quoted text On 2017/08/11 20:26:58, juliandoucette wrote: > On 2017/08/11 13:15:41, Thomas Greiner wrote: > > From what I see in the code, this would mean that we'll end up having > different > > canonical URLs for each language variant of the page. Is that true? > > That would be true if: > - I set an og:url that included the locale You're right… seems like that's hardcoded in there so locales are indeed not an issue. # Remove the locale component that `resolve_link` adds at the # beginning. page_url = page_url[len(locale) + 1:] What about the product variants of the home page (i.e. /firefox, /chrome, /safari)? Did we account for those somewhere as well or would their canonical URLs differ after this change? Note that they already do differ in the production version due to the way that `<link rel="canonical">` was implemented in the default template. I'd consider that to be a regression though. juliandoucette 2017/08/15 17:14:26 I didn't account for these. Good catch. Big oversi Show quoted text On 2017/08/14 11:20:53, Thomas Greiner wrote: > What about the product variants of the home page (i.e. /firefox, /chrome, /safari)? Did we account for those somewhere as well or would their canonical URLs differ after this change? I didn't account for these. Good catch. Big oversight on my part. I have accounted for these in the latest Patchset. Thomas Greiner 2017/08/17 12:27:35 Great, thanks! Show quoted text On 2017/08/15 17:14:26, juliandoucette wrote: > On 2017/08/14 11:20:53, Thomas Greiner wrote: > > What about the product variants of the home page (i.e. /firefox, /chrome, > /safari)? Did we account for those somewhere as well or would their canonical > URLs differ after this change? > > I didn't account for these. Good catch. Big oversight on my part. > > I have accounted for these in the latest Patchset. > Great, thanks!
32 <meta content="{{"Adblock Plus - Surf the web without annoying ads!"\|translate(" s1")}}" name="title">

33 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"\|translate("s2")}}" name="description">	31 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"\|translate("s2")}}" name="description">
juliandoucette 2017/08/10 21:32:42 I didn't remove this because it's string ID doesn' I didn't remove this because it's string ID doesn't match the description string id in the default template. I think that we should remove these and update crowdin separately. The same applies on other pages.
34 <meta content="{{"Adblock Plus - Surf the web without annoying ads!"\|translate(" s1")}}" property="og:title">
juliandoucette 2017/08/10 21:32:43 Because title and og:title are defined in the defa Because title and og:title are defined in the default template now and string id "title" is defined in the page front matter above. The same applies on other pages.
35 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"\|translate("s2")}}" property="og:description">	32 <meta content="{{"<fix>Adblock Plus</fix> is the most popular ad blocker availab le for <fix>Firefox</fix>, <fix>Chrome</fix>, <fix>Opera</fix>, <fix>Safari</fix >, <fix>Android</fix> and <fix>Internet Explorer</fix>. Block all annoying ads a ll over the web: remove video ads on <fix>YouTube</fix>, block <fix>Facebook</fi x> ads, get rid of pop-ups and much more. On <fix>Google Chrome</fix>, <fix>Adbl ock Plus</fix> is one of the fastest growing extensions ever. <fix>Adblock Plus< /fix> is used on over <fix>100</fix> million devices. Download online for free n ow!"\|translate("s2")}}" property="og:description">

36 </head>	33 </head>

37	34

38 <div id="abb-banner" class="notice">	35 <div id="abb-banner" class="notice">

39 <h2>{{"Want to block ads on your smartphone or tablet?"\|translate("abb-banner- headline")}}</h2>	36 <h2>{{"Want to block ads on your smartphone or tablet?"\|translate("abb-banner- headline")}}</h2>

40 <img src="/img/abb-promo-image.png" alt="{{"Adblock Browser promotional image" \|translate("abb-promotion-alt")}}" />	37 <img src="/img/abb-promo-image.png" alt="{{"Adblock Browser promotional image" \|translate("abb-promotion-alt")}}" />

41 <a id="abb-android-download" href="https://adblockplus.org/redirect?link=adblo ck_browser_android_store">{{"Download Adblock Browser"\|translate("abb-banner-but ton-text")}}</a>	38 <a id="abb-android-download" href="https://adblockplus.org/redirect?link=adblo ck_browser_android_store">{{"Download Adblock Browser"\|translate("abb-banner-but ton-text")}}</a>

42 <a id="abb-ios-download" href="https://adblockplus.org/redirect?link=adblock_b rowser_ios_store">{{"Download Adblock Browser"\|translate("abb-banner-button-text ")}}</a>	39 <a id="abb-ios-download" href="https://adblockplus.org/redirect?link=adblock_b rowser_ios_store">{{"Download Adblock Browser"\|translate("abb-banner-button-text ")}}</a>

43 </div>	40 </div>

44 <div itemscope="itemscope" itemtype="http://schema.org/SoftwareApplication">	41 <div itemscope="itemscope" itemtype="http://schema.org/SoftwareApplication">

(...skipping 302 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
347 </p>	344 </p>

348	345

349 <p>	346 <p>

350 {{"Adblock Plus is developed by the open source community and free to use. Used on more than 100 million devices, it’s one of the most popular extensions ever."\|translate("s96")}}	347 {{"Adblock Plus is developed by the open source community and free to use. Used on more than 100 million devices, it’s one of the most popular extensions ever."\|translate("s96")}}

351 </p>	348 </p>

352 </div>	349 </div>

353 </div>	350 </div>

354 </section>	351 </section>

355	352

356 <script src="/js/index.js"></script>	353 <script src="/js/index.js"></script>

OLD	NEW

« no previous file with comments | « filters/to_og_locale.py ('k') | pages/acceptable-ads.md » ('j') | no next file with comments »