From add0a855fbec49954bca0b33d27428dda6c21869 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 1 Oct 2013 21:53:45 +0200 Subject: renamend referer to referrer in some translation keys & translations --- plugins/API/ProcessedReport.php | 2 +- plugins/Goals/templates/getGoalReportView.twig | 2 +- plugins/Login/Controller.php | 2 +- plugins/Referers/Controller.php | 2 +- plugins/Referers/Referers.php | 68 +++++++++++++------------- plugins/Referers/templates/index.twig | 2 +- 6 files changed, 39 insertions(+), 39 deletions(-) (limited to 'plugins') diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php index 9ee01d003e..a2e5e8297f 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 95c0e44a77..55f7f074ef 100644 --- a/plugins/Goals/templates/getGoalReportView.twig +++ b/plugins/Goals/templates/getGoalReportView.twig @@ -13,7 +13,7 @@
  • {{ 'Goals_BestKeywords'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.keyword} %}
    • {% endif %} {% if topDimensions.website is defined and topDimensions.website|length > 0 %} -
  • {{ 'Goals_BestReferers'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.website} %}
    • +
  • {{ 'Goals_BestReferrers'|translate }} {% include '@Goals/_listTopDimension.twig' with {'topDimension':topDimensions.website} %}
    • {% endif %}
  • {{ 'Goals_ReturningVisitorsConversionRateIs'|translate(""~conversion_rate_returning~"")|raw }} diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index bb6b3fbe6a..ae7aa4d346 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('', '')); + $message = Piwik_Translate('Login_InvalidNonceOrHeadersOrReferrer', array('', '')); // Should mention trusted_hosts or link to FAQ return $message; } diff --git a/plugins/Referers/Controller.php b/plugins/Referers/Controller.php index 9641f3bd5c..9c4af4d0e1 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') . '
    ' . Piwik_Translate('General_BrokenDownReportDocumentation') . '
    ' . 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 aa601e1df4..ee5e344ec0 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', '
    '), + 'documentation' => Piwik_Translate('Referers_AllReferrersReportDocumentation', '
    '), '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 9f15e13bd9..3beeb1705a 100644 --- a/plugins/Referers/templates/index.twig +++ b/plugins/Referers/templates/index.twig @@ -103,7 +103,7 @@
    -

    {{ 'Referers_DetailsByRefererType'|translate }}

    +

    {{ 'Referers_DetailsByReferrerType'|translate }}

    {{ dataTableRefererType|raw }}
    -- cgit v1.2.3