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

Side by Side Diff

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

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

Side by Side Diff: 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

Patch Set: Remove translation on get_string Created Dec. 11, 2017, 3:34 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 <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_exclude_sitename or not has_string("name", "site") %}	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>{{ title \| translate("page-title", "Page title") }}</title>	6 <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 {% else %}	7 {{ title \| translate("page-title", "Page title") }}

8 <title>{{ title \| translate("page-title", "Page title") }} \| {{ get_string("name ", "site") }}</title>	8 </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>

9 {% endif %}	19 {% endif %}

10	20

11 {% if description %}	21 {% if description %}

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

13 {% endif %}	23 {% endif %}

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

OLD	NEW

« no previous file with comments | « no previous file | pages/index.html » ('j') | no next file with comments »