diff --git a/core/WidgetsList.php b/core/WidgetsList.php
index f6da2e49a2c7d2dd5122632d36a511988f52b2b4..83a3fdc8e25eac4ebfd53b020585940638a4771c 100644
--- a/core/WidgetsList.php
+++ b/core/WidgetsList.php
@@ -77,7 +77,7 @@ class WidgetsList
'DevicesDetection_DevicesDetection',
'General_Actions',
'Actions_SubmenuSitesearch',
- 'Referers_Referrers',
+ 'Referrers_Referrers',
'Goals_Goals',
'Goals_Ecommerce',
'_others_',
diff --git a/lang/en.json b/lang/en.json
index 204969190c0e4a599952afb1f392b3c806cbbd32..e23a14dd9ee6848e014321bb4c57ff24677f8efc 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -1245,7 +1245,7 @@
"SubmenuLocationsProvider": "Locations & Provider",
"ProviderReportDocumentation": "This report shows which Internet Service Providers your visitors used to access the website. You can click on a provider name for more details. %s If Piwik can't determine a visitor's provider, it is listed as IP."
},
- "Referers": {
+ "Referrers": {
"PluginDescription": "Reports the Referrers data: Search Engines, Keywords, Websites, Campaign Tracking, Direct Entry.",
"Referrer": "Referrer",
"Referrers": "Referrers",
diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index a2e5e8297f79381a7188c970e506ae44c5c5ba15..0c965e7cc754137bd38d3b7c848cdd443c5e1d07 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_Referrers'),
+ Piwik_Translate('Referrers_Referrers'),
Piwik_Translate('Goals_Goals'),
Piwik_Translate('General_Visitors'),
Piwik_Translate('DevicesDetection_DevicesDetection'),
diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig
index 175018677ada37d36eb8bc21e8c2818e4ded75e0..ec425ee5dd3f7f1d5ce6b6dc2965fa37533ecc07 100755
--- a/plugins/DBStats/templates/index.twig
+++ b/plugins/DBStats/templates/index.twig
@@ -19,7 +19,7 @@
<p style="font-size:1.4em;padding-left:21px;line-height:1.8em;">
<strong><em>{{ userCount }}</em></strong> {% if userCount == 1 %}{{ 'UsersManager_User'|translate }}{% else %}{{ 'UsersManager_MenuUsers'|translate }}{% endif %}
<br/>
- <strong><em>{{ siteCount }}</em></strong> {% if siteCount == 1 %}{{ 'General_Website'|translate }}{% else %}{{ 'Referers_Websites'|translate }}{% endif %}
+ <strong><em>{{ siteCount }}</em></strong> {% if siteCount == 1 %}{{ 'General_Website'|translate }}{% else %}{{ 'Referrers_Websites'|translate }}{% endif %}
</p><br/>
{% set clickDeleteLogSettings %}{{ 'PrivacyManager_DeleteDataSettings'|translate }}{% endset %}
<h3 style="margin-top:0;">{{ 'PrivacyManager_DeleteDataSettings'|translate }}</h3><br/>
diff --git a/plugins/Live/API.php b/plugins/Live/API.php
index ef6661d6aa222a15b658b4c6ab78b88332c021cb..4fb04ca616c87c1356fff1dfb7682f269b4fdac3 100644
--- a/plugins/Live/API.php
+++ b/plugins/Live/API.php
@@ -466,7 +466,7 @@ class API
if ($referrerType === false
|| $referrerType == 'direct'
) {
- $result = Piwik_Translate('Referers_DirectEntry');
+ $result = Piwik_Translate('Referrers_DirectEntry');
} else if ($referrerType == 'search') {
$result = $visit->getColumn('referrerName');
@@ -477,7 +477,7 @@ class API
$result .= ' (' . $keyword . ')';
}
} else if ($referrerType == 'campaign') {
- $result = Piwik_Translate('Referers_ColumnCampaign') . ' (' . $visit->getColumn('referrerName') . ')';
+ $result = Piwik_Translate('Referrers_ColumnCampaign') . ' (' . $visit->getColumn('referrerName') . ')';
} else {
$result = $visit->getColumn('referrerName');
}
diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig
index 244b09e5dcc3966c57680116ac14f482d1e42ca6..3d090748df7be7e1e4f1843274988b8283ed3daa 100644
--- a/plugins/Live/templates/_dataTableViz_visitorLog.twig
+++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig
@@ -116,14 +116,14 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
<td class="column">
<div class="referer">
{% if visitor.getColumn('referrerType') == 'website' %}
- {{ 'Referers_ColumnWebsite'|translate }}:
+ {{ 'Referrers_ColumnWebsite'|translate }}:
<a href="{{ visitor.getColumn('referrerUrl') }}" target="_blank" title="{{ visitor.getColumn('referrerUrl') }}"
style="text-decoration:underline;">
{{ visitor.getColumn('referrerName') }}
</a>
{% endif %}
{% if visitor.getColumn('referrerType') == 'campaign' %}
- {{ 'Referers_ColumnCampaign'|translate }}
+ {{ 'Referrers_ColumnCampaign'|translate }}
<br/>
{{ visitor.getColumn('referrerName') }}
{% if visitor.getColumn('referrerKeyword') is not empty %} - {{ visitor.getColumn('referrerKeyword') }}{% endif %}
@@ -135,7 +135,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
<img src="{{ visitor.getColumn('searchEngineIcon') }}" alt="{{ visitor.getColumn('referrerName') }}"/>
{% endif %}
<span {% if not showKeyword %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitor.getColumn('referrerName') }}</span>
- {% if showKeyword %}{{ 'Referers_Keywords'|translate }}:
+ {% if showKeyword %}{{ 'Referrers_Keywords'|translate }}:
<br/>
<a href="{{ visitor.getColumn('referrerUrl') }}" target="_blank" style="text-decoration:underline;">
"{{ visitor.getColumn('referrerKeyword') }}"</a>
@@ -150,7 +150,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
</span>
{% endif %}
{% endif %}
- {% if visitor.getColumn('referrerType') == 'direct' %}{{ 'Referers_DirectEntry'|translate }}{% endif %}
+ {% if visitor.getColumn('referrerType') == 'direct' %}{{ 'Referrers_DirectEntry'|translate }}{% endif %}
</div>
</td>
<td class="column {% if visitor.getColumn('visitConverted') and not isWidget %}highlightField{% endif %}">
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig
index 80a4d314206f551896fec140e5020b9e98abe62d..eacc3b73d42974c1bbfde31915b2f9766a96231a 100644
--- a/plugins/Live/templates/getLastVisitsStart.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
@@ -59,7 +59,7 @@
</span>
{% endif %}
{% else %}
- {{ 'Referers_DirectEntry'|translate }}
+ {{ 'Referrers_DirectEntry'|translate }}
{% endif %}
</div>
<div id="{{ visitor.idVisit }}_actions" class="settings">
diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php
index 9c4af4d0e1029f5030cef39fb49d26516c6e885c..6d5994371b52f4a162b65a522d7df819e123c0d0 100644
--- a/plugins/Referers/Controller.php
+++ b/plugins/Referers/Controller.php
@@ -109,18 +109,18 @@ class Controller extends \Piwik\Controller
$referrersReportsByDimension = new View\ReportsByDimension();
$referrersReportsByDimension->addReport(
- 'Referers_ViewAllReferrers', 'Referers_WidgetGetAll', 'Referers.getAll');
+ 'Referrers_ViewAllReferrers', 'Referrers_WidgetGetAll', 'Referers.getAll');
- $byTypeCategory = Piwik_Translate('Referers_ViewReferrersBy', Piwik_Translate('Live_GoalType'));
+ $byTypeCategory = Piwik_Translate('Referrers_ViewReferrersBy', Piwik_Translate('Live_GoalType'));
$referrersReportsByDimension->addReport(
- $byTypeCategory, 'Referers_WidgetKeywords', 'Referers.getKeywords');
+ $byTypeCategory, 'Referrers_WidgetKeywords', 'Referers.getKeywords');
$referrersReportsByDimension->addReport($byTypeCategory, 'SitesManager_Sites', 'Referers.getWebsites');
- $referrersReportsByDimension->addReport($byTypeCategory, 'Referers_Campaigns', 'Referers.getCampaigns');
+ $referrersReportsByDimension->addReport($byTypeCategory, 'Referrers_Campaigns', 'Referers.getCampaigns');
- $bySourceCategory = Piwik_Translate('Referers_ViewReferrersBy', Piwik_Translate('General_Source'));
- $referrersReportsByDimension->addReport($bySourceCategory, 'Referers_Socials', 'Referers.getSocials');
+ $bySourceCategory = Piwik_Translate('Referrers_ViewReferrersBy', Piwik_Translate('General_Source'));
+ $referrersReportsByDimension->addReport($bySourceCategory, 'Referrers_Socials', 'Referers.getSocials');
$referrersReportsByDimension->addReport(
- $bySourceCategory, 'Referers_SearchEngines', 'Referers.getSearchEngines');
+ $bySourceCategory, 'Referrers_SearchEngines', 'Referers.getSearchEngines');
$result = $referrersReportsByDimension->render();
}
@@ -204,7 +204,7 @@ class Controller extends \Piwik\Controller
public function indexCampaigns($fetch = false)
{
return View::singleReport(
- Piwik_Translate('Referers_Campaigns'),
+ Piwik_Translate('Referrers_Campaigns'),
$this->getCampaigns(true), $fetch);
}
@@ -303,10 +303,10 @@ class Controller extends \Piwik\Controller
$view->visualization_properties->row_picker_match_rows_by = 'label';
$view->visualization_properties->rows_to_display = $visibleRows;
- $view->documentation = Piwik_Translate('Referers_EvolutionDocumentation') . '<br />'
+ $view->documentation = Piwik_Translate('Referrers_EvolutionDocumentation') . '<br />'
. Piwik_Translate('General_BrokenDownReportDocumentation') . '<br />'
- . Piwik_Translate('Referers_EvolutionDocumentationMoreInfo', '"'
- . Piwik_Translate('Referers_DetailsByReferrerType') . '"');
+ . Piwik_Translate('Referrers_EvolutionDocumentationMoreInfo', '"'
+ . Piwik_Translate('Referrers_DetailsByReferrerType') . '"');
return $this->renderView($view, $fetch);
}
@@ -314,7 +314,7 @@ class Controller extends \Piwik\Controller
public function getLastDistinctSearchEnginesGraph($fetch = false)
{
$view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referers.getNumberOfDistinctSearchEngines");
- $view->translations['Referers_distinctSearchEngines'] = ucfirst(Piwik_Translate('Referers_DistinctSearchEngines'));
+ $view->translations['Referers_distinctSearchEngines'] = ucfirst(Piwik_Translate('Referrers_DistinctSearchEngines'));
$view->columns_to_display = array('Referers_distinctSearchEngines');
return $this->renderView($view, $fetch);
}
@@ -322,7 +322,7 @@ class Controller extends \Piwik\Controller
public function getLastDistinctKeywordsGraph($fetch = false)
{
$view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referers.getNumberOfDistinctKeywords");
- $view->translations['Referers_distinctKeywords'] = ucfirst(Piwik_Translate('Referers_DistinctKeywords'));
+ $view->translations['Referers_distinctKeywords'] = ucfirst(Piwik_Translate('Referrers_DistinctKeywords'));
$view->columns_to_display = array('Referers_distinctKeywords');
return $this->renderView($view, $fetch);
}
@@ -330,7 +330,7 @@ class Controller extends \Piwik\Controller
public function getLastDistinctWebsitesGraph($fetch = false)
{
$view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referers.getNumberOfDistinctWebsites");
- $view->translations['Referers_distinctWebsites'] = ucfirst(Piwik_Translate('Referers_DistinctWebsites'));
+ $view->translations['Referers_distinctWebsites'] = ucfirst(Piwik_Translate('Referrers_DistinctWebsites'));
$view->columns_to_display = array('Referers_distinctWebsites');
return $this->renderView($view, $fetch);
}
@@ -338,7 +338,7 @@ class Controller extends \Piwik\Controller
public function getLastDistinctCampaignsGraph($fetch = false)
{
$view = $this->getLastUnitGraph($this->pluginName, __FUNCTION__, "Referers.getNumberOfDistinctCampaigns");
- $view->translations['Referers_distinctCampaigns'] = ucfirst(Piwik_Translate('Referers_DistinctCampaigns'));
+ $view->translations['Referers_distinctCampaigns'] = ucfirst(Piwik_Translate('Referrers_DistinctCampaigns'));
$view->columns_to_display = array('Referers_distinctCampaigns');
return $this->renderView($view, $fetch);
}
diff --git a/plugins/Referers/Referers.php b/plugins/Referers/Referers.php
index ee5e344ec0db9d8f911d367e1e883081f15bf33d..a497e600bd4e9c7f267f75076fddf3c4ae4ad77a 100644
--- a/plugins/Referers/Referers.php
+++ b/plugins/Referers/Referers.php
@@ -47,124 +47,124 @@ class Referers extends \Piwik\Plugin
{
$reports = array_merge($reports, array(
array(
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Type'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Type'),
'module' => 'Referers',
'action' => 'getRefererType',
- 'dimension' => Piwik_Translate('Referers_Type'),
+ 'dimension' => Piwik_Translate('Referrers_Type'),
'constantRowsCount' => true,
- 'documentation' => Piwik_Translate('Referers_TypeReportDocumentation') . '<br />'
- . '<b>' . Piwik_Translate('Referers_DirectEntry') . ':</b> ' . Piwik_Translate('Referers_DirectEntryDocumentation') . '<br />'
- . '<b>' . Piwik_Translate('Referers_SearchEngines') . ':</b> ' . Piwik_Translate('Referers_SearchEnginesDocumentation',
- array('<br />', '"' . Piwik_Translate('Referers_SubmenuSearchEngines') . '"')) . '<br />'
- . '<b>' . Piwik_Translate('Referers_Websites') . ':</b> ' . Piwik_Translate('Referers_WebsitesDocumentation',
- array('<br />', '"' . Piwik_Translate('Referers_SubmenuWebsites') . '"')) . '<br />'
- . '<b>' . Piwik_Translate('Referers_Campaigns') . ':</b> ' . Piwik_Translate('Referers_CampaignsDocumentation',
- array('<br />', '"' . Piwik_Translate('Referers_Campaigns') . '"')),
+ 'documentation' => Piwik_Translate('Referrers_TypeReportDocumentation') . '<br />'
+ . '<b>' . Piwik_Translate('Referrers_DirectEntry') . ':</b> ' . Piwik_Translate('Referrers_DirectEntryDocumentation') . '<br />'
+ . '<b>' . Piwik_Translate('Referrers_SearchEngines') . ':</b> ' . Piwik_Translate('Referrers_SearchEnginesDocumentation',
+ array('<br />', '"' . Piwik_Translate('Referrers_SubmenuSearchEngines') . '"')) . '<br />'
+ . '<b>' . Piwik_Translate('Referrers_Websites') . ':</b> ' . Piwik_Translate('Referrers_WebsitesDocumentation',
+ array('<br />', '"' . Piwik_Translate('Referrers_SubmenuWebsites') . '"')) . '<br />'
+ . '<b>' . Piwik_Translate('Referrers_Campaigns') . ':</b> ' . Piwik_Translate('Referrers_CampaignsDocumentation',
+ array('<br />', '"' . Piwik_Translate('Referrers_Campaigns') . '"')),
'order' => 1,
),
array(
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_WidgetGetAll'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_WidgetGetAll'),
'module' => 'Referers',
'action' => 'getAll',
- 'dimension' => Piwik_Translate('Referers_Referrer'),
- 'documentation' => Piwik_Translate('Referers_AllReferrersReportDocumentation', '<br />'),
+ 'dimension' => Piwik_Translate('Referrers_Referrer'),
+ 'documentation' => Piwik_Translate('Referrers_AllReferrersReportDocumentation', '<br />'),
'order' => 2,
),
array(
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Keywords'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Keywords'),
'module' => 'Referers',
'action' => 'getKeywords',
'actionToLoadSubTables' => 'getSearchEnginesFromKeywordId',
'dimension' => Piwik_Translate('General_ColumnKeyword'),
- 'documentation' => Piwik_Translate('Referers_KeywordsReportDocumentation', '<br />'),
+ 'documentation' => Piwik_Translate('Referrers_KeywordsReportDocumentation', '<br />'),
'order' => 3,
),
array( // subtable report
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Keywords'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Keywords'),
'module' => 'Referers',
'action' => 'getSearchEnginesFromKeywordId',
- 'dimension' => Piwik_Translate('Referers_ColumnSearchEngine'),
- 'documentation' => Piwik_Translate('Referers_KeywordsReportDocumentation', '<br />'),
+ 'dimension' => Piwik_Translate('Referrers_ColumnSearchEngine'),
+ 'documentation' => Piwik_Translate('Referrers_KeywordsReportDocumentation', '<br />'),
'isSubtableReport' => true,
'order' => 4
),
array(
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Websites'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Websites'),
'module' => 'Referers',
'action' => 'getWebsites',
- 'dimension' => Piwik_Translate('Referers_ColumnWebsite'),
- 'documentation' => Piwik_Translate('Referers_WebsitesReportDocumentation', '<br />'),
+ 'dimension' => Piwik_Translate('Referrers_ColumnWebsite'),
+ 'documentation' => Piwik_Translate('Referrers_WebsitesReportDocumentation', '<br />'),
'actionToLoadSubTables' => 'getUrlsFromWebsiteId',
'order' => 5
),
array( // subtable report
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Websites'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Websites'),
'module' => 'Referers',
'action' => 'getUrlsFromWebsiteId',
- 'dimension' => Piwik_Translate('Referers_ColumnWebsitePage'),
- 'documentation' => Piwik_Translate('Referers_WebsitesReportDocumentation', '<br />'),
+ 'dimension' => Piwik_Translate('Referrers_ColumnWebsitePage'),
+ 'documentation' => Piwik_Translate('Referrers_WebsitesReportDocumentation', '<br />'),
'isSubtableReport' => true,
'order' => 6,
),
array(
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_SearchEngines'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_SearchEngines'),
'module' => 'Referers',
'action' => 'getSearchEngines',
- 'dimension' => Piwik_Translate('Referers_ColumnSearchEngine'),
- 'documentation' => Piwik_Translate('Referers_SearchEnginesReportDocumentation', '<br />'),
+ 'dimension' => Piwik_Translate('Referrers_ColumnSearchEngine'),
+ 'documentation' => Piwik_Translate('Referrers_SearchEnginesReportDocumentation', '<br />'),
'actionToLoadSubTables' => 'getKeywordsFromSearchEngineId',
'order' => 7,
),
array( // subtable report
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_SearchEngines'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_SearchEngines'),
'module' => 'Referers',
'action' => 'getKeywordsFromSearchEngineId',
'dimension' => Piwik_Translate('General_ColumnKeyword'),
- 'documentation' => Piwik_Translate('Referers_SearchEnginesReportDocumentation', '<br />'),
+ 'documentation' => Piwik_Translate('Referrers_SearchEnginesReportDocumentation', '<br />'),
'isSubtableReport' => true,
'order' => 8,
),
array(
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Campaigns'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Campaigns'),
'module' => 'Referers',
'action' => 'getCampaigns',
- 'dimension' => Piwik_Translate('Referers_ColumnCampaign'),
- 'documentation' => Piwik_Translate('Referers_CampaignsReportDocumentation',
+ 'dimension' => Piwik_Translate('Referrers_ColumnCampaign'),
+ 'documentation' => Piwik_Translate('Referrers_CampaignsReportDocumentation',
array('<br />', '<a href="http://piwik.org/docs/tracking-campaigns/" target="_blank">', '</a>')),
'actionToLoadSubTables' => 'getKeywordsFromCampaignId',
'order' => 9,
),
array( // subtable report
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Campaigns'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Campaigns'),
'module' => 'Referers',
'action' => 'getKeywordsFromCampaignId',
'dimension' => Piwik_Translate('General_ColumnKeyword'),
- 'documentation' => Piwik_Translate('Referers_CampaignsReportDocumentation',
+ 'documentation' => Piwik_Translate('Referrers_CampaignsReportDocumentation',
array('<br />', '<a href="http://piwik.org/docs/tracking-campaigns/" target="_blank">', '</a>')),
'isSubtableReport' => true,
'order' => 10,
),
array(
- 'category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Socials'),
+ 'category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Socials'),
'module' => 'Referers',
'action' => 'getSocials',
'actionToLoadSubTables' => 'getUrlsForSocial',
- 'dimension' => Piwik_Translate('Referers_ColumnSocial'),
- 'documentation' => Piwik_Translate('Referers_WebsitesReportDocumentation', '<br />'),
+ 'dimension' => Piwik_Translate('Referrers_ColumnSocial'),
+ 'documentation' => Piwik_Translate('Referrers_WebsitesReportDocumentation', '<br />'),
'order' => 11,
),
));
@@ -174,8 +174,8 @@ class Referers extends \Piwik\Plugin
{
$segments[] = array(
'type' => 'dimension',
- 'category' => 'Referers_Referrers',
- 'name' => 'Referers_Type',
+ 'category' => 'Referrers_Referrers',
+ 'name' => 'Referrers_Type',
'segment' => 'referrerType',
'acceptedValues' => 'direct, search, website, campaign',
'sqlSegment' => 'log_visit.referer_type',
@@ -183,7 +183,7 @@ class Referers extends \Piwik\Plugin
);
$segments[] = array(
'type' => 'dimension',
- 'category' => 'Referers_Referrers',
+ 'category' => 'Referrers_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_Referrers',
- 'name' => 'Referers_ReferrerName',
+ 'category' => 'Referrers_Referrers',
+ 'name' => 'Referrers_ReferrerName',
'segment' => 'referrerName',
'acceptedValues' => 'twitter.com, www.facebook.com, Bing, Google, Yahoo, CampaignName',
'sqlSegment' => 'log_visit.referer_name',
);
$segments[] = array(
'type' => 'dimension',
- 'category' => 'Referers_Referrers',
+ 'category' => 'Referrers_Referrers',
'name' => 'Live_Referrer_URL',
'acceptedValues' => 'http%3A%2F%2Fwww.example.org%2Freferer-page.htm',
'segment' => 'referrerUrl',
@@ -212,15 +212,15 @@ class Referers extends \Piwik\Plugin
*/
function addWidgets()
{
- 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');
+ WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetKeywords', 'Referers', 'getKeywords');
+ WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetExternalWebsites', 'Referers', 'getWebsites');
+ WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetSocials', 'Referers', 'getSocials');
+ WidgetsList::add('Referrers_Referrers', 'Referrers_SearchEngines', 'Referers', 'getSearchEngines');
+ WidgetsList::add('Referrers_Referrers', 'Referrers_Campaigns', 'Referers', 'getCampaigns');
+ WidgetsList::add('Referrers_Referrers', 'General_Overview', 'Referers', 'getRefererType');
+ WidgetsList::add('Referrers_Referrers', 'Referrers_WidgetGetAll', 'Referers', 'getAll');
if (SettingsPiwik::isSegmentationEnabled()) {
- WidgetsList::add('SEO', 'Referers_WidgetTopKeywordsForPages', 'Referers', 'getKeywordsForPage');
+ WidgetsList::add('SEO', 'Referrers_WidgetTopKeywordsForPages', 'Referers', 'getKeywordsForPage');
}
}
@@ -229,11 +229,11 @@ class Referers extends \Piwik\Plugin
*/
function addMenus()
{
- 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);
+ Piwik_AddMenu('Referrers_Referrers', '', array('module' => 'Referers', 'action' => 'index'), true, 20);
+ Piwik_AddMenu('Referrers_Referrers', 'General_Overview', array('module' => 'Referers', 'action' => 'index'), true, 1);
+ Piwik_AddMenu('Referrers_Referrers', 'Referrers_SubmenuSearchEngines', array('module' => 'Referers', 'action' => 'getSearchEnginesAndKeywords'), true, 2);
+ Piwik_AddMenu('Referrers_Referrers', 'Referrers_SubmenuWebsites', array('module' => 'Referers', 'action' => 'indexWebsites'), true, 3);
+ Piwik_AddMenu('Referrers_Referrers', 'Referrers_Campaigns', array('module' => 'Referers', 'action' => 'indexCampaigns'), true, 4);
}
/**
@@ -242,28 +242,28 @@ class Referers extends \Piwik\Plugin
public function getReportsWithGoalMetrics(&$dimensions)
{
$dimensions = array_merge($dimensions, array(
- array('category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Keywords'),
+ array('category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Keywords'),
'module' => 'Referers',
'action' => 'getKeywords',
),
- array('category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_SearchEngines'),
+ array('category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_SearchEngines'),
'module' => 'Referers',
'action' => 'getSearchEngines',
),
- array('category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Websites'),
+ array('category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Websites'),
'module' => 'Referers',
'action' => 'getWebsites',
),
- array('category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Campaigns'),
+ array('category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Campaigns'),
'module' => 'Referers',
'action' => 'getCampaigns',
),
- array('category' => Piwik_Translate('Referers_Referrers'),
- 'name' => Piwik_Translate('Referers_Type'),
+ array('category' => Piwik_Translate('Referrers_Referrers'),
+ 'name' => Piwik_Translate('Referrers_Type'),
'module' => 'Referers',
'action' => 'getRefererType',
),
@@ -312,16 +312,16 @@ class Referers extends \Piwik\Plugin
private function getDisplayPropertiesForGetRefererType()
{
$idSubtable = Common::getRequestVar('idSubtable', false);
- $labelColumnTitle = Piwik_Translate('Referers_Type');
+ $labelColumnTitle = Piwik_Translate('Referrers_Type');
switch ($idSubtable) {
case Common::REFERRER_TYPE_SEARCH_ENGINE:
- $labelColumnTitle = Piwik_Translate('Referers_ColumnSearchEngine');
+ $labelColumnTitle = Piwik_Translate('Referrers_ColumnSearchEngine');
break;
case Common::REFERRER_TYPE_WEBSITE:
- $labelColumnTitle = Piwik_Translate('Referers_ColumnWebsite');
+ $labelColumnTitle = Piwik_Translate('Referrers_ColumnWebsite');
break;
case Common::REFERRER_TYPE_CAMPAIGN:
- $labelColumnTitle = Piwik_Translate('Referers_ColumnCampaign');
+ $labelColumnTitle = Piwik_Translate('Referrers_ColumnCampaign');
break;
default:
break;
@@ -350,7 +350,7 @@ class Referers extends \Piwik\Plugin
$setGetAllHtmlPrefix = array($this, 'setGetAllHtmlPrefix');
return array(
'show_exclude_low_population' => false,
- 'translations' => array('label' => Piwik_Translate('Referers_Referrer')),
+ 'translations' => array('label' => Piwik_Translate('Referrers_Referrer')),
'show_goals' => true,
'filter_limit' => 20,
'visualization_properties' => array(
@@ -385,7 +385,7 @@ class Referers extends \Piwik\Plugin
return array(
'show_search' => false,
'show_exclude_low_population' => false,
- 'translations' => array('label' => Piwik_Translate('Referers_ColumnSearchEngine'))
+ 'translations' => array('label' => Piwik_Translate('Referrers_ColumnSearchEngine'))
);
}
@@ -397,7 +397,7 @@ class Referers extends \Piwik\Plugin
'show_exclude_low_population' => false,
'show_goals' => true,
'filter_limit' => 25,
- 'translations' => array('label' => Piwik_Translate('Referers_ColumnSearchEngine')),
+ 'translations' => array('label' => Piwik_Translate('Referrers_ColumnSearchEngine')),
'visualization_properties' => array(
'table' => array(
'disable_subtable_when_show_goals' => true,
@@ -422,7 +422,7 @@ class Referers extends \Piwik\Plugin
'show_exclude_low_population' => false,
'show_goals' => true,
'filter_limit' => 25,
- 'translations' => array('label' => Piwik_Translate('Referers_ColumnWebsite')),
+ 'translations' => array('label' => Piwik_Translate('Referrers_ColumnWebsite')),
'visualization_properties' => array(
'table' => array(
'disable_subtable_when_show_goals' => true,
@@ -439,7 +439,7 @@ class Referers extends \Piwik\Plugin
'show_exclude_low_population' => false,
'filter_limit' => 10,
'show_goals' => true,
- 'translations' => array('label' => Piwik_Translate('Referers_ColumnSocial')),
+ 'translations' => array('label' => Piwik_Translate('Referrers_ColumnSocial')),
'visualization_properties' => array(
'table' => array(
'disable_subtable_when_show_goals' => true,
@@ -449,7 +449,7 @@ class Referers extends \Piwik\Plugin
$widget = Common::getRequestVar('widget', false);
if (empty($widget)) {
- $result['show_footer_message'] = Piwik_Translate('Referers_SocialFooterMessage');
+ $result['show_footer_message'] = Piwik_Translate('Referrers_SocialFooterMessage');
}
return $result;
@@ -461,7 +461,7 @@ class Referers extends \Piwik\Plugin
'show_exclude_low_population' => false,
'filter_limit' => 10,
'show_goals' => true,
- 'translations' => array('label' => Piwik_Translate('Referers_ColumnWebsitePage'))
+ 'translations' => array('label' => Piwik_Translate('Referrers_ColumnWebsitePage'))
);
}
@@ -472,11 +472,11 @@ class Referers extends \Piwik\Plugin
'show_exclude_low_population' => false,
'show_goals' => true,
'filter_limit' => 25,
- 'translations' => array('label' => Piwik_Translate('Referers_ColumnCampaign')),
+ 'translations' => array('label' => Piwik_Translate('Referrers_ColumnCampaign')),
);
if (Common::getRequestVar('viewDataTable', false) != 'graphEvolution') {
- $result['show_footer_message'] = Piwik_Translate('Referers_CampaignFooterHelp',
+ $result['show_footer_message'] = Piwik_Translate('Referrers_CampaignFooterHelp',
array('<a target="_blank" href="http://piwik.org/docs/tracking-campaigns/">',
'</a> - <a target="_blank" href="http://piwik.org/docs/tracking-campaigns/url-builder/">',
'</a>')
@@ -500,7 +500,7 @@ class Referers extends \Piwik\Plugin
return array(
'show_search' => false,
'show_exclude_low_population' => false,
- 'translations' => array('label' => Piwik_Translate('Referers_ColumnWebsitePage')),
+ 'translations' => array('label' => Piwik_Translate('Referrers_ColumnWebsitePage')),
'tooltip_metadata_name' => 'url'
);
}
@@ -518,16 +518,16 @@ class Referers extends \Piwik\Plugin
$indexTranslation = '';
switch ($referrerType) {
case Common::REFERRER_TYPE_DIRECT_ENTRY:
- $indexTranslation = 'Referers_DirectEntry';
+ $indexTranslation = 'Referrers_DirectEntry';
break;
case Common::REFERRER_TYPE_SEARCH_ENGINE:
$indexTranslation = 'General_ColumnKeyword';
break;
case Common::REFERRER_TYPE_WEBSITE:
- $indexTranslation = 'Referers_ColumnWebsite';
+ $indexTranslation = 'Referrers_ColumnWebsite';
break;
case Common::REFERRER_TYPE_CAMPAIGN:
- $indexTranslation = 'Referers_ColumnCampaign';
+ $indexTranslation = 'Referrers_ColumnCampaign';
break;
default:
// case of newsletter, partners, before Piwik 0.2.25
diff --git a/plugins/Referers/templates/getSearchEnginesAndKeywords.twig b/plugins/Referers/templates/getSearchEnginesAndKeywords.twig
index d93092163137fb7ad2d95c3d846603477f8240e4..c24463ba7d68b209469efef123ac6b40178721b0 100644
--- a/plugins/Referers/templates/getSearchEnginesAndKeywords.twig
+++ b/plugins/Referers/templates/getSearchEnginesAndKeywords.twig
@@ -1,9 +1,9 @@
<div id='leftcolumn'>
- <h2>{{ 'Referers_Keywords'|translate }}</h2>
+ <h2>{{ 'Referrers_Keywords'|translate }}</h2>
{{ keywords|raw }}
</div>
<div id='rightcolumn'>
- <h2>{{ 'Referers_SearchEngines'|translate }}</h2>
+ <h2>{{ 'Referrers_SearchEngines'|translate }}</h2>
{{ searchEngines|raw }}
</div>
diff --git a/plugins/Referers/templates/index.twig b/plugins/Referers/templates/index.twig
index 3beeb1705a7cc7e3ed4263fb64d8661c68be8231..758f995a06a0a6138e8e391a781e4054f88e42ec 100644
--- a/plugins/Referers/templates/index.twig
+++ b/plugins/Referers/templates/index.twig
@@ -3,11 +3,11 @@
<br/>
<div id='leftcolumn' style="position:relative;">
- <h2>{{ 'Referers_Type'|translate }}</h2>
+ <h2>{{ 'Referrers_Type'|translate }}</h2>
<div id='leftcolumn'>
<div class="sparkline">{{ sparkline(urlSparklineDirectEntry) }}
- {{ 'Referers_TypeDirectEntries'|translate("<strong>"~visitorsFromDirectEntry~"</strong>")|raw }}
+ {{ 'Referrers_TypeDirectEntries'|translate("<strong>"~visitorsFromDirectEntry~"</strong>")|raw }}
{% if visitorsFromDirectEntryPercent|default is not empty %},
<strong>{{ visitorsFromDirectEntryPercent }}%</strong> of visits
{% endif %}
@@ -16,7 +16,7 @@
{% endif %}
</div>
<div class="sparkline">{{ sparkline(urlSparklineSearchEngines) }}
- {{ 'Referers_TypeSearchEngines'|translate("<strong>"~visitorsFromSearchEngines~"</strong>")|raw }}
+ {{ 'Referrers_TypeSearchEngines'|translate("<strong>"~visitorsFromSearchEngines~"</strong>")|raw }}
{% if visitorsFromSearchEnginesPercent|default is not empty %},
<strong>{{ visitorsFromSearchEnginesPercent }}%</strong> of visits
{% endif %}
@@ -27,7 +27,7 @@
</div>
<div id='rightcolumn'>
<div class="sparkline">{{ sparkline(urlSparklineWebsites) }}
- {{ 'Referers_TypeWebsites'|translate("<strong>"~visitorsFromWebsites~"</strong>")|raw }}
+ {{ 'Referrers_TypeWebsites'|translate("<strong>"~visitorsFromWebsites~"</strong>")|raw }}
{% if visitorsFromWebsitesPercent|default is not empty %},
<strong>{{ visitorsFromWebsitesPercent }}%</strong> of visits
{% endif %}
@@ -36,7 +36,7 @@
{% endif %}
</div>
<div class="sparkline">{{ sparkline(urlSparklineCampaigns) }}
- {{ 'Referers_TypeCampaigns'|translate("<strong>"~visitorsFromCampaigns~"</strong>")|raw }}
+ {{ 'Referrers_TypeCampaigns'|translate("<strong>"~visitorsFromCampaigns~"</strong>")|raw }}
{% if visitorsFromCampaignsPercent|default is not empty %},
<strong>{{ visitorsFromCampaignsPercent }}%</strong> of visits
{% endif %}
@@ -61,13 +61,13 @@
<tr>
<td width="50%">
<div class="sparkline">{{ sparkline(urlSparklineDistinctSearchEngines) }}
- <strong>{{ numberDistinctSearchEngines }}</strong> {{ 'Referers_DistinctSearchEngines'|translate }}
+ <strong>{{ numberDistinctSearchEngines }}</strong> {{ 'Referrers_DistinctSearchEngines'|translate }}
{% if numberDistinctSearchEnginesEvolution is not empty %}
{{ numberDistinctSearchEnginesEvolution|raw }}
{% endif %}
</div>
<div class="sparkline">{{ sparkline(urlSparklineDistinctKeywords) }}
- <strong>{{ numberDistinctKeywords }}</strong> {{ 'Referers_DistinctKeywords'|translate }}
+ <strong>{{ numberDistinctKeywords }}</strong> {{ 'Referrers_DistinctKeywords'|translate }}
{% if numberDistinctKeywordsEvolution is not empty %}
{{ numberDistinctKeywordsEvolution|raw }}
{% endif %}
@@ -75,14 +75,14 @@
</td>
<td width="50%">
<div class="sparkline">{{ sparkline(urlSparklineDistinctWebsites) }}
- <strong>{{ numberDistinctWebsites }}</strong> {{ 'Referers_DistinctWebsites'|translate }}
- {{ 'Referers_UsingNDistinctUrls'|translate("<strong>"~numberDistinctWebsitesUrls~"</strong>") }}
+ <strong>{{ numberDistinctWebsites }}</strong> {{ 'Referrers_DistinctWebsites'|translate }}
+ {{ 'Referrers_UsingNDistinctUrls'|translate("<strong>"~numberDistinctWebsitesUrls~"</strong>") }}
{% if numberDistinctWebsitesEvolution is not empty %}
{{ numberDistinctWebsitesEvolution|raw }}
{% endif %}
</div>
<div class="sparkline">{{ sparkline(urlSparklineDistinctCampaigns) }}
- <strong>{{ numberDistinctCampaigns }}</strong> {{ 'Referers_DistinctCampaigns'|translate }}
+ <strong>{{ numberDistinctCampaigns }}</strong> {{ 'Referrers_DistinctCampaigns'|translate }}
{% if numberDistinctCampaignsEvolution is not empty %}
{{ numberDistinctCampaignsEvolution|raw }}
{% endif %}
@@ -96,21 +96,21 @@
<p style="clear:both;"/>
<div style="float:left;">{{ 'General_View'|translate }}
- <a href="javascript:broadcast.propagateAjax('module=Referers&action=getSearchEnginesAndKeywords')">{{ 'Referers_SubmenuSearchEngines'|translate }}</a>,
- <a href="javascript:broadcast.propagateAjax('module=Referers&action=indexWebsites')">{{ 'Referers_SubmenuWebsites'|translate }}</a>,
- <a href="javascript:broadcast.propagateAjax('module=Referers&action=indexCampaigns')">{{ 'Referers_Campaigns'|translate }}</a>.
+ <a href="javascript:broadcast.propagateAjax('module=Referers&action=getSearchEnginesAndKeywords')">{{ 'Referrers_SubmenuSearchEngines'|translate }}</a>,
+ <a href="javascript:broadcast.propagateAjax('module=Referers&action=indexWebsites')">{{ 'Referrers_SubmenuWebsites'|translate }}</a>,
+ <a href="javascript:broadcast.propagateAjax('module=Referers&action=indexCampaigns')">{{ 'Referrers_Campaigns'|translate }}</a>.
</div>
</div>
<div id='rightcolumn'>
- <h2>{{ 'Referers_DetailsByReferrerType'|translate }}</h2>
+ <h2>{{ 'Referrers_DetailsByReferrerType'|translate }}</h2>
{{ dataTableRefererType|raw }}
</div>
<div style="clear:both;"></div>
{% if totalVisits > 0 %}
- <h2>{{ 'Referers_ReferrersOverview'|translate }}</h2>
+ <h2>{{ 'Referrers_ReferrersOverview'|translate }}</h2>
{{ referrersReportsByDimension|raw }}
{% endif %}
diff --git a/plugins/Referers/templates/indexWebsites.twig b/plugins/Referers/templates/indexWebsites.twig
index 44596c307cf79b60c7140c445b3c03f5beab3a4a..10a844eeb55478886b7873a448ffeadb872b480b 100755
--- a/plugins/Referers/templates/indexWebsites.twig
+++ b/plugins/Referers/templates/indexWebsites.twig
@@ -1,9 +1,9 @@
<div id='leftcolumn'>
- <h2>{{ 'Referers_Websites'|translate }}</h2>
+ <h2>{{ 'Referrers_Websites'|translate }}</h2>
{{ websites|raw }}
</div>
<div id='rightcolumn'>
- <h2>{{ 'Referers_Socials'|translate }}</h2>
+ <h2>{{ 'Referrers_Socials'|translate }}</h2>
{{ socials|raw }}
</div>
diff --git a/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php b/tests/PHPUnit/Core/PluginsFunctions/WidgetsListTest.php
index 9fdeb358a1faa0cca5f3cb86f531012245a84202..c1c4aa599ad090ae09ae976bc75e00486d3b5e6b 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_Referrers' => 7,
+ 'Referrers_Referrers' => 7,
'Goals_Goals' => 1,
'SEO' => 2,
'Example Widgets' => 4,