rooty/php-rrule
1
0
Fork 0
mirror of https://github.com/rlanvin/php-rrule.git synced 2025-02-20 09:54:16 +01:00
Code Issues Releases Activity

Option to omit until part in humanreadable (#36)

Browse Source
This commit is contained in:
ShoresOfNowhere 2017-10-11 12:29:00 +02:00 committed by Rémi Lanvin
parent d67a4bd27f
commit 8049f629f4
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/RRule.php
View File

@ -2329,7 +2329,8 @@ class RRule implements RRuleInterface
'date_formatter' => null,
'fallback' => 'en',
'explicit_infinite' => true,
'include_start' => true
'include_start' => true,
'include_until' => true
);
// attempt to detect default locale
@ -2581,23 +2582,25 @@ class RRule implements RRuleInterface
}
// to X, or N times, or indefinitely
if ( ! $this->until && ! $this->count ) {
if ( $opt['explicit_infinite'] ) {
$parts['end'] = $i18n['infinite'];
if ( $opt['include_until'] ) {
if ( ! $this->until && ! $this->count ) {
if ( $opt['explicit_infinite'] ) {
$parts['end'] = $i18n['infinite'];
}
}
elseif ( $this->until ) {
$parts['end'] = strtr($i18n['until'], array(
'%{date}' => $opt['date_formatter']($this->until)
));
}
elseif ( $this->count ) {
$parts['end'] = strtr(
self::i18nSelect($i18n['count'], $this->count),
array(
'%{count}' => $this->count
)
);
}
}
elseif ( $this->until ) {
$parts['end'] = strtr($i18n['until'], array(
'%{date}' => $opt['date_formatter']($this->until)
));
}
elseif ( $this->count ) {
$parts['end'] = strtr(
self::i18nSelect($i18n['count'], $this->count),
array(
'%{count}' => $this->count
)
);
}
$parts = array_filter($parts);