Index: includes/meta/standard.tmpl
===================================================================
--- a/includes/meta/standard.tmpl
+++ b/includes/meta/standard.tmpl
@@ -1,14 +1,18 @@
-{% if title_exclude_sitename or not has_string("name", "site") %}
-
{{ title | translate("page-title", "Page title") }}
-{% else %}
-{{ title | translate("page-title", "Page title") }} | {{ get_string("name", "site") }}
-{% endif %}
+
+ {{ title | translate("title", "Page title") }}
+
+ {% if title_suffix and title_suffix != 'none' %}
+ | {{ title_suffix | translate("title-suffix", "Page title suffix") }}
+ {% elif has_string("name", "site") and title_suffix != 'none' %}
+ | {{ get_string("name", "site") }}
+ {% endif %}
+
{% if description %}
{% endif %}