Skip to content

Commit

Permalink
fixes #3926 thanks for the suggestion, fixing Piwik core to allow sev…
Browse files Browse the repository at this point in the history 
…eral translations whether the period is used in the sentence or standalone
  • Loading branch information
@mattab
mattab committed May 7, 2013
1 parent 8d2cc92 commit 47cda36
Show file tree
Hide file tree
Showing 5 changed files with 275 additions and 3 deletions.
1 change: 1 addition & 0 deletions core/ScheduledTime.php
View file
Expand Up @@ -23,6 +23,7 @@ abstract class Piwik_ScheduledTime
const PERIOD_DAY = 'day';
const PERIOD_WEEK = 'week';
const PERIOD_MONTH = 'month';
const PERIOD_YEAR = 'year';

/**
* @link http://php.net/manual/en/function.date.php, format string : 'G'
Expand Down
4 changes: 4 additions & 0 deletions lang/en.php
View file
Expand Up @@ -268,6 +268,10 @@
'General_Daily' => 'Daily',
'General_Weekly' => 'Weekly',
'General_Monthly' => 'Monthly',
'General_DailyReport' => 'daily',
'General_WeeklyReport' => 'weekly',
'General_MonthlyReport' => 'monthly',
'General_YearlyReport' => 'yearly',
'General_DailyReports' => 'Daily reports',
'General_WeeklyReports' => 'Weekly reports',
'General_MonthlyReports' => 'Monthly reports',
Expand Down
17 changes: 16 additions & 1 deletion plugins/PDFReports/PDFReports.php
View file
Expand Up @@ -310,7 +310,7 @@ function sendReport($notification)
$filename = $notificationInfo[Piwik_PDFReports_API::FILENAME_KEY];
$additionalFiles = $notificationInfo[Piwik_PDFReports_API::ADDITIONAL_FILES_KEY];

$periods = self::getPeriodToFrequency();
$periods = self::getPeriodToFrequencyAsAdjective();
$message = Piwik_Translate('PDFReports_EmailHello');
$subject = Piwik_Translate('General_Report') . ' ' . $reportTitle . " - " . $prettyDate;

Expand Down Expand Up @@ -606,6 +606,7 @@ private static function getDisplayFormats()
}

/**
* Used in the Report Listing
* @ignore
*/
static public function getPeriodToFrequency()
Expand All @@ -617,4 +618,18 @@ static public function getPeriodToFrequency()
Piwik_ScheduledTime::PERIOD_MONTH => Piwik_Translate('General_Monthly'),
);
}

/**
* Used in the Report's email content, ie "monthly report"
* @ignore
*/
static public function getPeriodToFrequencyAsAdjective()
{
return array(
Piwik_ScheduledTime::PERIOD_DAY => Piwik_Translate('General_DailyReport'),
Piwik_ScheduledTime::PERIOD_WEEK => Piwik_Translate('General_WeeklyReport'),
Piwik_ScheduledTime::PERIOD_MONTH => Piwik_Translate('General_MonthlyReport'),
Piwik_ScheduledTime::PERIOD_YEAR => Piwik_Translate('General_YearlyReport'),
);
}
}
252 changes: 252 additions & 0 deletions ...RandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml
View file
@@ -0,0 +1,252 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
<row>
<idSite>1</idSite>
<idVisit>1</idVisit>
<visitIp>74.125.31.147</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
<visitConverted>0</visitConverted>
<visitConvertedIcon />
<visitEcommerceStatus>none</visitEcommerceStatus>
<visitEcommerceStatusIcon />
<searches>0</searches>
<actions>1</actions>
<actionDetails>
<row>
<type>action</type>
<url>http://piwik.net/</url>
<pageTitle />
<pageIdAction>1</pageIdAction>
<pageId>1</pageId>
<serverTimePretty>Sun 7 Apr 10:00:00</serverTimePretty>
<icon />
</row>
</actionDetails>
<customVariables>
</customVariables>
<goalConversions>0</goalConversions>
<siteCurrency>USD</siteCurrency>
<siteCurrencySymbol>$</siteCurrencySymbol>
<serverDate>2013-04-07</serverDate>
<visitLocalTime>10:00:00</visitLocalTime>
<visitLocalHour>10</visitLocalHour>
<visitServerHour>10</visitServerHour>
<firstActionTimestamp>1365328800</firstActionTimestamp>
<lastActionTimestamp>1365328800</lastActionTimestamp>
<lastActionDateTime>2013-04-07 10:00:00</lastActionDateTime>
<visitDuration>0</visitDuration>
<visitDurationPretty>0s</visitDurationPretty>
<visitCount>1</visitCount>
<daysSinceLastVisit>0</daysSinceLastVisit>
<daysSinceFirstVisit>0</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
<countryCode>xx</countryCode>
<countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
<region />
<regionCode />
<city />
<location>Unknown</location>
<latitude />
<longitude />
<provider>Unknown</provider>
<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
<referrerKeyword />
<referrerKeywordPosition />
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
<operatingSystem>Windows Vista</operatingSystem>
<operatingSystemCode>WVI</operatingSystemCode>
<operatingSystemShortName>Win Vista</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
<browserFamily>ie</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 7.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>7.0</browserVersion>
<screenType>unknown</screenType>
<resolution>unknown</resolution>
<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
<plugins />
<pluginsIcons />
<serverTimestamp>1365328800</serverTimestamp>
<serverTimePretty>10:00:00</serverTimePretty>
<serverDatePretty>Sun 7 Apr</serverDatePretty>
<serverDatePrettyFirstAction>Sun 7 Apr</serverDatePrettyFirstAction>
<serverTimePrettyFirstAction>10:00:00</serverTimePrettyFirstAction>
</row>
<row>
<idSite>1</idSite>
<idVisit>2</idVisit>
<visitIp>74.125.31.147</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
<visitConverted>0</visitConverted>
<visitConvertedIcon />
<visitEcommerceStatus>none</visitEcommerceStatus>
<visitEcommerceStatusIcon />
<searches>0</searches>
<actions>1</actions>
<actionDetails>
<row>
<type>action</type>
<url>http://piwik.net/</url>
<pageTitle />
<pageIdAction>1</pageIdAction>
<pageId>2</pageId>
<serverTimePretty>Sat 6 Apr 11:00:00</serverTimePretty>
<icon />
</row>
</actionDetails>
<customVariables>
</customVariables>
<goalConversions>0</goalConversions>
<siteCurrency>USD</siteCurrency>
<siteCurrencySymbol>$</siteCurrencySymbol>
<serverDate>2013-04-06</serverDate>
<visitLocalTime>11:00:00</visitLocalTime>
<visitLocalHour>11</visitLocalHour>
<visitServerHour>11</visitServerHour>
<firstActionTimestamp>1365246000</firstActionTimestamp>
<lastActionTimestamp>1365246000</lastActionTimestamp>
<lastActionDateTime>2013-04-06 11:00:00</lastActionDateTime>
<visitDuration>0</visitDuration>
<visitDurationPretty>0s</visitDurationPretty>
<visitCount>1</visitCount>
<daysSinceLastVisit>0</daysSinceLastVisit>
<daysSinceFirstVisit>0</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
<countryCode>xx</countryCode>
<countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
<region />
<regionCode />
<city />
<location>Unknown</location>
<latitude />
<longitude />
<provider>Unknown</provider>
<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
<referrerKeyword />
<referrerKeywordPosition />
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
<operatingSystem>Windows Vista</operatingSystem>
<operatingSystemCode>WVI</operatingSystemCode>
<operatingSystemShortName>Win Vista</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
<browserFamily>ie</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 7.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>7.0</browserVersion>
<screenType>unknown</screenType>
<resolution>unknown</resolution>
<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
<plugins />
<pluginsIcons />
<serverTimestamp>1365246000</serverTimestamp>
<serverTimePretty>11:00:00</serverTimePretty>
<serverDatePretty>Sat 6 Apr</serverDatePretty>
<serverDatePrettyFirstAction>Sat 6 Apr</serverDatePrettyFirstAction>
<serverTimePrettyFirstAction>11:00:00</serverTimePrettyFirstAction>
</row>
<row>
<idSite>1</idSite>
<idVisit>3</idVisit>
<visitIp>74.125.31.147</visitIp>
<visitorType>new</visitorType>
<visitorTypeIcon />
<visitConverted>0</visitConverted>
<visitConvertedIcon />
<visitEcommerceStatus>none</visitEcommerceStatus>
<visitEcommerceStatusIcon />
<searches>0</searches>
<actions>1</actions>
<actionDetails>
<row>
<type>action</type>
<url>http://piwik.net/</url>
<pageTitle />
<pageIdAction>1</pageIdAction>
<pageId>3</pageId>
<serverTimePretty>Fri 5 Apr 12:00:00</serverTimePretty>
<icon />
</row>
</actionDetails>
<customVariables>
</customVariables>
<goalConversions>0</goalConversions>
<siteCurrency>USD</siteCurrency>
<siteCurrencySymbol>$</siteCurrencySymbol>
<serverDate>2013-04-05</serverDate>
<visitLocalTime>12:00:00</visitLocalTime>
<visitLocalHour>12</visitLocalHour>
<visitServerHour>12</visitServerHour>
<firstActionTimestamp>1365163200</firstActionTimestamp>
<lastActionTimestamp>1365163200</lastActionTimestamp>
<lastActionDateTime>2013-04-05 12:00:00</lastActionDateTime>
<visitDuration>0</visitDuration>
<visitDurationPretty>0s</visitDurationPretty>
<visitCount>1</visitCount>
<daysSinceLastVisit>0</daysSinceLastVisit>
<daysSinceFirstVisit>0</daysSinceFirstVisit>
<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
<continent>Unknown</continent>
<continentCode>unk</continentCode>
<country>Unknown</country>
<countryCode>xx</countryCode>
<countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
<region />
<regionCode />
<city />
<location>Unknown</location>
<latitude />
<longitude />
<provider>Unknown</provider>
<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
<referrerType>direct</referrerType>
<referrerTypeName>Direct Entry</referrerTypeName>
<referrerName />
<referrerKeyword />
<referrerKeywordPosition />
<referrerUrl />
<referrerSearchEngineUrl />
<referrerSearchEngineIcon />
<operatingSystem>Windows Vista</operatingSystem>
<operatingSystemCode>WVI</operatingSystemCode>
<operatingSystemShortName>Win Vista</operatingSystemShortName>
<operatingSystemIcon>plugins/UserSettings/images/os/WVI.gif</operatingSystemIcon>
<browserFamily>ie</browserFamily>
<browserFamilyDescription>Trident (IE)</browserFamilyDescription>
<browserName>Internet Explorer 7.0</browserName>
<browserIcon>plugins/UserSettings/images/browsers/IE.gif</browserIcon>
<browserCode>IE</browserCode>
<browserVersion>7.0</browserVersion>
<screenType>unknown</screenType>
<resolution>unknown</resolution>
<screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon>
<plugins />
<pluginsIcons />
<serverTimestamp>1365163200</serverTimestamp>
<serverTimePretty>12:00:00</serverTimePretty>
<serverDatePretty>Fri 5 Apr</serverDatePretty>
<serverDatePrettyFirstAction>Fri 5 Apr</serverDatePrettyFirstAction>
<serverTimePrettyFirstAction>12:00:00</serverTimePrettyFirstAction>
</row>
</result>
4 changes: 2 additions & 2 deletions themes/default/common.css
View file
Expand Up @@ -105,7 +105,7 @@ a {
}

#periodString {
display:block;
display:block;
color:#444;
font-size:14px;
border: 1px solid #e4e5e4;
Expand All @@ -117,7 +117,7 @@ a {
margin-right:12px;
z-index:999;
position:absolute;
background: url("images/icon-calendar.gif") no-repeat scroll right 9px center #F7F7F7;
background: url("images/icon-calendar.gif") no-repeat scroll right 9px top 7px #F7F7F7;
}
#periodString:hover {
background-color:#f1f0eb;
Expand Down

0 comments on commit 47cda36

Please sign in to comment.