renamend referers to referrers in translation keys

core/WidgetsList.php

@@ -77,7 +77,7 @@ class WidgetsList
             'DevicesDetection_DevicesDetection',
             'General_Actions',
             'Actions_SubmenuSitesearch',
-            'Referers_Referrers',
+            'Referrers_Referrers',
             'Goals_Goals',
             'Goals_Ecommerce',
             '_others_',

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",

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'),

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>&nbsp;{% if userCount == 1 %}{{ 'UsersManager_User'|translate }}{% else %}{{ 'UsersManager_MenuUsers'|translate }}{% endif %}
                 <br/>
-                <strong><em>{{ siteCount }}</em></strong>&nbsp;{% if siteCount == 1 %}{{ 'General_Website'|translate }}{% else %}{{ 'Referers_Websites'|translate }}{% endif %}
+                <strong><em>{{ siteCount }}</em></strong>&nbsp;{% 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/>

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');
         }

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 %}">

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">

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', '&quot;'
-                . Piwik_Translate('Referers_DetailsByReferrerType') . '&quot;');
+            . Piwik_Translate('Referrers_EvolutionDocumentationMoreInfo', '&quot;'
+                . Piwik_Translate('Referrers_DetailsByReferrerType') . '&quot;');
 
         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);
     }

plugins/Referers/templates/getSearchEnginesAndKeywords.twig

 <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>

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 %}
 

plugins/Referers/templates/indexWebsites.twig

 <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>

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,