FEATURE: add short site description on login page title

FEATURE: add short site description on login page title

diff --git a/app/assets/javascripts/discourse/routes/application.js.es6 b/app/assets/javascripts/discourse/routes/application.js.es6
index 4c85a42862..a84291b46c 100644
--- a/app/assets/javascripts/discourse/routes/application.js.es6
+++ b/app/assets/javascripts/discourse/routes/application.js.es6
@@ -43,7 +43,8 @@ const ApplicationRoute = Discourse.Route.extend(OpenComposer, {
     _collectTitleTokens(tokens) {
       tokens.push(this.siteTitle);
       if (
-        window.location.pathname === Discourse.getURL("/") &&
+        (window.location.pathname === Discourse.getURL("/") ||
+          window.location.pathname === Discourse.getURL("/login")) &&
         this.shortSiteDescription !== ""
       ) {
         tokens.push(this.shortSiteDescription);
diff --git a/app/controllers/static_controller.rb b/app/controllers/static_controller.rb
index 51b291403c..c0bdc032f4 100644
--- a/app/controllers/static_controller.rb
+++ b/app/controllers/static_controller.rb
@@ -51,6 +51,14 @@ class StaticController < ApplicationController
       return
     end
 
+    unless @title.present?
+      @title = if SiteSetting.short_site_description.present?
+        "#{SiteSetting.title} - #{SiteSetting.short_site_description}"
+      else
+        SiteSetting.title
+      end
+    end
+
     if I18n.exists?("static.#{@page}")
       render html: I18n.t("static.#{@page}"), layout: !request.xhr?, formats: [:html]
       return
diff --git a/app/views/static/login.html.erb b/app/views/static/login.html.erb
index 22953acf0b..f0128a9dd1 100644
--- a/app/views/static/login.html.erb
+++ b/app/views/static/login.html.erb
@@ -4,6 +4,7 @@
   </div>
 <% end %>
 
+<% content_for :title do %><%= @title %><% end %>
 <% content_for :head do %>
-  <%= raw crawlable_meta_data(title: SiteSetting.title, description: SiteSetting.site_description) %>
+  <%= raw crawlable_meta_data(title: @title, description: SiteSetting.site_description) %>
 <% end %>

GitHub sha: 815edf6f

This commit has been mentioned on Discourse Meta. There might be relevant details there: