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

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

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: Translate page title suffix Created Dec. 7, 2017, 1: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
juliandoucette 2017/12/08 15:44:56 Detail: This logic seems complicated. But I believ Detail: This logic seems complicated. But I believe it is optimal. I have come up with a few alternatives, but they all involve more, unnecessary, conditions and do not make it much simpler. ire 2017/12/11 15:34:17 Ack. I agree it's not very readable, but it was th Show quoted text On 2017/12/08 15:44:56, juliandoucette wrote: > Detail: This logic seems complicated. But I believe it is optimal. I have come > up with a few alternatives, but they all involve more, unnecessary, conditions > and do not make it much simpler. Ack. I agree it's not very readable, but it was the most concise I could do.
5 {% if title_suffix == 'none' or (not title_suffix and not has_string("name", "si te")) %}

6 <title>	5 <title>

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") \| translate("site-name", "Page title suffix") }}
juliandoucette 2017/12/08 15:44:56 You don't need the translate filter after get_stri You don't need the translate filter after get_string. get_string get's the translation directly from the appropriate locale file. ire 2017/12/11 15:34:17 Done. Show quoted text On 2017/12/08 15:44:56, juliandoucette wrote: > You don't need the translate filter after get_string. get_string get's the > translation directly from the appropriate locale file. Done.
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