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">
 

[juliandoucette, 2017/12/08 15:44:56]

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 the most concise I could do.

-{% 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 | 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") | translate("site-name", "Page title suffix") }}

[juliandoucette, 2017/12/08 15:44:56]

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.

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