Refs #1845, make sure current site host is used in default alias in merge...

Refs #1845, make sure current site host is used in default alias in merge alias option description and in group by domain description.

lang/en.php

@@ -482,7 +482,7 @@ $translations = array(
 	'CoreAdminHome_JSTracking_MergeAliases' => 'In the "Outlinks" report, hide clicks to known alias URLs of',
 	'CoreAdminHome_JSTracking_MergeAliasesDesc' => 'So clicks on links to Alias URLs (eg. %s) will not be counted as "Outlink".',
 	'CoreAdminHome_JSTracking_GroupPageTitlesByDomain' => 'Prepend the site domain to the page title when tracking',
-	'CoreAdminHome_JSTracking_GroupPageTitlesByDomainDesc' => 'So if someone visits the \'About\' page on blog.example.com it will be recorded as \'blog / About\'. This is the easiest way to get an overview of your traffic by sub-domain.',
+	'CoreAdminHome_JSTracking_GroupPageTitlesByDomainDesc1' => 'So if someone visits the \'About\' page on blog.%1$s it will be recorded as \'blog / About\'. This is the easiest way to get an overview of your traffic by sub-domain.',
 	'CoreAdminHome_JSTracking_VisitorCustomVars' => 'Track custom variables for this visitor',
 	'CoreAdminHome_JSTracking_VisitorCustomVarsDesc' => 'For example, with variable name "Type" and value "Customer".',
 	'CoreAdminHome_JSTracking_PageCustomVars' => 'Track a custom variable for each page view',

plugins/CoreAdminHome/templates/jsTrackingGenerator.js

@@ -307,7 +307,8 @@ $(document).ready(function() {
 				$(this).text(siteHost);
 			});
 			
-			$('.current-site-alias').text(siteUrls[site.id][1] || 'x.domain.com');
+			var defaultAliasUrl = 'x.' + siteHost;
+			$('.current-site-alias').text(siteUrls[site.id][1] || defaultAliasUrl);
 		
 			resetGoalSelectItems(site.id, 'js-tracker-goal');
 			generateJsCode();

plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl

@@ -52,7 +52,7 @@
 		<label for="javascript-tracking-group-by-domain">{'CoreAdminHome_JSTracking_GroupPageTitlesByDomain'|translate}</label>
 		
 		<div class="small-form-description">
-			{'CoreAdminHome_JSTracking_GroupPageTitlesByDomainDesc'|translate}
+			{'CoreAdminHome_JSTracking_GroupPageTitlesByDomainDesc1'|translate:"<span class='current-site-host'>$defaultReportSiteDomain</span>"}
 		</div>
 	</div>