From 27c4424cc6b74ddc0428d8091d1bee5c238f22c7 Mon Sep 17 00:00:00 2001
From: mattpiwik <matthieu.aubry@gmail.com>
Date: Mon, 16 May 2011 23:21:06 +0000
Subject: [PATCH] Deprecating "page title|url not defined" in config file and
now using translations
git-svn-id: http://dev.piwik.org/svn/trunk@4713 59fd770c-687e-43c8-a1e3-f5a4ff64c105
---
config/global.ini.php | 4 ----
plugins/Actions/Actions.php | 5 +++--
plugins/Actions/tests/Actions.test.php | 4 ++--
plugins/Live/Controller.php | 2 +-
..._twoWebsites_differentDays__Actions.getPageTitles_day.xml | 2 +-
...woWebsites_differentDays__Actions.getPageTitles_month.xml | 2 +-
...twoWebsites_differentDays__Actions.getPageTitles_week.xml | 2 +-
...twoWebsites_differentDays__Actions.getPageTitles_year.xml | 2 +-
...rs_twoWebsites_differentDays__Actions.getPageUrls_day.xml | 2 +-
..._twoWebsites_differentDays__Actions.getPageUrls_month.xml | 2 +-
...s_twoWebsites_differentDays__Actions.getPageUrls_week.xml | 2 +-
...s_twoWebsites_differentDays__Actions.getPageUrls_year.xml | 2 +-
12 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/config/global.ini.php b/config/global.ini.php
index 00cead6b45..495c9ccfc3 100644
--- a/config/global.ini.php
+++ b/config/global.ini.php
@@ -104,10 +104,6 @@ anonymous_user_enable_use_segments_API = 1
; it is useful to have an actual string to write in the UI
action_default_name = index
-; this action name is used when the URL has no page title or page URL defined
-action_default_name_when_not_defined = "page title not defined"
-action_default_url_when_not_defined = "page url not defined"
-
; if you want all your users to use Piwik in only one language, disable the LanguagesManager
; plugin, and set this default_language (users won't see the language drop down)
default_language = en
diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php
index 789a96731d..8ee80aecf1 100644
--- a/plugins/Actions/Actions.php
+++ b/plugins/Actions/Actions.php
@@ -243,8 +243,6 @@ class Piwik_Actions extends Piwik_Plugin
}
self::$defaultActionName = Zend_Registry::get('config')->General->action_default_name;
- self::$defaultActionNameWhenNotDefined = Zend_Registry::get('config')->General->action_default_name_when_not_defined;
- self::$defaultActionUrlWhenNotDefined = Zend_Registry::get('config')->General->action_default_url_when_not_defined;
$this->columnToSortByBeforeTruncation = Piwik_Archive::INDEX_NB_VISITS;
$this->maximumRowsInDataTableLevelZero = Zend_Registry::get('config')->General->datatable_archiving_maximum_rows_actions;
$this->maximumRowsInSubDataTable = Zend_Registry::get('config')->General->datatable_archiving_maximum_rows_subtable_actions;
@@ -275,6 +273,9 @@ class Piwik_Actions extends Piwik_Plugin
*/
public function archiveDay( $notification )
{
+ self::$defaultActionNameWhenNotDefined = Piwik_Translate('General_NotDefined', Piwik_Translate('Actions_ColumnPageName'));
+ self::$defaultActionUrlWhenNotDefined = Piwik_Translate('General_NotDefined', Piwik_Translate('Actions_ColumnPageURL'));
+
/* @var $archiveProcessing Piwik_ArchiveProcessing */
$archiveProcessing = $notification->getNotificationObject();
diff --git a/plugins/Actions/tests/Actions.test.php b/plugins/Actions/tests/Actions.test.php
index dce50a9688..9f345051e6 100644
--- a/plugins/Actions/tests/Actions.test.php
+++ b/plugins/Actions/tests/Actions.test.php
@@ -63,11 +63,11 @@ class Test_Piwik_Actions extends UnitTestCase
),
array(
'params' => array( 'name' => '', 'type' => Piwik_Tracker_Action::TYPE_ACTION_NAME),
- 'expected' => array( Zend_Registry::get('config')->General->action_default_name_when_not_defined ),
+ 'expected' => array( 'Page Name not defined' ),
),
array(
'params' => array( 'name' => '', 'type' => Piwik_Tracker_Action::TYPE_ACTION_URL),
- 'expected' => array( Zend_Registry::get('config')->General->action_default_url_when_not_defined ),
+ 'expected' => array( 'Page URL not defined' ),
),
array(
'params' => array( 'name' => 'http://example.org/download.zip', 'type' => Piwik_Tracker_Action::TYPE_DOWNLOAD),
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index 85272ff709..e3ae5d43c9 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -80,7 +80,7 @@ class Piwik_Live_Controller extends Piwik_Controller
$view->setReportDocumentation(Piwik_Translate('Live_VisitorLogDocumentation', array('<br />', '<br />')));
- $view->setCustomParameter('pageUrlNotDefined', Zend_Registry::get('config')->General->action_default_url_when_not_defined);
+ $view->setCustomParameter('pageUrlNotDefined', Piwik_Translate('General_NotDefined', Piwik_Translate('Actions_ColumnPageURL')));
return $this->renderView($view, $fetch);
}
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
index d9037334b6..5f953f1528 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_day.xml
@@ -22,7 +22,7 @@
</result>
<result date="2010-01-04">
<row>
- <label>page title not defined</label>
+ <label>Page Name not defined</label>
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>1</nb_hits>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
index 5f691f318d..62b1bb5b47 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_month.xml
@@ -75,7 +75,7 @@
</subtable>
</row>
<row>
- <label>page title not defined</label>
+ <label>Page Name not defined</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
index 9cd6f980bf..78d2e85074 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_week.xml
@@ -77,7 +77,7 @@
</subtable>
</row>
<row>
- <label>page title not defined</label>
+ <label>Page Name not defined</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
index 2e4e182e2f..5bf7121d7a 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageTitles_year.xml
@@ -75,7 +75,7 @@
</subtable>
</row>
<row>
- <label>page title not defined</label>
+ <label>Page Name not defined</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
index c10a635966..7d3b3432a5 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_day.xml
@@ -34,7 +34,7 @@
</result>
<result date="2010-01-04">
<row>
- <label>page url not defined</label>
+ <label>Page URL not defined</label>
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>1</nb_hits>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
index d3428ca2c8..c093da3ce3 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_month.xml
@@ -48,7 +48,7 @@
<url>http://example.org/thankyou</url>
</row>
<row>
- <label>page url not defined</label>
+ <label>Page URL not defined</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
index 003a4ae28f..f84a12fe5b 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_week.xml
@@ -61,7 +61,7 @@
<url>http://example.org/thankyou</url>
</row>
<row>
- <label>page url not defined</label>
+ <label>Page URL not defined</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
diff --git a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
index 06ca25a2ac..16e66ad377 100644
--- a/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
+++ b/tests/integration/expected/test_TwoVisitors_twoWebsites_differentDays__Actions.getPageUrls_year.xml
@@ -48,7 +48,7 @@
<url>http://example.org/thankyou</url>
</row>
<row>
- <label>page url not defined</label>
+ <label>Page URL not defined</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
--
GitLab