Merge remote-tracking branch 'origin/master'

matomo-org · Mar 4, 2013 · 74f8efd · 74f8efd
2 parents 34e8bde + 51e6c35
commit 74f8efd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/lang/en.php b/lang/en.php
@@ -482,7 +482,7 @@
 	'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',

diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.js b/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();

diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl b/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>