From 985b59ddff07a7b49335d56e36ae05347500ab51 Mon Sep 17 00:00:00 2001 From: indigoxela Date: Fri, 21 Jun 2024 13:29:02 +0200 Subject: [PATCH] Issue #45: Update php-rrule to v2.5.0 (#46) --- libraries/php-rrule/CHANGELOG.md | 18 ++- libraries/php-rrule/src/RRule.php | 20 ++- libraries/php-rrule/src/RfcParser.php | 6 +- libraries/php-rrule/src/i18n/cz.php | 174 ++++++++++++++++++++++++++ libraries/php-rrule/src/i18n/de.php | 2 + libraries/php-rrule/src/i18n/en.php | 2 + libraries/php-rrule/src/i18n/es.php | 6 +- libraries/php-rrule/src/i18n/fa.php | 2 + libraries/php-rrule/src/i18n/fi.php | 2 + libraries/php-rrule/src/i18n/fr.php | 2 + libraries/php-rrule/src/i18n/he.php | 2 + libraries/php-rrule/src/i18n/it.php | 2 + libraries/php-rrule/src/i18n/ja.php | 143 +++++++++++++++++++++ libraries/php-rrule/src/i18n/nl.php | 40 +++--- libraries/php-rrule/src/i18n/pl.php | 2 + libraries/php-rrule/src/i18n/pt.php | 2 + libraries/php-rrule/src/i18n/sv.php | 18 +-- 17 files changed, 404 insertions(+), 39 deletions(-) create mode 100644 libraries/php-rrule/src/i18n/cz.php create mode 100644 libraries/php-rrule/src/i18n/ja.php diff --git a/libraries/php-rrule/CHANGELOG.md b/libraries/php-rrule/CHANGELOG.md index 5893ffc..aee0f10 100755 --- a/libraries/php-rrule/CHANGELOG.md +++ b/libraries/php-rrule/CHANGELOG.md @@ -2,6 +2,21 @@ ## [Unreleased] +## [2.5.0] - 2024-06-08 + +### Fixed + +- Swedish: Corrects the spelling of monday and the grammar of enumeration partials. [#134](https://github.com/rlanvin/php-rrule/pull/134) +- Spanish: Improve clarity in daily and weekly recurrence translation [#147](https://github.com/rlanvin/php-rrule/pull/147) +- Dutch: weekdays and months are written in lowercase [#136](https://github.com/rlanvin/php-rrule/pull/136) +- Better handle TZ with Exchange / M365 generated iCal files [#143](https://github.com/rlanvin/php-rrule/pull/143) + +### Added + +- Human readable time of day option [#124](https://github.com/rlanvin/php-rrule/pull/124) +- Japanese translation [#139](https://github.com/rlanvin/php-rrule/pull/139) +- Czech translation [#137](https://github.com/rlanvin/php-rrule/pull/137) + ## [2.4.1] - 2023-06-07 ### Fixed @@ -250,7 +265,8 @@ - First release, everything before that was unversioned (`dev-master` was used). -[Unreleased]: https://github.com/rlanvin/php-rrule/compare/v2.4.1...HEAD +[Unreleased]: https://github.com/rlanvin/php-rrule/compare/v2.5.0...HEAD +[2.5.0]: https://github.com/rlanvin/php-rrule/compare/v2.4.1...v2.5.0 [2.4.1]: https://github.com/rlanvin/php-rrule/compare/v2.4.0...v2.4.1 [2.4.0]: https://github.com/rlanvin/php-rrule/compare/v2.3.2...v2.4.0 [2.3.2]: https://github.com/rlanvin/php-rrule/compare/v2.3.1...v2.3.2 diff --git a/libraries/php-rrule/src/RRule.php b/libraries/php-rrule/src/RRule.php index 1c2b148..c77c052 100755 --- a/libraries/php-rrule/src/RRule.php +++ b/libraries/php-rrule/src/RRule.php @@ -2068,9 +2068,10 @@ static protected function i18nLoad($locale, $fallback = null, $use_intl = null, * | `locale` | string | The locale to use (autodetect) * | `fallback` | string | Fallback locale if main locale is not found (default en) * | `date_formatter` | callable| Function used to format the date (takes date, returns formatted) - * | `explicit_inifite`| bool | Mention "forever" if the rule is infinite (true) + * | `explicit_infinite`| bool | Mention "forever" if the rule is infinite (true) * | `dtstart` | bool | Mention the start date (true) * | `include_start` | bool | + * | `start_time_only` | bool | Mention the time of day only, without the date * | `include_until` | bool | * | `custom_path` | string | * @@ -2091,6 +2092,7 @@ public function humanReadable(array $opt = array()) 'fallback' => 'en', 'explicit_infinite' => true, 'include_start' => true, + 'start_time_only' => false, 'include_until' => true, 'custom_path' => null ); @@ -2106,7 +2108,7 @@ public function humanReadable(array $opt = array()) } if ($opt['use_intl']) { - $default_opt['date_format'] = \IntlDateFormatter::SHORT; + $default_opt['date_format'] = isset($opt['start_time_only']) && $opt['start_time_only'] ? \IntlDateFormatter::NONE : \IntlDateFormatter::SHORT; if ($this->freq >= self::SECONDLY || not_empty($this->rule['BYSECOND'])) { $default_opt['time_format'] = \IntlDateFormatter::LONG; } @@ -2114,7 +2116,7 @@ public function humanReadable(array $opt = array()) $default_opt['time_format'] = \IntlDateFormatter::SHORT; } else { - $default_opt['time_format'] = \IntlDateFormatter::NONE; + $default_opt['time_format'] = isset($opt['start_time_only']) && $opt['start_time_only'] ? \IntlDateFormatter::SHORT : \IntlDateFormatter::NONE; } } @@ -2149,8 +2151,9 @@ public function humanReadable(array $opt = array()) }; } else { - $opt['date_formatter'] = function($date) { - return $date->format('Y-m-d H:i:s'); + $opt['date_formatter'] = function ($date) use ($opt) { + $format = $opt['start_time_only'] ? 'H:i:s' : 'Y-m-d H:i:s'; + return $date->format($format); }; } } @@ -2362,7 +2365,12 @@ public function humanReadable(array $opt = array()) if ($opt['include_start']) { // from X - $parts['start'] = strtr($i18n['dtstart'], array( + if ($opt['start_time_only']) { + $value = $this->freq >= self::HOURLY ? 'startingtimeofday' : 'timeofday'; + } else { + $value = 'dtstart'; + } + $parts['start'] = strtr($i18n[$value], array( '%{date}' => $opt['date_formatter']($this->dtstart) )); } diff --git a/libraries/php-rrule/src/RfcParser.php b/libraries/php-rrule/src/RfcParser.php index 1081de4..b0cf9f6 100755 --- a/libraries/php-rrule/src/RfcParser.php +++ b/libraries/php-rrule/src/RfcParser.php @@ -221,7 +221,7 @@ static public function parseRDate($line) foreach ($property['params'] as $name => $value) { switch (strtoupper($name)) { case 'TZID': - $tz = new \DateTimeZone($value); + $tz = self::parseTimeZone($value); break; case 'VALUE': switch ($value) { @@ -284,7 +284,7 @@ static public function parseExDate($line) // Ignore optional words break; case 'TZID': - $tz = new \DateTimeZone($value); + $tz = self::parseTimeZone($value); break; default: throw new \InvalidArgumentException("Unknown property parameter: $name"); @@ -325,4 +325,4 @@ static public function parseTimeZone($tzid) return new \DateTimeZone($tzid); } -} \ No newline at end of file +} diff --git a/libraries/php-rrule/src/i18n/cz.php b/libraries/php-rrule/src/i18n/cz.php new file mode 100644 index 0000000..e95b880 --- /dev/null +++ b/libraries/php-rrule/src/i18n/cz.php @@ -0,0 +1,174 @@ + + * @link https://github.com/rlanvin/php-rrule + */ +return array( + 'yearly' => array( + '1' => 'ročně', + '2' => 'každé %{interval} roky', + '3' => 'každé %{interval} roky', + '4' => 'každé %{interval} roky', + 'else' => 'každých %{interval} let' + ), + 'monthly' => array( + '1' => 'měsíčně', + '2' => 'každé %{interval} měsíce', + '3' => 'každé %{interval} měsíce', + '4' => 'každé %{interval} měsíce', + 'else' => 'každých %{interval} měsíců' + ), + 'weekly' => array( + '1' => 'týdně', + '2' => 'každé %{interval} týdny', + '3' => 'každé %{interval} týdny', + '4' => 'každé %{interval} týdny', + 'else' => 'každých %{interval} týdnů' + ), + 'daily' => array( + '1' => 'denně', + '2' => 'každé %{interval} dny', + '3' => 'každé %{interval} dny', + '4' => 'každé %{interval} dny', + '5' => 'každé %{interval} dny', + 'else' => 'každých %{interval} dnů' + ), + 'hourly' => array( + '1' => 'každou hodinu', + '2' => 'každé %{interval} hodiny', + '3' => 'každé %{interval} hodiny', + '4' => 'každé %{interval} hodiny', + 'else' => 'každých %{interval} hodin' + ), + 'minutely' => array( + '1' => 'každou minutu', + '2' => 'každé %{interval} minuty', + '3' => 'každé %{interval} minuty', + '4' => 'každé %{interval} minuty', + 'else' => 'každých %{interval} minut' + ), + 'secondly' => array( + '1' => 'každou sekundu', + '2' => 'každé %{interval} sekundy', + '3' => 'každé %{interval} sekundy', + '4' => 'každé %{interval} sekundy', + 'else' => 'každých %{interval} sekund' + ), + 'dtstart' => ', počínaje %{date}', + 'timeofday' => ' v %{date}', + 'startingtimeofday' => ' začínající v %{date}', + 'infinite' => ', navždy', + 'until' => ', do %{date}', + 'count' => array( + '1' => ', jednou', + 'else' => ', %{count}x' + ), + 'and' => 'a ', + 'x_of_the_y' => array( + 'yearly' => '%{x} roku', // e.g. the first Monday of the year, or the first day of the year + 'monthly' => '%{x} měsíce' + ), + 'bymonth' => ' v %{months}', + 'months' => array( + 1 => 'leden', + 2 => 'únor', + 3 => 'březen', + 4 => 'duben', + 5 => 'květen', + 6 => 'červen', + 7 => 'červenec', + 8 => 'srpen', + 9 => 'září', + 10 => 'říjen', + 11 => 'listopad', + 12 => 'prosinec' + ), + 'byweekday' => ' v %{weekdays}', + 'weekdays' => array( + 1 => 'pondělí', + 2 => 'úterý', + 3 => 'středa', + 4 => 'čtvrtek', + 5 => 'pátek', + 6 => 'sobota', + 7 => 'neděle' + ), + 'nth_weekday' => array( + '1' => 'první %{weekday}', // e.g. the first Monday + '2' => 'druhé %{weekday}', + '3' => 'třetí %{weekday}', + 'else' => '%{n}. %{weekday}' + ), + '-nth_weekday' => array( + '-1' => 'poslední %{weekday}', // e.g. the last Monday + '-2' => 'předposlední %{weekday}', + 'else' => '%{n}. od konce %{weekday}' + ), + 'byweekno' => array( + '1' => ' v týdnu %{weeks}', + 'else' => ' v týdnech č.%{weeks}' + ), + 'nth_weekno' => '%{n}', + 'bymonthday' => ' ve dnech %{monthdays}', + 'nth_monthday' => array( + 'else' => '%{n}.' + ), + '-nth_monthday' => array( + '-1' => 'poslední', + '-2' => 'předposlední', + 'else' => '%{n}. od konce' + ), + 'byyearday' => array( + '1' => ' ve dnu %{yeardays}', + 'else' => ' ve dnech %{yeardays}' + ), + 'nth_yearday' => array( + '1' => 'první', + '2' => 'druhý', + '3' => 'třetí', + 'else' => '%{n}.' + ), + '-nth_yearday' => array( + '-1' => 'poslední', + '-2' => 'předposlední', + 'else' => '%{n}. od konce' + ), + 'byhour' => array( + '1' => ' v hodině %{hours}', + 'else' => ' v hodiny %{hours}' + ), + 'nth_hour' => '%{n}h', + 'byminute' => array( + '1' => ' v minutu %{minutes}', + 'else' => ' v minuty %{minutes}' + ), + 'nth_minute' => '%{n}', + 'bysecond' => array( + '1' => ' v sekundě %{seconds}', + 'else' => ' v sekundy %{seconds}' + ), + 'nth_second' => '%{n}', + 'bysetpos' => ', ale pouze %{setpos} instance sady', + 'nth_setpos' => array( + '1' => 'první', + '2' => 'druhá', + '3' => 'třetí', + 'else' => ' %{n}.' + ), + '-nth_setpos' => array( + '-1' => 'poslední', + '-2' => 'předposlední', + 'else' => '%{n}. od konce' + ) +); diff --git a/libraries/php-rrule/src/i18n/de.php b/libraries/php-rrule/src/i18n/de.php index 62b9f66..4942670 100755 --- a/libraries/php-rrule/src/i18n/de.php +++ b/libraries/php-rrule/src/i18n/de.php @@ -44,6 +44,8 @@ 'else' => 'Alle %{interval} Sekunden' ), 'dtstart' => ', ab dem %{date}', + 'timeofday' => ' um %{date}', + 'startingtimeofday' => ' ab %{date}', 'infinite' => ', für immer', 'until' => ', bis zum %{date}', 'count' => array( diff --git a/libraries/php-rrule/src/i18n/en.php b/libraries/php-rrule/src/i18n/en.php index 8b87495..c4c337e 100755 --- a/libraries/php-rrule/src/i18n/en.php +++ b/libraries/php-rrule/src/i18n/en.php @@ -46,6 +46,8 @@ 'else' => 'every %{interval} seconds' ), 'dtstart' => ', starting from %{date}', + 'timeofday' => ' at %{date}', + 'startingtimeofday' => ' starting at %{date}', 'infinite' => ', forever', 'until' => ', until %{date}', 'count' => array( diff --git a/libraries/php-rrule/src/i18n/es.php b/libraries/php-rrule/src/i18n/es.php index 14dde6a..dc260e2 100644 --- a/libraries/php-rrule/src/i18n/es.php +++ b/libraries/php-rrule/src/i18n/es.php @@ -18,12 +18,12 @@ ), 'weekly' => array( '1' => 'semanal', - '2' => 'cualquier otra semana', + '2' => 'semana por medio', 'else' => 'cada %{interval} semanas' // cada 8 semanas ), 'daily' => array( '1' => 'diario', - '2' => 'cualquier otro día', + '2' => 'día por medio', 'else' => 'cada %{interval} días' // cada 8 días ), 'hourly' => array( @@ -39,6 +39,8 @@ 'else' => 'cada %{interval} segundos'// cada 8 segundos ), 'dtstart' => ', empezando desde %{date}', + 'timeofday' => ' a las %{date}', + 'startingtimeofday' => ' empezando desde %{date}', 'infinite' => ', por siempre', 'until' => ', hasta %{date}', 'count' => array( diff --git a/libraries/php-rrule/src/i18n/fa.php b/libraries/php-rrule/src/i18n/fa.php index 41f6f91..37eec18 100644 --- a/libraries/php-rrule/src/i18n/fa.php +++ b/libraries/php-rrule/src/i18n/fa.php @@ -42,6 +42,8 @@ 'else' => 'هر %{interval} ثانیه' ), 'dtstart' => ', از %{date}', + 'timeofday' => ' از %{date}', + 'startingtimeofday' => ' از %{date}', 'infinite' => ', همیشه', 'until' => ', تا %{date}', 'count' => array( diff --git a/libraries/php-rrule/src/i18n/fi.php b/libraries/php-rrule/src/i18n/fi.php index 16a38d0..db00be7 100755 --- a/libraries/php-rrule/src/i18n/fi.php +++ b/libraries/php-rrule/src/i18n/fi.php @@ -46,6 +46,8 @@ 'else' => 'joka %{interval} sekunti' ), 'dtstart' => ', alkaen %{date}', + 'timeofday' => ' klo %{date}', + 'startingtimeofday' => ' alkaen %{date}', 'infinite' => ', jatkuvasti', 'until' => ', %{date} asti', 'count' => array( diff --git a/libraries/php-rrule/src/i18n/fr.php b/libraries/php-rrule/src/i18n/fr.php index 87fe6cb..14d02a3 100755 --- a/libraries/php-rrule/src/i18n/fr.php +++ b/libraries/php-rrule/src/i18n/fr.php @@ -44,6 +44,8 @@ 'else' => 'toutes les %{interval} secondes' ), 'dtstart' => ', à partir du %{date}', + 'timeofday' => ' à %{date}', + 'startingtimeofday' => ' à partir du %{date}', 'infinite' => ', indéfiniment', 'until' => ', jusqu\'au %{date}', 'count' => array( diff --git a/libraries/php-rrule/src/i18n/he.php b/libraries/php-rrule/src/i18n/he.php index 491e8d9..bd8fea9 100644 --- a/libraries/php-rrule/src/i18n/he.php +++ b/libraries/php-rrule/src/i18n/he.php @@ -41,6 +41,8 @@ 'else' => 'כל %{interval} שניות' ), 'dtstart' => ', החל מ%{date}', + 'timeofday' => ' החל מ%{date}', + 'startingtimeofday' => ' החל מ%{date}', 'infinite' => ', לעד', 'until' => ', עד %{date}', 'count' => array( diff --git a/libraries/php-rrule/src/i18n/it.php b/libraries/php-rrule/src/i18n/it.php index ff0d729..6acfc39 100644 --- a/libraries/php-rrule/src/i18n/it.php +++ b/libraries/php-rrule/src/i18n/it.php @@ -38,6 +38,8 @@ 'else' => 'ogni %{interval} secondi' ), 'dtstart' => ', a partire dal %{date}', + 'timeofday' => ' alle %{date}', + 'startingtimeofday' => ' a partire dal %{date}', 'infinite' => ', per sempre', 'until' => ', fino al %{date}', 'count' => array( diff --git a/libraries/php-rrule/src/i18n/ja.php b/libraries/php-rrule/src/i18n/ja.php new file mode 100644 index 0000000..5bf56f5 --- /dev/null +++ b/libraries/php-rrule/src/i18n/ja.php @@ -0,0 +1,143 @@ + + * @link https://github.com/Kuri-Tai/php-rrule + */ +return array( + 'yearly' => array( + '1' => '毎年', + 'else' => '%{interval} 年ごと', + ), + 'monthly' => array( + '1' => '毎月', + 'else' => '%{interval} か月ごと', + ), + 'weekly' => array( + '1' => '毎週', + '2' => '隔週', + 'else' => '%{interval} 週間ごと', + ), + 'daily' => array( + '1' => '毎日', + '2' => '隔日', + 'else' => '%{interval} 日ごと', + ), + 'hourly' => array( + '1' => '毎時', + 'else' => '%{interval} 時間ごと', + ), + 'minutely' => array( + '1' => '毎分', + 'else' => '%{interval} 分ごと', + ), + 'secondly' => array( + '1' => '毎秒', + 'else' => '%{interval} 秒ごと', + ), + 'dtstart' => ', %{date} から', + 'infinite' => ', 期日なし', + 'until' => ', %{date} まで', + 'count' => array( + '1' => ', 1 回', + 'else' => ', %{count} 回', + ), + 'and' => 'かつ ', + 'x_of_the_y' => array( + 'yearly' => 'その年の %{x}', // e.g. その年の 最初の 月曜日, もしくは その年の 最初の 日 + 'monthly' => 'その月の %{x}', + ), + 'bymonth' => ' %{months}', + 'months' => array( + 1 => '1月', + 2 => '2月', + 3 => '3月', + 4 => '4月', + 5 => '5月', + 6 => '6月', + 7 => '7月', + 8 => '8月', + 9 => '9月', + 10 => '10月', + 11 => '11月', + 12 => '12月', + ), + 'byweekday' => ' %{weekdays}', + 'weekdays' => array( + 1 => '月曜日', + 2 => '火曜日', + 3 => '水曜日', + 4 => '木曜日', + 5 => '金曜日', + 6 => '土曜日', + 7 => '日曜日', + ), + 'nth_weekday' => array( + '1' => '最初の %{weekday}', // e.g. 最初の 月曜日 + 'else' => '%{n}番目の %{weekday}', + ), + '-nth_weekday' => array( + '-1' => '最後の %{weekday}', // e.g. 最後の 月曜日 + 'else' => '最後から%{n}番目の %{weekday}', + ), + 'byweekno' => array( + '1' => ' 第%{weeks}週目', + 'else' => ' 第%{weeks}週目', + ), + 'nth_weekno' => '%{n}', + 'bymonthday' => ' %{monthdays}', + 'nth_monthday' => array( + '1' => '1番目の', + 'else' => '%{n}番目の', + ), + '-nth_monthday' => array( + '-1' => '最後の', + 'else' => '最後から%{n}番目の', + ), + 'byyearday' => array( + '1' => ' %{yeardays}', + 'else' => ' %{yeardays}', + ), + 'nth_yearday' => array( + '1' => '1番目の', + 'else' => '%{n}番目の', + ), + '-nth_yearday' => array( + '-1' => '最後の', + 'else' => '最後から%{n}番目の', + ), + 'byhour' => array( + '1' => ' %{hours}', + 'else' => ' %{hours}', + ), + 'nth_hour' => '%{n}時', + 'byminute' => array( + '1' => ' %{minutes}', + 'else' => ' %{minutes}', + ), + 'nth_minute' => '%{n}分', + 'bysecond' => array( + '1' => ' %{seconds}', + 'else' => ' %{seconds}', + ), + 'nth_second' => '%{n}秒', + 'bysetpos' => ', ただし、そのうちの %{setpos} 該当するもののみ', + 'nth_setpos' => array( + '1' => '最初の', + 'else' => '%{n}番目の', + ), + '-nth_setpos' => array( + '-1' => '最後の', + 'else' => '最後から%{n}番目の', + ), +); \ No newline at end of file diff --git a/libraries/php-rrule/src/i18n/nl.php b/libraries/php-rrule/src/i18n/nl.php index 28b742f..a0c6361 100755 --- a/libraries/php-rrule/src/i18n/nl.php +++ b/libraries/php-rrule/src/i18n/nl.php @@ -46,6 +46,8 @@ 'else' => 'elke %{interval} seconden' ), 'dtstart' => ', wordt gestart vanaf %{date}', + 'timeofday' => ' om %{date}', + 'startingtimeofday' => ' wordt gestart vanaf %{date}', 'infinite' => ', oneindig', 'until' => ', tot en met %{date}', 'count' => array( @@ -59,28 +61,28 @@ ), 'bymonth' => ' in %{months}', 'months' => array( - 1 => 'Januari', - 2 => 'Februari', - 3 => 'Maart', - 4 => 'April', - 5 => 'Mei', - 6 => 'Juni', - 7 => 'Juli', - 8 => 'Augustus', - 9 => 'September', - 10 => 'Oktober', - 11 => 'November', - 12 => 'December', + 1 => 'januari', + 2 => 'februari', + 3 => 'maart', + 4 => 'april', + 5 => 'mei', + 6 => 'juni', + 7 => 'juli', + 8 => 'augustus', + 9 => 'september', + 10 => 'oktober', + 11 => 'november', + 12 => 'december', ), 'byweekday' => ' op %{weekdays}', 'weekdays' => array( - 1 => 'Maandag', - 2 => 'Dinsdag', - 3 => 'Woensdag', - 4 => 'Donderdag', - 5 => 'Vrijdag', - 6 => 'Zaterdag', - 7 => 'Zondag', + 1 => 'maandag', + 2 => 'dinsdag', + 3 => 'woensdag', + 4 => 'donderdag', + 5 => 'vrijdag', + 6 => 'zaterdag', + 7 => 'zondag', ), 'nth_weekday' => array( '1' => 'de eerste %{weekday}', // e.g. the first Monday diff --git a/libraries/php-rrule/src/i18n/pl.php b/libraries/php-rrule/src/i18n/pl.php index 6e96516..e87a33b 100644 --- a/libraries/php-rrule/src/i18n/pl.php +++ b/libraries/php-rrule/src/i18n/pl.php @@ -58,6 +58,8 @@ 'else' => 'co %{interval} sekund' ), 'dtstart' => ', zaczynając od %{date}', + 'timeofday' => ' o %{date}', + 'startingtimeofday' => ' zaczynając od %{date}', 'infinite' => ', zawsze', 'until' => ', do daty %{date}', 'count' => array( diff --git a/libraries/php-rrule/src/i18n/pt.php b/libraries/php-rrule/src/i18n/pt.php index ef669e6..787ca84 100644 --- a/libraries/php-rrule/src/i18n/pt.php +++ b/libraries/php-rrule/src/i18n/pt.php @@ -39,6 +39,8 @@ 'else' => 'cada %{interval} segundos'// cada 8 segundos ), 'dtstart' => ', começando de %{date}', + 'timeofday' => ' às %{date}', + 'startingtimeofday' => ' começando de %{date}', 'infinite' => ', para sempre', 'until' => ', até %{date}', 'count' => array( diff --git a/libraries/php-rrule/src/i18n/sv.php b/libraries/php-rrule/src/i18n/sv.php index 353ce53..c4ea6f5 100755 --- a/libraries/php-rrule/src/i18n/sv.php +++ b/libraries/php-rrule/src/i18n/sv.php @@ -51,6 +51,8 @@ 'else' => 'var %{interval}:e sekund' ), 'dtstart' => ', börjar %{date}', + 'timeofday' => ' kl %{date}', + 'startingtimeofday' => ' börjar %{date}', 'infinite' => ', tills vidare', 'until' => ', t.om %{date}', 'count' => array( @@ -79,7 +81,7 @@ ), 'byweekday' => ' på %{weekdays}', 'weekdays' => array( - 1 => 'Månday', + 1 => 'Måndag', 2 => 'Tisdag', 3 => 'Onsdag', 4 => 'Torsdag', @@ -146,14 +148,14 @@ 'nth_second' => '%{n}', 'bysetpos' => ', men bara %{setpos} tillfället i serien', 'nth_setpos' => array( - '1' => 'det första', - '2' => 'det andra', - '3' => 'det tredje', - 'else' => 'det %{n}:e' + '1' => 'den första', + '2' => 'den andra', + '3' => 'den tredje', + 'else' => 'den %{n}:e' ), '-nth_setpos' => array( - '-1' => 'det sista', - '-2' => 'det näst sista', - 'else' => 'det %{n}:e sista' + '-1' => 'den sista', + '-2' => 'den näst sista', + 'else' => 'den %{n}:e sista' ) );