Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Aubry <matt@piwik.org>2015-10-02 07:13:29 +0300
committerMatthieu Aubry <matt@piwik.org>2015-10-02 07:13:29 +0300
commita2f71ab833b60076e8cfceec9b18e76f74458e94 (patch)
treeda3acefffc6a0ef9dbb534f5cdb9b0b7e37c4a3e /plugins/Contents
parent38fbe34d4dd8ba7fa3897461b61098d4b3a83252 (diff)
parent1c49540fc8f259e05dd838bb4a3f7cf3b26078dc (diff)
Merge pull request #8856 from piwik/dateformats
Improve date & time formats
Diffstat (limited to 'plugins/Contents')
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml30
-rw-r--r--plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml30
2 files changed, 30 insertions, 30 deletions
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
index a046ba76ed..5c1cc502a7 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentNames_lastN__API.getProcessedReport_day.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
+ <prettyDate>January 3 – 9, 2010</prettyDate>
<metadata>
<category>Actions</category>
<name>Content Name</name>
@@ -27,7 +27,7 @@
<interaction_rate>Interaction Rate</interaction_rate>
</columns>
<reportData>
- <result prettyDate="Sunday 3 January 2010">
+ <result prettyDate="Sunday, January 3, 2010">
<row>
<label>ImageAd</label>
<nb_impressions>8</nb_impressions>
@@ -47,15 +47,15 @@
<interaction_rate>0%</interaction_rate>
</row>
</result>
- <result prettyDate="Monday 4 January 2010" />
- <result prettyDate="Tuesday 5 January 2010" />
- <result prettyDate="Wednesday 6 January 2010" />
- <result prettyDate="Thursday 7 January 2010" />
- <result prettyDate="Friday 8 January 2010" />
- <result prettyDate="Saturday 9 January 2010" />
+ <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Tuesday, January 5, 2010" />
+ <result prettyDate="Wednesday, January 6, 2010" />
+ <result prettyDate="Thursday, January 7, 2010" />
+ <result prettyDate="Friday, January 8, 2010" />
+ <result prettyDate="Saturday, January 9, 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday 3 January 2010">
+ <result prettyDate="Sunday, January 3, 2010">
<row>
<contentTarget>http://www.example.com</contentTarget>
<segment>contentName==ImageAd</segment>
@@ -72,12 +72,12 @@
<idsubdatatable>3</idsubdatatable>
</row>
</result>
- <result prettyDate="Monday 4 January 2010" />
- <result prettyDate="Tuesday 5 January 2010" />
- <result prettyDate="Wednesday 6 January 2010" />
- <result prettyDate="Thursday 7 January 2010" />
- <result prettyDate="Friday 8 January 2010" />
- <result prettyDate="Saturday 9 January 2010" />
+ <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Tuesday, January 5, 2010" />
+ <result prettyDate="Wednesday, January 6, 2010" />
+ <result prettyDate="Thursday, January 7, 2010" />
+ <result prettyDate="Friday, January 8, 2010" />
+ <result prettyDate="Saturday, January 9, 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>16</nb_visits>
diff --git a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
index 5f61145f7a..b43860be63 100644
--- a/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
+++ b/plugins/Contents/tests/System/expected/test_Contents_Contents.getContentPieces_lastN__API.getProcessedReport_day.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<website>Piwik test</website>
- <prettyDate>3 Jan 10 - 9 Jan 10</prettyDate>
+ <prettyDate>January 3 – 9, 2010</prettyDate>
<metadata>
<category>Actions</category>
<name>Content Piece</name>
@@ -27,7 +27,7 @@
<interaction_rate>Interaction Rate</interaction_rate>
</columns>
<reportData>
- <result prettyDate="Sunday 3 January 2010">
+ <result prettyDate="Sunday, January 3, 2010">
<row>
<label>Click to download Piwik now</label>
<nb_impressions>4</nb_impressions>
@@ -71,15 +71,15 @@
<interaction_rate>0%</interaction_rate>
</row>
</result>
- <result prettyDate="Monday 4 January 2010" />
- <result prettyDate="Tuesday 5 January 2010" />
- <result prettyDate="Wednesday 6 January 2010" />
- <result prettyDate="Thursday 7 January 2010" />
- <result prettyDate="Friday 8 January 2010" />
- <result prettyDate="Saturday 9 January 2010" />
+ <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Tuesday, January 5, 2010" />
+ <result prettyDate="Wednesday, January 6, 2010" />
+ <result prettyDate="Thursday, January 7, 2010" />
+ <result prettyDate="Friday, January 8, 2010" />
+ <result prettyDate="Saturday, January 9, 2010" />
</reportData>
<reportMetadata>
- <result prettyDate="Sunday 3 January 2010">
+ <result prettyDate="Sunday, January 3, 2010">
<row>
<contentTarget>http://piwik.org/download</contentTarget>
<segment>contentPiece==Click+to+download+Piwik+now</segment>
@@ -115,12 +115,12 @@
<idsubdatatable>2</idsubdatatable>
</row>
</result>
- <result prettyDate="Monday 4 January 2010" />
- <result prettyDate="Tuesday 5 January 2010" />
- <result prettyDate="Wednesday 6 January 2010" />
- <result prettyDate="Thursday 7 January 2010" />
- <result prettyDate="Friday 8 January 2010" />
- <result prettyDate="Saturday 9 January 2010" />
+ <result prettyDate="Monday, January 4, 2010" />
+ <result prettyDate="Tuesday, January 5, 2010" />
+ <result prettyDate="Wednesday, January 6, 2010" />
+ <result prettyDate="Thursday, January 7, 2010" />
+ <result prettyDate="Friday, January 8, 2010" />
+ <result prettyDate="Saturday, January 9, 2010" />
</reportMetadata>
<reportTotal>
<nb_visits>16</nb_visits>