includes/meta/standard.tmpl - Issue 29630648: Issue 6013 - Add site name to document title in website-defaults standard metadata

Delta Between Two Patch Sets: includes/meta/standard.tmpl

Issue 29630648: Issue 6013 - Add site name to document title in website-defaults standard metadata (Closed) Base URL: https://hg.adblockplus.org/website-defaults

Left Patch Set: Remove translation on get_string Created Dec. 11, 2017, 3:34 p.m.

Right Patch Set: Remove repeated markup Created Dec. 13, 2017, 9:38 a.m.

Left:
Right:

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

Jump to:

Left: Side by side diff | Download
Right: Side by side diff | Download

LEFT	RIGHT
1 <meta charset="utf-8">	1 <meta charset="utf-8">

2 <meta http-equiv="x-ua-compatible" content="ie=edge">	2 <meta http-equiv="x-ua-compatible" content="ie=edge">

3 <meta name="viewport" content="width=device-width, initial-scale=1">	3 <meta name="viewport" content="width=device-width, initial-scale=1">

4	4

5 {% if title_suffix == 'none' or (not title_suffix and not has_string("name", "si te")) %}
juliandoucette 2017/12/12 16:52:45 suggest: <title> {{ title \| translate("title", suggest: <title> {{ title \| translate("title", "Page title") }} {% if title_suffix %} {{ title_suffix \| translate("title-suffix", "Page title suffix") }} {% elif has_string("name", "site") %} {{ get_string("name", "site") if has_string("name", "site") }} {% endif %} </title> Detail: String names are page specific and for developers (therefore shorter is better and "title" is meaningful aka document.title). String descriptions are for translators and should be human readable. ire 2017/12/12 18:37:13 Ack. I'm assuming you removed the `title_suffix == Show quoted text On 2017/12/12 16:52:45, juliandoucette wrote: > suggest: > > <title> > {{ title \| translate("title", "Page title") }} > {% if title_suffix %} > {{ title_suffix \| translate("title-suffix", "Page title suffix") }} > {% elif has_string("name", "site") %} > {{ get_string("name", "site") if has_string("name", "site") }} > {% endif %} > </title> > > Detail: String names are page specific and for developers (therefore shorter is > better and "title" is meaningful aka document.title). String descriptions are > for translators and should be human readable. Ack. I'm assuming you removed the `title_suffix == 'none'` condition and the `\|` for brevity in your example? Also the repetition of the `has_string("name", "site")` statement.
6 <title>	5 <title>
juliandoucette 2017/12/12 16:38:32 There is no reason to repeat the opening and closi There is no reason to repeat the opening and closing <title> inside this logic. e.g. if ... open title ... close title else ... open title ... close title vs. open title if ... ... else .. ... close title ire 2017/12/12 18:37:13 Acknowledged. I did it this way because I think it Show quoted text On 2017/12/12 16:38:32, juliandoucette wrote: > There is no reason to repeat the opening and closing <title> inside this logic. > e.g. > > if ... > open title > ... > close title > else ... > open title > ... > close title > > vs. > > open title > if ... > ... > else .. > ... > close title Acknowledged. I did it this way because I think it's easier to read but you're right it's repetition for no reason. Will change in next patch
7 {{ title \| translate("page-title", "Page title") }}	6 {{ title \| translate("title", "Page title") }}

	7
	juliandoucette 2017/12/13 15:01:10 NIT: Unnecessary empty line? NIT: Unnecessary empty line? ire 2017/12/13 19:16:00 Done. Show quoted text On 2017/12/13 15:01:10, juliandoucette wrote: > NIT: Unnecessary empty line? Done.
	8 {% if title_suffix and title_suffix != 'none' %}

	9 \| {{ title_suffix \| translate("title-suffix", "Page title suffix") }}

	10 {% elif has_string("name", "site") and title_suffix != 'none' %}

	11 \| {{ get_string("name", "site") }}

	12 {% endif %}

8 </title>	13 </title>

9 {% elif title_suffix %}

10 <title>

11 {{ title \| translate("page-title", "Page title") }} \|

12 {{ title_suffix \| translate("custom-page-title-suffix", "Page title suffix") } }

13 </title>

14 {% elif has_string("name", "site") %}

15 <title>

16 {{ title \| translate("page-title", "Page title") }} \|

17 {{ get_string("name", "site") }}

18 </title>

19 {% endif %}

20	14

21 {% if description %}	15 {% if description %}

22 <meta name="description" content="{{ description \| translate("page-description ", "Page description") }}">	16 <meta name="description" content="{{ description \| translate("page-description ", "Page description") }}">

23 {% endif %}	17 {% endif %}

24 <link rel="canonical" href="{{ get_canonical_url(page) }}">	18 <link rel="canonical" href="{{ get_canonical_url(page) }}">

LEFT	RIGHT