diff --git a/config/global.ini.php b/config/global.ini.php
index 00cead6b453608237399526286fea7d47449e66c..495c9ccfc32b061cc025f2533fb0e454cde64147 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 789a96731dbfe16a96fc1830632743768b9dca6d..8ee80aecf15bdf6df88b0ea9a65aa29c679d22f1 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 dce50a96883bcda368dca612ff5c9a8d9dce48af..9f345051e60e33a34df593a36ea49641943c4548 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 85272ff70920400d08e4027a385a6690501980cc..e3ae5d43c9f9d3579d5765063b667b835ff32367 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 d9037334b6c4e2d66292cfb66c478c24d92fa9a4..5f953f1528f3cb541520ba9dedea24327d38260a 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 5f691f318dc65d11e7f5433315265394db4e1fd0..62b1bb5b47b08669770a365b8332fb9f988fcdae 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 9cd6f980bfc4bc27aa901c7646920b0ed5cad5b1..78d2e85074edc4f1440be8ddde765ccc4b38b7ef 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 2e4e182e2fe4141e3a9d8b36f0aab00f3566ff27..5bf7121d7a7497b51060b994a6690504ea369fb6 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 c10a6359663739992de02ad4400f01104d65ed41..7d3b3432a5b734b544f50782e6d104d267025d9b 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 d3428ca2c8fe4a1fe22c02079f1dfe5400e2a558..c093da3ce3f948c1f3ac9645a80ed3407a0fdf72 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 003a4ae28ff6b09568e6082bdb03ab9d7b1adc59..f84a12fe5baa1c7970c04779666f47ba2047286d 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 06ca25a2acd857b93c3a2e844e0b2de38648d9e1..16e66ad377953db46d5e7126281f427eb46e6f57 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>