templates/default.tmpl - Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org

Unified Diff: templates/default.tmpl

Issue 29340844: Issue 3802 - Create page to inform users about adware on web.adblockplus.org (Closed)

Patch Set: Fixed meta translations Created May 24, 2016, 12:12 p.m.

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

Jump to:

View side-by-side diff with in-line comments

Index: templates/default.tmpl

===================================================================

--- a/templates/default.tmpl

+++ b/templates/default.tmpl

@@ -13,20 +13,43 @@

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

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

<!DOCTYPE html>

<head>

- <title>{{title|translate("title")}}</title>

+ <title>{{title|translate("title")}}</title>

saroyanm 2016/05/31 15:23:36 What was the reason of moving the title here ?

juliandoucette 2016/05/31 19:27:46 I grouped these tags based on *what kind of data t

+ <meta name="author" content="{{author|translate("author") if author else get_string("Eyeo GmbH / Adblock Plus", "meta")}}" />

saroyanm 2016/05/31 15:23:35 This is not how get_string is being used, this cau

juliandoucette 2016/05/31 19:27:46 Thanks!

+ {% if description %}

saroyanm 2016/05/31 15:23:36 I'm not sure if introduction of this conditions ar

juliandoucette 2016/05/31 19:27:46 - I made description conditional because some page

saroyanm 2016/06/01 14:38:01 What about updating the logic to something like: {

What about updating the logic to something like: {% if description %} <meta name="description" content="{{description|translate("description")}}" /> {% if og_description %} <meta property="og:description" content="{{og_description|translate("og_description")}}" /> {% else %} <meta property="og:description" content="{{description}}" /> {% endif %} {% endif %} I think same can work for the title, not sure if we are planing to provide og:title separately too often. We mostly used to have same description for general description and open graph, so we need to try not to have duplicated translations, otherwise the translation needs to be done for the same string separately

juliandoucette 2016/06/01 16:23:19 I don't see the benefit in this change? - it break

On 2016/06/01 14:38:01, saroyanm wrote: > On 2016/05/31 19:27:46, juliandoucette wrote: > > On 2016/05/31 15:23:36, saroyanm wrote: > > > I'm not sure if introduction of this conditions are good idea seems like you > > > only using description variable in adware.md, but not "og_title", "og:type", > > > "og:url", so I think it make sense to only introduce twitter cards here and > > also > > > without check for the "twitter_card", "twitter_site" and "twitter_creator" > > > variables, we will add them when we will use them elsewhere, also probably > > > doesn't make sense to devide "title" and "og:title", "description" and > > > "og:description" because mostly I think they should have same content and > > > doesn't make sense to translate them separately, anyway we can align > regarding > > > that in separate review, let's leave it for later. > > > > - I made description conditional because some pages already define it inside > of > > their <head> > > - I made title/og:title and description/og:description in case we want to > target > > social media differently than search enignes. EG: Providing a description with > > less than 140 characters for twitter OR providing a more provocative > description > > for Facebook OR providing a a better targeted description for specific search > > results. > > You give the word, and I'll remove them, just thought I would explain a little > > better. > > What about updating the logic to something like: > {% if description %} > <meta name="description" content="{{description|translate("description")}}" /> > {% if og_description %} > <meta property="og:description" > content="{{og_description|translate("og_description")}}" /> > {% else %} > <meta property="og:description" content="{{description}}" /> > {% endif %} > {% endif %} > > I think same can work for the title, not sure if we are planing to provide > og:title separately too often. > > We mostly used to have same description for general description and open graph, > so we need to try not to have duplicated translations, otherwise the translation > needs to be done for the same string separately

I don't see the benefit in this change? - it breaks the grouping html/open graph/twitter - og:description defaults to html5 description by default

saroyanm 2016/06/02 15:05:11 Yes you are right, in that case we will need to ad

On 2016/06/01 16:23:19, juliandoucette wrote: > On 2016/06/01 14:38:01, saroyanm wrote: > > On 2016/05/31 19:27:46, juliandoucette wrote: > > > On 2016/05/31 15:23:36, saroyanm wrote: > > > > I'm not sure if introduction of this conditions are good idea seems like > you > > > > only using description variable in adware.md, but not "og_title", > "og:type", > > > > "og:url", so I think it make sense to only introduce twitter cards here > and > > > also > > > > without check for the "twitter_card", "twitter_site" and "twitter_creator" > > > > variables, we will add them when we will use them elsewhere, also probably > > > > doesn't make sense to devide "title" and "og:title", "description" and > > > > "og:description" because mostly I think they should have same content and > > > > doesn't make sense to translate them separately, anyway we can align > > regarding > > > > that in separate review, let's leave it for later. > > > > > > - I made description conditional because some pages already define it inside > > of > > > their <head> > > > - I made title/og:title and description/og:description in case we want to > > target > > > social media differently than search enignes. EG: Providing a description > with > > > less than 140 characters for twitter OR providing a more provocative > > description > > > for Facebook OR providing a a better targeted description for specific > search > > > results. > > > You give the word, and I'll remove them, just thought I would explain a > little > > > better. > > > > What about updating the logic to something like: > > {% if description %} > > <meta name="description" content="{{description|translate("description")}}" > /> > > {% if og_description %} > > <meta property="og:description" > > content="{{og_description|translate("og_description")}}" /> > > {% else %} > > <meta property="og:description" content="{{description}}" /> > > {% endif %} > > {% endif %} > > > > I think same can work for the title, not sure if we are planing to provide > > og:title separately too often. > > > > We mostly used to have same description for general description and open > graph, > > so we need to try not to have duplicated translations, otherwise the > translation > > needs to be done for the same string separately > > I don't see the benefit in this change? > - it breaks the grouping html/open graph/twitter > - og:description defaults to html5 description by default

Yes you are right, in that case we will need to add them as soon we will use in the page, so currently I think we only can have a description here and add other tags as soon we will use them in this conditional fashion as you have presented here.

juliandoucette 2016/06/13 18:12:49 Done.

On 2016/06/02 15:05:11, saroyanm wrote: > On 2016/06/01 16:23:19, juliandoucette wrote: > > On 2016/06/01 14:38:01, saroyanm wrote: > > > On 2016/05/31 19:27:46, juliandoucette wrote: > > > > On 2016/05/31 15:23:36, saroyanm wrote: > > > > > I'm not sure if introduction of this conditions are good idea seems like > > you > > > > > only using description variable in adware.md, but not "og_title", > > "og:type", > > > > > "og:url", so I think it make sense to only introduce twitter cards here > > and > > > > also > > > > > without check for the "twitter_card", "twitter_site" and > "twitter_creator" > > > > > variables, we will add them when we will use them elsewhere, also > probably > > > > > doesn't make sense to devide "title" and "og:title", "description" and > > > > > "og:description" because mostly I think they should have same content > and > > > > > doesn't make sense to translate them separately, anyway we can align > > > regarding > > > > > that in separate review, let's leave it for later. > > > > > > > > - I made description conditional because some pages already define it > inside > > > of > > > > their <head> > > > > - I made title/og:title and description/og:description in case we want to > > > target > > > > social media differently than search enignes. EG: Providing a description > > with > > > > less than 140 characters for twitter OR providing a more provocative > > > description > > > > for Facebook OR providing a a better targeted description for specific > > search > > > > results. > > > > You give the word, and I'll remove them, just thought I would explain a > > little > > > > better. > > > > > > What about updating the logic to something like: > > > {% if description %} > > > <meta name="description" > content="{{description|translate("description")}}" > > /> > > > {% if og_description %} > > > <meta property="og:description" > > > content="{{og_description|translate("og_description")}}" /> > > > {% else %} > > > <meta property="og:description" content="{{description}}" /> > > > {% endif %} > > > {% endif %} > > > > > > I think same can work for the title, not sure if we are planing to provide > > > og:title separately too often. > > > > > > We mostly used to have same description for general description and open > > graph, > > > so we need to try not to have duplicated translations, otherwise the > > translation > > > needs to be done for the same string separately > > > > I don't see the benefit in this change? > > - it breaks the grouping html/open graph/twitter > > - og:description defaults to html5 description by default > > Yes you are right, in that case we will need to add them as soon we will use in > the page, so currently I think we only can have a description here and add other > tags as soon we will use them in this conditional fashion as you have presented > here.

Done.

+ <meta name="description" content="{{description|translate("description")}}">

+ {% endif %}

+ {# facebook / Open Graph http://ogp.me/ #}

+ {% if og_title %}

+ <meta property="og:title" content="{{og_title|translate("og_title")}}" />

+ {% endif %}

+ <meta property="og:type" content="{{og_type if og_type else 'website'}}" />

+ {% if og_url %}

+ <meta property="og:url" content="{{og_url}}" />

+ {% endif %}

+ {% if og_description %}

+ <meta property="og:description" content="{{og_description|translate("og_description")}}" />

+ {% endif %}

+ <meta property="og:image" content="{{og_image if og_image else '/img/adblockplus_promo.png'}}" />

+ {# twitter https://dev.twitter.com/cards/markup #}

+ <meta name="twitter:card" content="{{twitter_card if twitter_card else 'summary'}}" />

+ <meta name="twitter:site" content="{{twitter_site if twitter_site else '@AdblockPlus'}}" />

+ <meta name="twitter:creator" content="{{twitter_creator if twitter_creator else '@AdblockPlus'}}" />

<!--[if IE 8]>

« static/css/main.css ('K') | « static/img/cross.png ('k') | no next file » | no next file with comments »