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,22 @@
 <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")) %}
+<title>
+  {{ title | translate("page-title", "Page title") }}
+</title>
+{% elif title_suffix %}
+<title>
+  {{ title | translate("page-title", "Page title") }} | {{ title_suffix }}

[juliandoucette, 2017/12/06 17:07:17]

You forgot the translate filter.

[ire, 2017/12/07 13:35:10]

Done.

+</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) }}">