diff --git a/core/WidgetsList.php b/core/WidgetsList.php
index 95560d93ee61f89ab776bf7a5d3744b1ea1d42c0..f6da2e49a2c7d2dd5122632d36a511988f52b2b4 100644
--- a/core/WidgetsList.php
+++ b/core/WidgetsList.php
@@ -77,7 +77,7 @@ class WidgetsList
'DevicesDetection_DevicesDetection',
'General_Actions',
'Actions_SubmenuSitesearch',
- 'Referers_Referers',
+ 'Referers_Referrers',
'Goals_Goals',
'Goals_Ecommerce',
'_others_',
diff --git a/lang/en.json b/lang/en.json
index 725ff8a0f02b3c6423920ca5edc671b654dbc3c2..204969190c0e4a599952afb1f392b3c806cbbd32 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -929,7 +929,7 @@
"ConversionsOverview": "Conversions Overview",
"BestCountries": "Your best converting countries are:",
"BestKeywords": "Your top converting keywords are:",
- "BestReferers": "Your best converting websites referrers are:",
+ "BestReferrers": "Your best converting websites referrers are:",
"ReturningVisitorsConversionRateIs": "Returning visitors conversion rate is %s",
"NewVisitorsConversionRateIs": "New visitors conversion rate is %s",
"Contains": "contains %s",
@@ -1119,7 +1119,7 @@
"LostYourPassword": "Lost your password?",
"PasswordsDoNotMatch": "Passwords do not match.",
"InvalidUsernameEmail": "Invalid username or e-mail address.",
- "InvalidNonceOrHeadersOrReferer": "Form security failed. Please reload the form and check that your cookies are enabled. If you use a proxy server, you must %s configure Piwik to accept the proxy header%s that forwards the Host header. Also, check that your Referer header is sent correctly.",
+ "InvalidNonceOrHeadersOrReferrer": "Form security failed. Please reload the form and check that your cookies are enabled. If you use a proxy server, you must %s configure Piwik to accept the proxy header%s that forwards the Host header. Also, check that your Referrer header is sent correctly.",
"InvalidOrExpiredToken": "Token is invalid or has expired.",
"MailTopicPasswordChange": "Confirm Password Change",
"MailPasswordChangeBody": "Hi %1$s,\n\nA password reset request was received from %2$s. To confirm this password change so you can login with your new credentials, visit the following link:\n\n%3$s\n\nNote: this token will expire in 24 hours.\n\nAnd thank you for using Piwik!",
@@ -1248,7 +1248,7 @@
"Referers": {
"PluginDescription": "Reports the Referrers data: Search Engines, Keywords, Websites, Campaign Tracking, Direct Entry.",
"Referrer": "Referrer",
- "Referers": "Referrers",
+ "Referrers": "Referrers",
"ReferrersOverview": "Referrers Overview",
"EvolutionDocumentation": "This is an overview of the referrers that led visitors to your website.",
"EvolutionDocumentationMoreInfo": "For more information about the different refferrer types, see the documentation of the %s table.",
@@ -1259,7 +1259,7 @@
"DirectEntry": "Direct Entry",
"Websites": "Websites",
"Socials": "Social Networks",
- "AllReferersReportDocumentation": "This report shows all your Referers in one unified report, listing all Websites, Search keywords and Campaigns used by your visitors to find your website.",
+ "AllReferrersReportDocumentation": "This report shows all your Referrers in one unified report, listing all Websites, Search keywords and Campaigns used by your visitors to find your website.",
"WebsitesReportDocumentation": "In this table, you can see which websites referred visitors to your site. %s By clicking on a row in the table, you can see which URLs the links to your website were on.",
"SocialsReportDocumentation": "This report shows which social networks led visitors to your website.<br \/>By clicking on a row in the table, you can see from which social network pages visitors came to your website.",
"Campaigns": "Campaigns",
@@ -1276,8 +1276,8 @@
"ColumnSocial": "Social network",
"ColumnCampaign": "Campaign",
"CampaignFooterHelp": "Help: %sTracking Campaigns in Piwik %s URL Builder tool",
- "RefererName": "Referrer Name",
- "DetailsByRefererType": "Details by Referrer Type",
+ "ReferrerName": "Referrer Name",
+ "DetailsByReferrerType": "Details by Referrer Type",
"TypeDirectEntries": "%s direct entries",
"TypeSearchEngines": "%s from search engines",
"TypeWebsites": "%s from websites",
diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index 9ee01d003e80f4593297a2c5a7dd035f24e341a3..a2e5e8297f79381a7188c970e506ae44c5c5ba15 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -195,7 +195,7 @@ class ProcessedReport
Piwik_Translate('Goals_Ecommerce'),
Piwik_Translate('General_Actions'),
Piwik_Translate('Actions_SubmenuSitesearch'),
- Piwik_Translate('Referers_Referers'),
+ Piwik_Translate('Referers_Referrers'),
Piwik_Translate('Goals_Goals'),
Piwik_Translate('General_Visitors'),
Piwik_Translate('DevicesDetection_DevicesDetection'),
diff --git a/plugins/Goals/templates/getGoalReportView.twig b/plugins/Goals/templates/getGoalReportView.twig
index 95c0e44a77747173810eae1d97b1930a16e6ea30..55f7f074ef111085d57ebfba058e4bcde09a7538 100644
--- a/plugins/Goals/templates/getGoalReportView.twig
+++ b/plugins/Goals/templates/getGoalReportView.twig
@@ -13,7 +13,7 @@
<li>{{ 'Goals_BestKeywords'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.keyword} %}</li>
{% endif %}
{% if topDimensions.website is defined and topDimensions.website|length > 0 %}
- <li>{{ 'Goals_BestReferers'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.website} %}</li>
+ <li>{{ 'Goals_BestReferrers'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.website} %}</li>
{% endif %}
<li>
{{ 'Goals_ReturningVisitorsConversionRateIs'|translate("<strong>"~conversion_rate_returning~"</strong>")|raw }}
diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php
index bb6b3fbe6a503309e1ce7d2765f494ca966eb24e..ae7aa4d346b7913719795f13ac76475a00784063 100644
--- a/plugins/Login/Controller.php
+++ b/plugins/Login/Controller.php
@@ -175,7 +175,7 @@ class Controller extends \Piwik\Controller
protected function getMessageExceptionNoAccess()
{
- $message = Piwik_Translate('Login_InvalidNonceOrHeadersOrReferer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('http://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>'));
+ $message = Piwik_Translate('Login_InvalidNonceOrHeadersOrReferrer', array('<a href="?module=Proxy&action=redirect&url=' . urlencode('http://piwik.org/faq/how-to-install/#faq_98') . '" target="_blank">', '</a>'));
// Should mention trusted_hosts or link to FAQ
return $message;
}
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index 9641f3bd5c5b360ea0e834825da1d2754955bf00..9c4af4d0e1029f5030cef39fb49d26516c6e885c 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -306,7 +306,7 @@ class Controller extends \Piwik\Controller
$view->documentation = Piwik_Translate('Referers_EvolutionDocumentation') . '<br />'
. Piwik_Translate('General_BrokenDownReportDocumentation') . '<br />'
. Piwik_Translate('Referers_EvolutionDocumentationMoreInfo', '"'
- . Piwik_Translate('Referers_DetailsByRefererType') . '"');
+ . Piwik_Translate('Referers_DetailsByReferrerType') . '"');
return $this->renderView($view, $fetch);
}
diff --git a/plugins/Referers/Referers.php b/plugins/Referers/Referers.php
index aa601e1df478fc441b606e76a24ff8487c112c07..ee5e344ec0db9d8f911d367e1e883081f15bf33d 100644
--- a/plugins/Referers/Referers.php
+++ b/plugins/Referers/Referers.php
@@ -47,7 +47,7 @@ class Referers extends \Piwik\Plugin
{
$reports = array_merge($reports, array(
array(
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Type'),
'module' => 'Referers',
'action' => 'getRefererType',
@@ -64,16 +64,16 @@ class Referers extends \Piwik\Plugin
'order' => 1,
),
array(
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_WidgetGetAll'),
'module' => 'Referers',
'action' => 'getAll',
'dimension' => Piwik_Translate('Referers_Referrer'),
- 'documentation' => Piwik_Translate('Referers_AllReferersReportDocumentation', '<br />'),
+ 'documentation' => Piwik_Translate('Referers_AllReferrersReportDocumentation', '<br />'),
'order' => 2,
),
array(
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Keywords'),
'module' => 'Referers',
'action' => 'getKeywords',
@@ -83,7 +83,7 @@ class Referers extends \Piwik\Plugin
'order' => 3,
),
array( // subtable report
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Keywords'),
'module' => 'Referers',
'action' => 'getSearchEnginesFromKeywordId',
@@ -94,7 +94,7 @@ class Referers extends \Piwik\Plugin
),
array(
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Websites'),
'module' => 'Referers',
'action' => 'getWebsites',
@@ -104,7 +104,7 @@ class Referers extends \Piwik\Plugin
'order' => 5
),
array( // subtable report
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Websites'),
'module' => 'Referers',
'action' => 'getUrlsFromWebsiteId',
@@ -115,7 +115,7 @@ class Referers extends \Piwik\Plugin
),
array(
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_SearchEngines'),
'module' => 'Referers',
'action' => 'getSearchEngines',
@@ -125,7 +125,7 @@ class Referers extends \Piwik\Plugin
'order' => 7,
),
array( // subtable report
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_SearchEngines'),
'module' => 'Referers',
'action' => 'getKeywordsFromSearchEngineId',
@@ -136,7 +136,7 @@ class Referers extends \Piwik\Plugin
),
array(
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Campaigns'),
'module' => 'Referers',
'action' => 'getCampaigns',
@@ -147,7 +147,7 @@ class Referers extends \Piwik\Plugin
'order' => 9,
),
array( // subtable report
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Campaigns'),
'module' => 'Referers',
'action' => 'getKeywordsFromCampaignId',
@@ -158,7 +158,7 @@ class Referers extends \Piwik\Plugin
'order' => 10,
),
array(
- 'category' => Piwik_Translate('Referers_Referers'),
+ 'category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Socials'),
'module' => 'Referers',
'action' => 'getSocials',
@@ -174,7 +174,7 @@ class Referers extends \Piwik\Plugin
{
$segments[] = array(
'type' => 'dimension',
- 'category' => 'Referers_Referers',
+ 'category' => 'Referers_Referrers',
'name' => 'Referers_Type',
'segment' => 'referrerType',
'acceptedValues' => 'direct, search, website, campaign',
@@ -183,7 +183,7 @@ class Referers extends \Piwik\Plugin
);
$segments[] = array(
'type' => 'dimension',
- 'category' => 'Referers_Referers',
+ 'category' => 'Referers_Referrers',
'name' => 'General_ColumnKeyword',
'segment' => 'referrerKeyword',
'acceptedValues' => 'Encoded%20Keyword, keyword',
@@ -191,15 +191,15 @@ class Referers extends \Piwik\Plugin
);
$segments[] = array(
'type' => 'dimension',
- 'category' => 'Referers_Referers',
- 'name' => 'Referers_RefererName',
+ 'category' => 'Referers_Referrers',
+ 'name' => 'Referers_ReferrerName',
'segment' => 'referrerName',
'acceptedValues' => 'twitter.com, www.facebook.com, Bing, Google, Yahoo, CampaignName',
'sqlSegment' => 'log_visit.referer_name',
);
$segments[] = array(
'type' => 'dimension',
- 'category' => 'Referers_Referers',
+ 'category' => 'Referers_Referrers',
'name' => 'Live_Referrer_URL',
'acceptedValues' => 'http%3A%2F%2Fwww.example.org%2Freferer-page.htm',
'segment' => 'referrerUrl',
@@ -212,13 +212,13 @@ class Referers extends \Piwik\Plugin
*/
function addWidgets()
{
- WidgetsList::add('Referers_Referers', 'Referers_WidgetKeywords', 'Referers', 'getKeywords');
- WidgetsList::add('Referers_Referers', 'Referers_WidgetExternalWebsites', 'Referers', 'getWebsites');
- WidgetsList::add('Referers_Referers', 'Referers_WidgetSocials', 'Referers', 'getSocials');
- WidgetsList::add('Referers_Referers', 'Referers_SearchEngines', 'Referers', 'getSearchEngines');
- WidgetsList::add('Referers_Referers', 'Referers_Campaigns', 'Referers', 'getCampaigns');
- WidgetsList::add('Referers_Referers', 'General_Overview', 'Referers', 'getRefererType');
- WidgetsList::add('Referers_Referers', 'Referers_WidgetGetAll', 'Referers', 'getAll');
+ WidgetsList::add('Referers_Referrers', 'Referers_WidgetKeywords', 'Referers', 'getKeywords');
+ WidgetsList::add('Referers_Referrers', 'Referers_WidgetExternalWebsites', 'Referers', 'getWebsites');
+ WidgetsList::add('Referers_Referrers', 'Referers_WidgetSocials', 'Referers', 'getSocials');
+ WidgetsList::add('Referers_Referrers', 'Referers_SearchEngines', 'Referers', 'getSearchEngines');
+ WidgetsList::add('Referers_Referrers', 'Referers_Campaigns', 'Referers', 'getCampaigns');
+ WidgetsList::add('Referers_Referrers', 'General_Overview', 'Referers', 'getRefererType');
+ WidgetsList::add('Referers_Referrers', 'Referers_WidgetGetAll', 'Referers', 'getAll');
if (SettingsPiwik::isSegmentationEnabled()) {
WidgetsList::add('SEO', 'Referers_WidgetTopKeywordsForPages', 'Referers', 'getKeywordsForPage');
}
@@ -229,11 +229,11 @@ class Referers extends \Piwik\Plugin
*/
function addMenus()
{
- Piwik_AddMenu('Referers_Referers', '', array('module' => 'Referers', 'action' => 'index'), true, 20);
- Piwik_AddMenu('Referers_Referers', 'General_Overview', array('module' => 'Referers', 'action' => 'index'), true, 1);
- Piwik_AddMenu('Referers_Referers', 'Referers_SubmenuSearchEngines', array('module' => 'Referers', 'action' => 'getSearchEnginesAndKeywords'), true, 2);
- Piwik_AddMenu('Referers_Referers', 'Referers_SubmenuWebsites', array('module' => 'Referers', 'action' => 'indexWebsites'), true, 3);
- Piwik_AddMenu('Referers_Referers', 'Referers_Campaigns', array('module' => 'Referers', 'action' => 'indexCampaigns'), true, 4);
+ Piwik_AddMenu('Referers_Referrers', '', array('module' => 'Referers', 'action' => 'index'), true, 20);
+ Piwik_AddMenu('Referers_Referrers', 'General_Overview', array('module' => 'Referers', 'action' => 'index'), true, 1);
+ Piwik_AddMenu('Referers_Referrers', 'Referers_SubmenuSearchEngines', array('module' => 'Referers', 'action' => 'getSearchEnginesAndKeywords'), true, 2);
+ Piwik_AddMenu('Referers_Referrers', 'Referers_SubmenuWebsites', array('module' => 'Referers', 'action' => 'indexWebsites'), true, 3);
+ Piwik_AddMenu('Referers_Referrers', 'Referers_Campaigns', array('module' => 'Referers', 'action' => 'indexCampaigns'), true, 4);
}
/**
@@ -242,27 +242,27 @@ class Referers extends \Piwik\Plugin
public function getReportsWithGoalMetrics(&$dimensions)
{
$dimensions = array_merge($dimensions, array(
- array('category' => Piwik_Translate('Referers_Referers'),
+ array('category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Keywords'),
'module' => 'Referers',
'action' => 'getKeywords',
),
- array('category' => Piwik_Translate('Referers_Referers'),
+ array('category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_SearchEngines'),
'module' => 'Referers',
'action' => 'getSearchEngines',
),
- array('category' => Piwik_Translate('Referers_Referers'),
+ array('category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Websites'),
'module' => 'Referers',
'action' => 'getWebsites',
),
- array('category' => Piwik_Translate('Referers_Referers'),
+ array('category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Campaigns'),
'module' => 'Referers',
'action' => 'getCampaigns',
),
- array('category' => Piwik_Translate('Referers_Referers'),
+ array('category' => Piwik_Translate('Referers_Referrers'),
'name' => Piwik_Translate('Referers_Type'),
'module' => 'Referers',
'action' => 'getRefererType',
diff --git a/plugins/Referers/templates/index.twig b/plugins/Referers/templates/index.twig
index 9f15e13bd95c2e062f18677e52f8f7cc68434e91..3beeb1705a7cc7e3ed4263fb64d8661c68be8231 100644
--- a/plugins/Referers/templates/index.twig
+++ b/plugins/Referers/templates/index.twig
@@ -103,7 +103,7 @@
</div>
<div id='rightcolumn'>
- <h2>{{ 'Referers_DetailsByRefererType'|translate }}</h2>
+ <h2>{{ 'Referers_DetailsByReferrerType'|translate }}</h2>
{{ dataTableRefererType|raw }}
</div>
diff --git a/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php b/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php
index 02ba720acc884ed849f20609c64ffdee97a95bcd..9fdeb358a1faa0cca5f3cb86f531012245a84202 100644
--- a/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php
+++ b/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php
@@ -45,7 +45,7 @@ class WidgetsListTest extends DatabaseTestCase
'UserSettings_VisitorSettings' => 11,
'General_Actions' => 8,
'Actions_SubmenuSitesearch' => 5,
- 'Referers_Referers' => 7,
+ 'Referers_Referrers' => 7,
'Goals_Goals' => 1,
'SEO' => 2,
'Example Widgets' => 4,