Merge "Restore title to mobile skin without logo"

i18n/en.json

@@ -34,7 +34,6 @@
 	"mobile-frontend-placeholder": "Search {{SITENAME}}",
 	"mobile-frontend-random-button": "Random",
 	"mobile-frontend-redirected-from": "Redirected from \"[[$1]]\"",
-	"mobile-frontend-sitename": "{{SITENAME}}",
 	"mobile-frontend-talk-back-to-filepage": "Return to the file \"$1\".",
 	"mobile-frontend-talk-back-to-page": "Return to \"$1\" page.",
 	"mobile-frontend-talk-back-to-projectpage": "Return to the project page \"$1\".",

i18n/qqq.json

@@ -48,7 +48,6 @@
 	"mobile-frontend-placeholder": "Phrase used to prompt user to use search interface for mobile full screen search\n{{Identical|Search}}",
 	"mobile-frontend-random-button": "This appears in the mobile web menu, which appears when tapping the three stripes at the top corner.\n\nThis button takes the user to a random page.\n{{Identical|Random}}",
 	"mobile-frontend-redirected-from": "Toast message informing the user that they were redirected from their original page. Parameters:\n* $1 - the original page title from which the user was redirected",
-	"mobile-frontend-sitename": "{{notranslate}}\nName of site",
 	"mobile-frontend-talk-back-to-filepage": "Used as label for link from file talk page to file page. Parameters:\n* $1 - page title",
 	"mobile-frontend-talk-back-to-page": "Used as generic label for link from talk page to subject page. Parameters:\n* $1 - page title",
 	"mobile-frontend-talk-back-to-projectpage": "Used as label for link from project talk page to project page. Parameters:\n* $1 - page title",

includes/Skins/Logo.mustache

@@ -1,5 +1,3 @@
-{{#data-logos}}
-{{#wordmark}}<img src="{{src}}" alt="{{msg-mobile-frontend-sitename}}" width="{{width}}" height="{{height}}"
+{{#wordmark}}<img src="{{src}}" alt="{{msg-sitetitle}}" width="{{width}}" height="{{height}}"
 	style="{{style}}"/>{{/wordmark}}
-{{^wordmark}}{{msg-mobile-frontend-sitename}}{{/wordmark}}
-{{/data-logos}}
+{{^wordmark}}{{msg-sitetitle}}{{/wordmark}}

includes/Skins/skin.mustache

@@ -13,7 +13,9 @@
 				</nav>
 				<div class="branding-box">
 					<a href="{{link-mainpage}}">
+					{{#data-logos}}
 						<span>{{>Logo}}</span>
+					{{/data-logos}}
 						{{#isBeta}}<sup>&beta;</sup>{{/isBeta}}
 					</a>
 				</div>

skin.json

@@ -114,6 +114,7 @@
 				"name": "minerva",
 				"templateDirectory": "includes/Skins",
 				"messages": [
+					"sitetitle",
 					"mainpage",
 					"searchbutton",
 					"minerva-user-navigation",