Issue 6013 - Add site name to document title in website-defaults standard metadata

includes/meta/standard.tmpl

Index: includes/meta/standard.tmpl
===================================================================
--- a/includes/meta/standard.tmpl
+++ b/includes/meta/standard.tmpl
@@ -1,14 +1,24 @@
 <meta charset="utf-8">
 <meta http-equiv="x-ua-compatible" content="ie=edge">
 <meta name="viewport" content="width=device-width, initial-scale=1">
 
-{% if title_exclude_sitename or not has_string("name", "site") %}
-<title>{{ title | translate("page-title", "Page title") }}</title>
-{% else %}
-<title>{{ title | translate("page-title", "Page title") }} | {{ get_string("name", "site") }}</title>
+{% if title_suffix == 'none' or (not title_suffix and not has_string("name", "site")) %}

[juliandoucette, 2017/12/12 16:52:45]

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 == 'none'` condition and the `|`
for brevity in your example? Also the repetition of the `has_string("name",
"site")` statement. 

+<title>

[juliandoucette, 2017/12/12 16:38:32]

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's easier to read but you're
right it's repetition for no reason. Will change in next patch

+  {{ title | translate("page-title", "Page title") }}
+</title>
+{% elif title_suffix %}
+<title>
+  {{ title | translate("page-title", "Page title") }} | 
+  {{ title_suffix | translate("custom-page-title-suffix", "Page title suffix") }}
+</title>
+{% elif has_string("name", "site") %}
+<title>
+  {{ title | translate("page-title", "Page title") }} | 
+  {{ get_string("name", "site") }}
+</title>
 {% endif %}
 
 {% if description %}
   <meta name="description" content="{{ description | translate("page-description", "Page description") }}">
 {% endif %}
 <link rel="canonical" href="{{ get_canonical_url(page) }}">