diff options
63 files changed, 495 insertions, 431 deletions
diff --git a/core/Period.php b/core/Period.php index b924e981c8..ede9bb2a67 100644 --- a/core/Period.php +++ b/core/Period.php @@ -271,4 +271,68 @@ abstract class Period return $dateStart->toString("Y-m-d") . "," . $dateEnd->toString("Y-m-d"); } + + + /** + * @param string $format + * + * @return mixed + */ + protected function getTranslatedRange($format) + { + $dateStart = $this->getDateStart(); + $dateEnd = $this->getDateEnd(); + list($formatStart, $formatEnd) = $this->explodeFormat($format); + + $string = $dateStart->getLocalized($formatStart); + $string .= $dateEnd->getLocalized($formatEnd); + + return $string; + } + + /** + * Explodes the given format into two pieces. One that can be user for start date and the other for end date + * + * @param $format + * @return array + */ + protected function explodeFormat($format) + { + $intervalTokens = array( + array('d', 'E', 'C'), + array('M', 'L'), + array('y') + ); + + $offset = strlen($format); + + // search for first duplicate date field + foreach ($intervalTokens AS $tokens) { + if (preg_match_all('/['.implode('|', $tokens).']+/', $format, $matches, PREG_OFFSET_CAPTURE)) { + if (count($matches[0]) > 1 && $offset > $matches[0][1][1]) { + $offset = $matches[0][1][1]; + } + } + + } + + return array(substr($format, 0, $offset), substr($format, $offset)); + } + + protected function getRangeFormat($short = false) + { + $maxDifference = 'D'; + if ($this->getDateStart()->toString('y') != $this->getDateEnd()->toString('y')) { + $maxDifference = 'Y'; + } elseif ($this->getDateStart()->toString('m') != $this->getDateEnd()->toString('m')) { + $maxDifference = 'M'; + } + + return $this->translator->translate( + sprintf( + 'Intl_Format_Interval_%s_%s', + $short ? 'Short' : 'Long', + $maxDifference + )); + } } diff --git a/core/Period/Range.php b/core/Period/Range.php index 0bac3aad81..706428162e 100644 --- a/core/Period/Range.php +++ b/core/Period/Range.php @@ -107,16 +107,7 @@ class Range extends Period */ public function getLocalizedShortString() { - //"30 Dec 08 - 26 Feb 09" - $dateStart = $this->getDateStart(); - $dateEnd = $this->getDateEnd(); - $template = Date::DATE_FORMAT_SHORT; - - $shortDateStart = $dateStart->getLocalized($template); - $shortDateEnd = $dateEnd->getLocalized($template); - - $out = "$shortDateStart - $shortDateEnd"; - return $out; + return $this->getTranslatedRange($this->getRangeFormat(true), $this->getDateStart(), $this->getDateEnd()); } /** @@ -126,7 +117,7 @@ class Range extends Period */ public function getLocalizedLongString() { - return $this->getLocalizedShortString(); + return $this->getTranslatedRange($this->getRangeFormat(), $this->getDateStart(), $this->getDateEnd()); } /** diff --git a/core/Period/Week.php b/core/Period/Week.php index 88072b4ba5..2e6219a049 100644 --- a/core/Period/Week.php +++ b/core/Period/Week.php @@ -24,13 +24,7 @@ class Week extends Period */ public function getLocalizedShortString() { - //"30 Dec - 6 Jan 09" - $dateStart = $this->getDateStart(); - $dateEnd = $this->getDateEnd(); - - $format = $this->translator->translate('Intl_Format_Interval_Week_Short_'.$this->getMinDifference($dateStart, $dateEnd)); - $string = $this->getTranslatedRange($format, $dateStart, $dateEnd); - return $string; + return $this->getTranslatedRange($this->getRangeFormat(true), $this->getDateStart(), $this->getDateEnd()); } /** @@ -40,73 +34,10 @@ class Week extends Period */ public function getLocalizedLongString() { - //"30 Dec - 6 Jan 09" - $dateStart = $this->getDateStart(); - $dateEnd = $this->getDateEnd(); - - $format = $this->translator->translate('Intl_Format_Interval_Week_Long_'.$this->getMinDifference($dateStart, $dateEnd)); - $string = $this->getTranslatedRange($format, $dateStart, $dateEnd); - + $string = $this->getTranslatedRange($this->getRangeFormat(), $this->getDateStart(), $this->getDateEnd()); return $this->translator->translate('Intl_PeriodWeek') . " " . $string; } - protected function getMinDifference($dateFrom, $dateEnd) - { - if ($dateFrom->toString('y') != $dateEnd->toString('y')) { - return 'Y'; - } elseif ($dateFrom->toString('m') != $dateEnd->toString('m')) { - return 'M'; - } - - return 'D'; - } - - /** - * @param string $format - * @param \Piwik\Date $dateStart - * @param \Piwik\Date $dateEnd - * - * @return mixed - */ - protected function getTranslatedRange($format, $dateStart, $dateEnd) - { - list($formatStart, $formatEnd) = $this->explodeFormat($format); - - $string = $dateStart->getLocalized($formatStart); - $string .= $dateEnd->getLocalized($formatEnd); - - return $string; - } - - /** - * Explodes the given format into two pieces. One that can be user for start date and the other for end date - * - * @param $format - * @return array - */ - protected function explodeFormat($format) - { - $intervalTokens = array( - array('d', 'E', 'C'), - array('M', 'L'), - array('y') - ); - - $offset = strlen($format); - - // search for first duplicate date field - foreach ($intervalTokens AS $tokens) { - if (preg_match_all('/['.implode('|', $tokens).']+/', $format, $matches, PREG_OFFSET_CAPTURE)) { - if (count($matches[0]) > 1 && $offset > $matches[0][1][1]) { - $offset = $matches[0][1][1]; - } - } - - } - - return array(substr($format, 0, $offset), substr($format, $offset)); - } - /** * Returns the current period as a string * diff --git a/plugins/Intl/Commands/GenerateIntl.php b/plugins/Intl/Commands/GenerateIntl.php index b997f62e18..b6a57b957a 100644 --- a/plugins/Intl/Commands/GenerateIntl.php +++ b/plugins/Intl/Commands/GenerateIntl.php @@ -275,19 +275,19 @@ class GenerateIntl extends ConsoleCommand $translations['Intl']['Format_DateTime_Long'] = $calendarData['dateFormats']['full'] . ' ' . $calendarData['timeFormats']['medium']; $translations['Intl']['Format_DateTime_Short'] = $calendarData['dateFormats']['medium'] . ' ' . $calendarData['timeFormats']['medium']; - $translations['Intl']['Format_Interval_Week_Long_D'] = $this->transformDateFormat($calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['d'], array('MMMM' => 'MMM', 'LLLL' => 'LLL', 'MMM' => 'MMMM', 'LLL' => 'LLLL')); - $translations['Intl']['Format_Interval_Week_Long_M'] = $this->transformDateFormat($calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['M'], array('MMMM' => 'MMM', 'LLLL' => 'LLL', 'MMM' => 'MMMM', 'LLL' => 'LLLL')); - $translations['Intl']['Format_Interval_Week_Long_Y'] = $this->transformDateFormat($calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['y'], array('MMMM' => 'MMM', 'LLLL' => 'LLL', 'MMM' => 'MMMM', 'LLL' => 'LLLL')); + $translations['Intl']['Format_Interval_Long_D'] = $this->transformDateFormat($calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['d'], array('MMMM' => 'MMM', 'LLLL' => 'LLL', 'MMM' => 'MMMM', 'LLL' => 'LLLL')); + $translations['Intl']['Format_Interval_Long_M'] = $this->transformDateFormat($calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['M'], array('MMMM' => 'MMM', 'LLLL' => 'LLL', 'MMM' => 'MMMM', 'LLL' => 'LLLL')); + $translations['Intl']['Format_Interval_Long_Y'] = $this->transformDateFormat($calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['y'], array('MMMM' => 'MMM', 'LLLL' => 'LLL', 'MMM' => 'MMMM', 'LLL' => 'LLLL')); if(isset($calendarData['dateTimeFormats']['intervalFormats']['yMMMMd'])) { - $translations['Intl']['Format_Interval_Week_Long_D'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMMd']['d']; - $translations['Intl']['Format_Interval_Week_Long_M'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMMd']['M']; - $translations['Intl']['Format_Interval_Week_Long_Y'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMMd']['y']; + $translations['Intl']['Format_Interval_Long_D'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMMd']['d']; + $translations['Intl']['Format_Interval_Long_M'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMMd']['M']; + $translations['Intl']['Format_Interval_Long_Y'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMMd']['y']; } - $translations['Intl']['Format_Interval_Week_Short_D'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['d']; - $translations['Intl']['Format_Interval_Week_Short_M'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['M']; - $translations['Intl']['Format_Interval_Week_Short_Y'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['y']; + $translations['Intl']['Format_Interval_Short_D'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['d']; + $translations['Intl']['Format_Interval_Short_M'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['M']; + $translations['Intl']['Format_Interval_Short_Y'] = $calendarData['dateTimeFormats']['intervalFormats']['yMMMd']['y']; $output->writeln('Saved calendar data for ' . $langCode); } catch (\Exception $e) { diff --git a/plugins/Intl/lang/am.json b/plugins/Intl/lang/am.json index 801f507dd4..551304d5d6 100644 --- a/plugins/Intl/lang/am.json +++ b/plugins/Intl/lang/am.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, MMM d", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "MMMM d–d፣ y", - "Format_Interval_Week_Long_M": "MMMM d – MMMM d፣ y", - "Format_Interval_Week_Long_Y": "MMMM d፣ y – MMMM d፣ y", - "Format_Interval_Week_Short_D": "MMM d–d፣ y", - "Format_Interval_Week_Short_M": "MMM d – MMM d፣ y", - "Format_Interval_Week_Short_Y": "MMM d፣ y – MMM d፣ y", + "Format_Interval_Long_D": "MMMM d–d፣ y", + "Format_Interval_Long_M": "MMMM d – MMMM d፣ y", + "Format_Interval_Long_Y": "MMMM d፣ y – MMMM d፣ y", + "Format_Interval_Short_D": "MMM d–d፣ y", + "Format_Interval_Short_M": "MMM d – MMM d፣ y", + "Format_Interval_Short_Y": "MMM d፣ y – MMM d፣ y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "h:mm:ss a", diff --git a/plugins/Intl/lang/ar.json b/plugins/Intl/lang/ar.json index 5a5ba9b500..4adbcfa7a4 100644 --- a/plugins/Intl/lang/ar.json +++ b/plugins/Intl/lang/ar.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E، d MMM", "Format_Date_Long": "EEEE، d MMMM، y", "Format_Date_Short": "dd\/MM\/y", - "Format_Interval_Week_Long_D": "d–d MMMM، y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM، y", - "Format_Interval_Week_Long_Y": "d MMMM، y – d MMMM، y", - "Format_Interval_Week_Short_D": "d–d MMM، y", - "Format_Interval_Week_Short_M": "d MMM – d MMM، y", - "Format_Interval_Week_Short_Y": "d MMM، y – d MMM، y", + "Format_Interval_Long_D": "d–d MMMM، y", + "Format_Interval_Long_M": "d MMMM – d MMMM، y", + "Format_Interval_Long_Y": "d MMMM، y – d MMMM، y", + "Format_Interval_Short_D": "d–d MMM، y", + "Format_Interval_Short_M": "d MMM – d MMM، y", + "Format_Interval_Short_Y": "d MMM، y – d MMM، y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "h:mm:ss a", diff --git a/plugins/Intl/lang/be.json b/plugins/Intl/lang/be.json index 54540026db..85752d2970 100644 --- a/plugins/Intl/lang/be.json +++ b/plugins/Intl/lang/be.json @@ -300,12 +300,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d.M.y", - "Format_Interval_Week_Long_D": "y MMMM d–d", - "Format_Interval_Week_Long_M": "y MMMM d – MMMM d", - "Format_Interval_Week_Long_Y": "y MMMM d – y MMMM d", - "Format_Interval_Week_Short_D": "y MMM d–d", - "Format_Interval_Week_Short_M": "y MMM d – MMM d", - "Format_Interval_Week_Short_Y": "y MMM d – y MMM d", + "Format_Interval_Long_D": "y MMMM d–d", + "Format_Interval_Long_M": "y MMMM d – MMMM d", + "Format_Interval_Long_Y": "y MMMM d – y MMMM d", + "Format_Interval_Short_D": "y MMM d–d", + "Format_Interval_Short_M": "y MMM d – MMM d", + "Format_Interval_Short_Y": "y MMM d – y MMM d", "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLL y", "Format_Time": "HH.mm.ss", diff --git a/plugins/Intl/lang/bg.json b/plugins/Intl/lang/bg.json index 21e2ecf0fa..b257f6e2b9 100644 --- a/plugins/Intl/lang/bg.json +++ b/plugins/Intl/lang/bg.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d.MM", "Format_Date_Long": "EEEE, d MMMM y 'г'.", "Format_Date_Short": "d.MM.y 'г'.", - "Format_Interval_Week_Long_D": "d – d MMMM y 'г'.", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y 'г'.", - "Format_Interval_Week_Long_Y": "d MMMM y 'г'. – d MMMM y 'г'.", - "Format_Interval_Week_Short_D": "d.MM – d.MM.y 'г'.", - "Format_Interval_Week_Short_M": "d.MM – d.MM.y 'г'.", - "Format_Interval_Week_Short_Y": "d.MM.y 'г'. – d.MM.y 'г'.", + "Format_Interval_Long_D": "d – d MMMM y 'г'.", + "Format_Interval_Long_M": "d MMMM – d MMMM y 'г'.", + "Format_Interval_Long_Y": "d MMMM y 'г'. – d MMMM y 'г'.", + "Format_Interval_Short_D": "d.MM – d.MM.y 'г'.", + "Format_Interval_Short_M": "d.MM – d.MM.y 'г'.", + "Format_Interval_Short_Y": "d.MM.y 'г'. – d.MM.y 'г'.", "Format_Month_Long": "MMMM y 'г'.", "Format_Month_Short": "MM.y 'г'.", "Format_Time": "H:mm:ss", diff --git a/plugins/Intl/lang/bn.json b/plugins/Intl/lang/bn.json index d3dcf79647..1699da595d 100644 --- a/plugins/Intl/lang/bn.json +++ b/plugins/Intl/lang/bn.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE, d MMMM, y", "Format_Date_Short": "d MMM, y", - "Format_Interval_Week_Long_D": "d–d MMMM, y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM, y", - "Format_Interval_Week_Long_Y": "d MMMM, y – d MMMM, y", - "Format_Interval_Week_Short_D": "d–d MMM, y", - "Format_Interval_Week_Short_M": "d MMM – d MMM, y", - "Format_Interval_Week_Short_Y": "d MMM, y – d MMM, y", + "Format_Interval_Long_D": "d–d MMMM, y", + "Format_Interval_Long_M": "d MMMM – d MMMM, y", + "Format_Interval_Long_Y": "d MMMM, y – d MMMM, y", + "Format_Interval_Short_D": "d–d MMM, y", + "Format_Interval_Short_M": "d MMM – d MMM, y", + "Format_Interval_Short_Y": "d MMM, y – d MMM, y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "h:mm:ss a", diff --git a/plugins/Intl/lang/bs.json b/plugins/Intl/lang/bs.json index f126a31a3a..5cf7170ea0 100644 --- a/plugins/Intl/lang/bs.json +++ b/plugins/Intl/lang/bs.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, dd. MMM", "Format_Date_Long": "EEEE, dd. MMMM y.", "Format_Date_Short": "dd. MMM. y.", - "Format_Interval_Week_Long_D": "dd. – dd. MMMM y.", - "Format_Interval_Week_Long_M": "dd. MMMM – dd. MMMM y.", - "Format_Interval_Week_Long_Y": "dd. MMMM y. – dd. MMMM y.", - "Format_Interval_Week_Short_D": "dd. – dd. MMM y.", - "Format_Interval_Week_Short_M": "dd. MMM – dd. MMM y.", - "Format_Interval_Week_Short_Y": "dd. MMM y. – dd. MMM y.", + "Format_Interval_Long_D": "dd. – dd. MMMM y.", + "Format_Interval_Long_M": "dd. MMMM – dd. MMMM y.", + "Format_Interval_Long_Y": "dd. MMMM y. – dd. MMMM y.", + "Format_Interval_Short_D": "dd. – dd. MMM y.", + "Format_Interval_Short_M": "dd. MMM – dd. MMM y.", + "Format_Interval_Short_Y": "dd. MMM y. – dd. MMM y.", "Format_Month_Long": "LLLL y.", "Format_Month_Short": "MMM y.", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/ca.json b/plugins/Intl/lang/ca.json index 3119f45570..a32c0bcbc0 100644 --- a/plugins/Intl/lang/ca.json +++ b/plugins/Intl/lang/ca.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM 'de' y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d–d MMMM 'de' y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM 'de' y", - "Format_Interval_Week_Long_Y": "d MMMM 'de' y – d MMMM 'de' y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d–d MMMM 'de' y", + "Format_Interval_Long_M": "d MMMM – d MMMM 'de' y", + "Format_Interval_Long_Y": "d MMMM 'de' y – d MMMM 'de' y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "LLLL 'de' y", "Format_Month_Short": "LLL y", "Format_Time": "H:mm:ss", diff --git a/plugins/Intl/lang/cs.json b/plugins/Intl/lang/cs.json index b3b12a699f..ed94dbf86f 100644 --- a/plugins/Intl/lang/cs.json +++ b/plugins/Intl/lang/cs.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d. M.", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. M. y", - "Format_Interval_Week_Long_D": "d.–d. M. y", - "Format_Interval_Week_Long_M": "d. M. – d. M. y", - "Format_Interval_Week_Long_Y": "d. M. y – d. M. y", - "Format_Interval_Week_Short_D": "d.–d. M. y", - "Format_Interval_Week_Short_M": "d. M. – d. M. y", - "Format_Interval_Week_Short_Y": "d. M. y – d. M. y", + "Format_Interval_Long_D": "d.–d. M. y", + "Format_Interval_Long_M": "d. M. – d. M. y", + "Format_Interval_Long_Y": "d. M. y – d. M. y", + "Format_Interval_Short_D": "d.–d. M. y", + "Format_Interval_Short_M": "d. M. – d. M. y", + "Format_Interval_Short_Y": "d. M. y – d. M. y", "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLLL y", "Format_Time": "H:mm:ss", diff --git a/plugins/Intl/lang/cy.json b/plugins/Intl/lang/cy.json index b16d0c1ba4..90e833d8e0 100644 --- a/plugins/Intl/lang/cy.json +++ b/plugins/Intl/lang/cy.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d–d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM, y – d MMMM y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM, y – d MMM y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM, y – d MMMM y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM, y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/da.json b/plugins/Intl/lang/da.json index 152d4ed61f..8209c4685b 100644 --- a/plugins/Intl/lang/da.json +++ b/plugins/Intl/lang/da.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE 'den' d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Interval_Week_Long_D": "d.–d. MMMM y", - "Format_Interval_Week_Long_M": "d. MMMM – d. MMMM y", - "Format_Interval_Week_Long_Y": "d. MMMM y – d. MMMM y", - "Format_Interval_Week_Short_D": "d.–d. MMM y", - "Format_Interval_Week_Short_M": "d. MMM – d. MMM y", - "Format_Interval_Week_Short_Y": "d. MMM y – d. MMM y", + "Format_Interval_Long_D": "d.–d. MMMM y", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Short_D": "d.–d. MMM y", + "Format_Interval_Short_M": "d. MMM – d. MMM y", + "Format_Interval_Short_Y": "d. MMM y – d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH.mm.ss", diff --git a/plugins/Intl/lang/de.json b/plugins/Intl/lang/de.json index 0cdc31935b..e9e1b249f7 100644 --- a/plugins/Intl/lang/de.json +++ b/plugins/Intl/lang/de.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "dd.MM.y", - "Format_Interval_Week_Long_D": "d.–d. MMMM y", - "Format_Interval_Week_Long_M": "d. MMMM – d. MMMM y", - "Format_Interval_Week_Long_Y": "d. MMMM y – d. MMMM y", - "Format_Interval_Week_Short_D": "d.–d. MMM y", - "Format_Interval_Week_Short_M": "d. MMM – d. MMM y", - "Format_Interval_Week_Short_Y": "d. MMM y – d. MMM y", + "Format_Interval_Long_D": "d.–d. MMMM y", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Short_D": "d.–d. MMM y", + "Format_Interval_Short_M": "d. MMM – d. MMM y", + "Format_Interval_Short_Y": "d. MMM y – d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/el.json b/plugins/Intl/lang/el.json index 9be948bba7..360bbf3432 100644 --- a/plugins/Intl/lang/el.json +++ b/plugins/Intl/lang/el.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "dd–dd MMMM y", - "Format_Interval_Week_Long_M": "dd MMMM – dd MMMM y", - "Format_Interval_Week_Long_Y": "dd MMMM y – dd MMMM y", - "Format_Interval_Week_Short_D": "dd–dd MMM y", - "Format_Interval_Week_Short_M": "dd MMM – dd MMM y", - "Format_Interval_Week_Short_Y": "dd MMM y – dd MMM y", + "Format_Interval_Long_D": "dd–dd MMMM y", + "Format_Interval_Long_M": "dd MMMM – dd MMMM y", + "Format_Interval_Long_Y": "dd MMMM y – dd MMMM y", + "Format_Interval_Short_D": "dd–dd MMM y", + "Format_Interval_Short_M": "dd MMM – dd MMM y", + "Format_Interval_Short_Y": "dd MMM y – dd MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "h:mm:ss a", diff --git a/plugins/Intl/lang/en.json b/plugins/Intl/lang/en.json index 366978a006..7ee85c4a60 100644 --- a/plugins/Intl/lang/en.json +++ b/plugins/Intl/lang/en.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, MMM d", "Format_Date_Long": "EEEE, MMMM d, y", "Format_Date_Short": "MMM d, y", - "Format_Interval_Week_Long_D": "MMMM d – d, y", - "Format_Interval_Week_Long_M": "MMMM d – MMMM d, y", - "Format_Interval_Week_Long_Y": "MMMM d, y – MMMM d, y", - "Format_Interval_Week_Short_D": "MMM d – d, y", - "Format_Interval_Week_Short_M": "MMM d – MMM d, y", - "Format_Interval_Week_Short_Y": "MMM d, y – MMM d, y", + "Format_Interval_Long_D": "MMMM d – d, y", + "Format_Interval_Long_M": "MMMM d – MMMM d, y", + "Format_Interval_Long_Y": "MMMM d, y – MMMM d, y", + "Format_Interval_Short_D": "MMM d – d, y", + "Format_Interval_Short_M": "MMM d – MMM d, y", + "Format_Interval_Short_Y": "MMM d, y – MMM d, y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "h:mm:ss a", diff --git a/plugins/Intl/lang/es.json b/plugins/Intl/lang/es.json index ac01d7c0fc..dfac04d249 100644 --- a/plugins/Intl/lang/es.json +++ b/plugins/Intl/lang/es.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d–d 'de' MMMM 'de' y", - "Format_Interval_Week_Long_M": "d 'de' MMMM–d 'de' MMMM 'de' y", - "Format_Interval_Week_Long_Y": "d 'de' MMMM 'de' y–d 'de' MMMM 'de' y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM–d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y–d MMM y", + "Format_Interval_Long_D": "d–d 'de' MMMM 'de' y", + "Format_Interval_Long_M": "d 'de' MMMM–d 'de' MMMM 'de' y", + "Format_Interval_Long_Y": "d 'de' MMMM 'de' y–d 'de' MMMM 'de' y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM–d MMM y", + "Format_Interval_Short_Y": "d MMM y–d MMM y", "Format_Month_Long": "MMMM 'de' y", "Format_Month_Short": "MMM y", "Format_Time": "H:mm:ss", diff --git a/plugins/Intl/lang/et.json b/plugins/Intl/lang/et.json index a620464292..6db46c6cec 100644 --- a/plugins/Intl/lang/et.json +++ b/plugins/Intl/lang/et.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Interval_Week_Long_D": "d.–d. MMMM y", - "Format_Interval_Week_Long_M": "d. MMMM–d. MMMM y", - "Format_Interval_Week_Long_Y": "d. MMMM y–d. MMMM y", - "Format_Interval_Week_Short_D": "d.–d. MMM y", - "Format_Interval_Week_Short_M": "d. MMM–d. MMM y", - "Format_Interval_Week_Short_Y": "d. MMM y–d. MMM y", + "Format_Interval_Long_D": "d.–d. MMMM y", + "Format_Interval_Long_M": "d. MMMM–d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y–d. MMMM y", + "Format_Interval_Short_D": "d.–d. MMM y", + "Format_Interval_Short_M": "d. MMM–d. MMM y", + "Format_Interval_Short_Y": "d. MMM y–d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "H:mm.ss", diff --git a/plugins/Intl/lang/eu.json b/plugins/Intl/lang/eu.json index 052d3f8ddb..50ba4067ff 100644 --- a/plugins/Intl/lang/eu.json +++ b/plugins/Intl/lang/eu.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "MMM d, E", "Format_Date_Long": "y('e')'ko' MMMM d, EEEE", "Format_Date_Short": "y MMM d", - "Format_Interval_Week_Long_D": "y('e')'ko' MMMM d–d", - "Format_Interval_Week_Long_M": "y('e')'ko' MMMM d – MMMM d", - "Format_Interval_Week_Long_Y": "y('e')'ko' MMMM d – y('e')'ko' MMMM d", - "Format_Interval_Week_Short_D": "y('e')'ko' MMM d–d", - "Format_Interval_Week_Short_M": "y('e')'ko' MMM d – MMM d", - "Format_Interval_Week_Short_Y": "y('e')'ko' MMM d – y('e')'ko' MMM d", + "Format_Interval_Long_D": "y('e')'ko' MMMM d–d", + "Format_Interval_Long_M": "y('e')'ko' MMMM d – MMMM d", + "Format_Interval_Long_Y": "y('e')'ko' MMMM d – y('e')'ko' MMMM d", + "Format_Interval_Short_D": "y('e')'ko' MMM d–d", + "Format_Interval_Short_M": "y('e')'ko' MMM d – MMM d", + "Format_Interval_Short_Y": "y('e')'ko' MMM d – y('e')'ko' MMM d", "Format_Month_Long": "y('e')'ko' MMMM", "Format_Month_Short": "y MMM", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/fa.json b/plugins/Intl/lang/fa.json index 35a2112835..a3bf513df0 100644 --- a/plugins/Intl/lang/fa.json +++ b/plugins/Intl/lang/fa.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d LLL", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d تا d MMMM y", - "Format_Interval_Week_Long_M": "d LLLL تا d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y تا d MMMM y", - "Format_Interval_Week_Short_D": "d تا d MMM y", - "Format_Interval_Week_Short_M": "d LLL تا d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y تا d MMM y", + "Format_Interval_Long_D": "d تا d MMMM y", + "Format_Interval_Long_M": "d LLLL تا d MMMM y", + "Format_Interval_Long_Y": "d MMMM y تا d MMMM y", + "Format_Interval_Short_D": "d تا d MMM y", + "Format_Interval_Short_M": "d LLL تا d MMM y", + "Format_Interval_Short_Y": "d MMM y تا d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "H:mm:ss", diff --git a/plugins/Intl/lang/fi.json b/plugins/Intl/lang/fi.json index 1d13af1b7d..766f1a26e3 100644 --- a/plugins/Intl/lang/fi.json +++ b/plugins/Intl/lang/fi.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "ccc d. MMM", "Format_Date_Long": "cccc d. MMMM y", "Format_Date_Short": "d.M.y", - "Format_Interval_Week_Long_D": "d.–d. MMMM y", - "Format_Interval_Week_Long_M": "d. MMMM – d. MMMM y", - "Format_Interval_Week_Long_Y": "d. MMMM y – d. MMMM y", - "Format_Interval_Week_Short_D": "d.–d. MMMM y", - "Format_Interval_Week_Short_M": "d. MMMM – d. MMMM y", - "Format_Interval_Week_Short_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Long_D": "d.–d. MMMM y", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Short_D": "d.–d. MMMM y", + "Format_Interval_Short_M": "d. MMMM – d. MMMM y", + "Format_Interval_Short_Y": "d. MMMM y – d. MMMM y", "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLL y", "Format_Time": "H.mm.ss", diff --git a/plugins/Intl/lang/fr.json b/plugins/Intl/lang/fr.json index b5cbbc0269..fa0e99b349 100644 --- a/plugins/Intl/lang/fr.json +++ b/plugins/Intl/lang/fr.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d–d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/gl.json b/plugins/Intl/lang/gl.json index af13198a1b..8448d0da11 100644 --- a/plugins/Intl/lang/gl.json +++ b/plugins/Intl/lang/gl.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE dd MMMM y", "Format_Date_Short": "d MMM, y", - "Format_Interval_Week_Long_D": "d–d MMMM, y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM, y", - "Format_Interval_Week_Long_Y": "d MMMM, y – d MMMM, y", - "Format_Interval_Week_Short_D": "d–d MMM, y", - "Format_Interval_Week_Short_M": "d MMM – d MMM, y", - "Format_Interval_Week_Short_Y": "d MMM, y – d MMM, y", + "Format_Interval_Long_D": "d–d MMMM, y", + "Format_Interval_Long_M": "d MMMM – d MMMM, y", + "Format_Interval_Long_Y": "d MMMM, y – d MMMM, y", + "Format_Interval_Short_D": "d–d MMM, y", + "Format_Interval_Short_M": "d MMM – d MMM, y", + "Format_Interval_Short_Y": "d MMM, y – d MMM, y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/he.json b/plugins/Intl/lang/he.json index cdae0a4671..c1a84f0033 100644 --- a/plugins/Intl/lang/he.json +++ b/plugins/Intl/lang/he.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d בMMM", "Format_Date_Long": "EEEE, d בMMMM y", "Format_Date_Short": "d בMMM y", - "Format_Interval_Week_Long_D": "d–d בMMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Week_Short_D": "d–d בMMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d–d בMMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d–d בMMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "H:mm:ss", diff --git a/plugins/Intl/lang/hi.json b/plugins/Intl/lang/hi.json index dd50741e98..225da598d4 100644 --- a/plugins/Intl/lang/hi.json +++ b/plugins/Intl/lang/hi.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "dd\/MM\/y", - "Format_Interval_Week_Long_D": "d–d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "h:mm:ss a", diff --git a/plugins/Intl/lang/hr.json b/plugins/Intl/lang/hr.json index 487aeb1b25..46793d2519 100644 --- a/plugins/Intl/lang/hr.json +++ b/plugins/Intl/lang/hr.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y.", "Format_Date_Short": "d. MMM y.", - "Format_Interval_Week_Long_D": "dd. – dd. MMMM y.", - "Format_Interval_Week_Long_M": "dd. MMMM – dd. MMMM y.", - "Format_Interval_Week_Long_Y": "dd. MMMM y. – dd. MMMM y.", - "Format_Interval_Week_Short_D": "dd. – dd. MMM y.", - "Format_Interval_Week_Short_M": "dd. MMM – dd. MMM y.", - "Format_Interval_Week_Short_Y": "dd. MMM y. – dd. MMM y.", + "Format_Interval_Long_D": "dd. – dd. MMMM y.", + "Format_Interval_Long_M": "dd. MMMM – dd. MMMM y.", + "Format_Interval_Long_Y": "dd. MMMM y. – dd. MMMM y.", + "Format_Interval_Short_D": "dd. – dd. MMM y.", + "Format_Interval_Short_M": "dd. MMM – dd. MMM y.", + "Format_Interval_Short_Y": "dd. MMM y. – dd. MMM y.", "Format_Month_Long": "LLLL y.", "Format_Month_Short": "LLL y.", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/hu.json b/plugins/Intl/lang/hu.json index 15fb48ea85..7481dc75a9 100644 --- a/plugins/Intl/lang/hu.json +++ b/plugins/Intl/lang/hu.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "MMM d., E", "Format_Date_Long": "y. MMMM d., EEEE", "Format_Date_Short": "y. MMM d.", - "Format_Interval_Week_Long_D": "y. MMMM d–d.", - "Format_Interval_Week_Long_M": "y. MMMM d. – MMMM d.", - "Format_Interval_Week_Long_Y": "y. MMMM d. – y. MMMM d.", - "Format_Interval_Week_Short_D": "y. MMM d–d.", - "Format_Interval_Week_Short_M": "y. MMM d. – MMM d.", - "Format_Interval_Week_Short_Y": "y. MMM d. – y. MMM d.", + "Format_Interval_Long_D": "y. MMMM d–d.", + "Format_Interval_Long_M": "y. MMMM d. – MMMM d.", + "Format_Interval_Long_Y": "y. MMMM d. – y. MMMM d.", + "Format_Interval_Short_D": "y. MMM d–d.", + "Format_Interval_Short_M": "y. MMM d. – MMM d.", + "Format_Interval_Short_Y": "y. MMM d. – y. MMM d.", "Format_Month_Long": "y. MMMM", "Format_Month_Short": "y. MMM", "Format_Time": "H:mm:ss", diff --git a/plugins/Intl/lang/id.json b/plugins/Intl/lang/id.json index 1f295127b0..ff1028c94d 100644 --- a/plugins/Intl/lang/id.json +++ b/plugins/Intl/lang/id.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, dd MMMM y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d–d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH.mm.ss", diff --git a/plugins/Intl/lang/is.json b/plugins/Intl/lang/is.json index a60c2d9a71..03b1b59c38 100644 --- a/plugins/Intl/lang/is.json +++ b/plugins/Intl/lang/is.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Interval_Week_Long_D": "d.–d. MMMM y", - "Format_Interval_Week_Long_M": "d. MMMM – d. MMMM y", - "Format_Interval_Week_Long_Y": "d. MMMM y – d. MMMM y", - "Format_Interval_Week_Short_D": "d.–d. MMM y", - "Format_Interval_Week_Short_M": "d. MMM – d. MMM y", - "Format_Interval_Week_Short_Y": "d. MMM y – d. MMM y", + "Format_Interval_Long_D": "d.–d. MMMM y", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Short_D": "d.–d. MMM y", + "Format_Interval_Short_M": "d. MMM – d. MMM y", + "Format_Interval_Short_Y": "d. MMM y – d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/it.json b/plugins/Intl/lang/it.json index fbec8277f5..20aba2c4db 100644 --- a/plugins/Intl/lang/it.json +++ b/plugins/Intl/lang/it.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "dd MMM y", - "Format_Interval_Week_Long_D": "dd–dd MMMM y", - "Format_Interval_Week_Long_M": "dd MMMM – dd MMMM y", - "Format_Interval_Week_Long_Y": "dd MMMM y – dd MMMM y", - "Format_Interval_Week_Short_D": "dd–dd MMM y", - "Format_Interval_Week_Short_M": "dd MMM – dd MMM y", - "Format_Interval_Week_Short_Y": "dd MMM y – dd MMM y", + "Format_Interval_Long_D": "dd–dd MMMM y", + "Format_Interval_Long_M": "dd MMMM – dd MMMM y", + "Format_Interval_Long_Y": "dd MMMM y – dd MMMM y", + "Format_Interval_Short_D": "dd–dd MMM y", + "Format_Interval_Short_M": "dd MMM – dd MMM y", + "Format_Interval_Short_Y": "dd MMM y – dd MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/ja.json b/plugins/Intl/lang/ja.json index 9e6c21068e..9007463ce2 100644 --- a/plugins/Intl/lang/ja.json +++ b/plugins/Intl/lang/ja.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "M月d日(E)", "Format_Date_Long": "y年M月d日EEEE", "Format_Date_Short": "y\/MM\/dd", - "Format_Interval_Week_Long_D": "y年M月d日~d日", - "Format_Interval_Week_Long_M": "y年M月d日~M月d日", - "Format_Interval_Week_Long_Y": "y年M月d日~y年M月d日", - "Format_Interval_Week_Short_D": "y年M月d日~d日", - "Format_Interval_Week_Short_M": "y年M月d日~M月d日", - "Format_Interval_Week_Short_Y": "y年M月d日~y年M月d日", + "Format_Interval_Long_D": "y年M月d日~d日", + "Format_Interval_Long_M": "y年M月d日~M月d日", + "Format_Interval_Long_Y": "y年M月d日~y年M月d日", + "Format_Interval_Short_D": "y年M月d日~d日", + "Format_Interval_Short_M": "y年M月d日~M月d日", + "Format_Interval_Short_Y": "y年M月d日~y年M月d日", "Format_Month_Long": "y年M月", "Format_Month_Short": "y年M月", "Format_Time": "H:mm:ss", diff --git a/plugins/Intl/lang/ka.json b/plugins/Intl/lang/ka.json index 2f77fe689b..7c6e7406e4 100644 --- a/plugins/Intl/lang/ka.json +++ b/plugins/Intl/lang/ka.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, dd MMMM, y", "Format_Date_Short": "d MMM, y", - "Format_Interval_Week_Long_D": "d–d MMMM, y", - "Format_Interval_Week_Long_M": "dd MM – dd MM, y", - "Format_Interval_Week_Long_Y": "dd MMMM, y – d MMMM, y", - "Format_Interval_Week_Short_D": "d–d MMM, y", - "Format_Interval_Week_Short_M": "dd MM – dd MM, y", - "Format_Interval_Week_Short_Y": "dd MMM, y – d MMM, y", + "Format_Interval_Long_D": "d–d MMMM, y", + "Format_Interval_Long_M": "dd MM – dd MM, y", + "Format_Interval_Long_Y": "dd MMMM, y – d MMMM, y", + "Format_Interval_Short_D": "d–d MMM, y", + "Format_Interval_Short_M": "dd MM – dd MM, y", + "Format_Interval_Short_Y": "dd MMM, y – d MMM, y", "Format_Month_Long": "MMMM, y", "Format_Month_Short": "MMM, y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/ko.json b/plugins/Intl/lang/ko.json index f2a4b53e99..e59b06b83b 100644 --- a/plugins/Intl/lang/ko.json +++ b/plugins/Intl/lang/ko.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "MMM d일 (E)", "Format_Date_Long": "y년 M월 d일 EEEE", "Format_Date_Short": "y. M. d.", - "Format_Interval_Week_Long_D": "y년 M월 d일~d일", - "Format_Interval_Week_Long_M": "y년 M월 d일 ~ M월 d일", - "Format_Interval_Week_Long_Y": "y년 M월 d일 ~ y년 M월 d일", - "Format_Interval_Week_Short_D": "y년 M월 d일~d일", - "Format_Interval_Week_Short_M": "y년 M월 d일 ~ M월 d일", - "Format_Interval_Week_Short_Y": "y년 M월 d일 ~ y년 M월 d일", + "Format_Interval_Long_D": "y년 M월 d일~d일", + "Format_Interval_Long_M": "y년 M월 d일 ~ M월 d일", + "Format_Interval_Long_Y": "y년 M월 d일 ~ y년 M월 d일", + "Format_Interval_Short_D": "y년 M월 d일~d일", + "Format_Interval_Short_M": "y년 M월 d일 ~ M월 d일", + "Format_Interval_Short_Y": "y년 M월 d일 ~ y년 M월 d일", "Format_Month_Long": "y년 MMMM", "Format_Month_Short": "y년 MMM", "Format_Time": "a h:mm:ss", diff --git a/plugins/Intl/lang/lt.json b/plugins/Intl/lang/lt.json index 99a414eed7..f41cb594c2 100644 --- a/plugins/Intl/lang/lt.json +++ b/plugins/Intl/lang/lt.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "MM-dd, E", "Format_Date_Long": "y 'm'. MMMM d 'd'., EEEE", "Format_Date_Short": "y-MM-dd", - "Format_Interval_Week_Long_D": "y MMMM d–d", - "Format_Interval_Week_Long_M": "y MMMM d – MMMM d", - "Format_Interval_Week_Long_Y": "y MMMM d – y MMMM d", - "Format_Interval_Week_Short_D": "y-MM-dd – y-MM-dd", - "Format_Interval_Week_Short_M": "y-MM-dd – y-MM-dd", - "Format_Interval_Week_Short_Y": "y-MM-dd – y-MM-dd", + "Format_Interval_Long_D": "y MMMM d–d", + "Format_Interval_Long_M": "y MMMM d – MMMM d", + "Format_Interval_Long_Y": "y MMMM d – y MMMM d", + "Format_Interval_Short_D": "y-MM-dd – y-MM-dd", + "Format_Interval_Short_M": "y-MM-dd – y-MM-dd", + "Format_Interval_Short_Y": "y-MM-dd – y-MM-dd", "Format_Month_Long": "y LLLL", "Format_Month_Short": "y-MM", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/lv.json b/plugins/Intl/lang/lv.json index 2105a20ad7..99c485e289 100644 --- a/plugins/Intl/lang/lv.json +++ b/plugins/Intl/lang/lv.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, y. 'gada' d. MMMM", "Format_Date_Short": "y. 'gada' d. MMM", - "Format_Interval_Week_Long_D": "y. 'gada' d.–d. MMMM", - "Format_Interval_Week_Long_M": "y. 'gada' d. MMMM – d. MMMM", - "Format_Interval_Week_Long_Y": "y. 'gada' d. MMMM – y. 'gada' d. MMMM", - "Format_Interval_Week_Short_D": "y. 'gada' d.–d. MMM", - "Format_Interval_Week_Short_M": "y. 'gada' d. MMM – d. MMM", - "Format_Interval_Week_Short_Y": "y. 'gada' d. MMM – y. 'gada' d. MMM", + "Format_Interval_Long_D": "y. 'gada' d.–d. MMMM", + "Format_Interval_Long_M": "y. 'gada' d. MMMM – d. MMMM", + "Format_Interval_Long_Y": "y. 'gada' d. MMMM – y. 'gada' d. MMMM", + "Format_Interval_Short_D": "y. 'gada' d.–d. MMM", + "Format_Interval_Short_M": "y. 'gada' d. MMM – d. MMM", + "Format_Interval_Short_Y": "y. 'gada' d. MMM – y. 'gada' d. MMM", "Format_Month_Long": "y. 'g'. MMMM", "Format_Month_Short": "y. 'g'. MMM", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/nb.json b/plugins/Intl/lang/nb.json index 1f83e92309..21d1a4ba6c 100644 --- a/plugins/Intl/lang/nb.json +++ b/plugins/Intl/lang/nb.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Interval_Week_Long_D": "d.–d. MMMM y", - "Format_Interval_Week_Long_M": "d. MMMM–d. MMMM y", - "Format_Interval_Week_Long_Y": "d. MMMM y–d. MMMM y", - "Format_Interval_Week_Short_D": "d.–d. MMM y", - "Format_Interval_Week_Short_M": "d. MMM–d. MMM y", - "Format_Interval_Week_Short_Y": "d. MMM y–d. MMM y", + "Format_Interval_Long_D": "d.–d. MMMM y", + "Format_Interval_Long_M": "d. MMMM–d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y–d. MMMM y", + "Format_Interval_Short_D": "d.–d. MMM y", + "Format_Interval_Short_M": "d. MMM–d. MMM y", + "Format_Interval_Short_Y": "d. MMM y–d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH.mm.ss", diff --git a/plugins/Intl/lang/nl.json b/plugins/Intl/lang/nl.json index 8e51adccbd..e3f6c279a9 100644 --- a/plugins/Intl/lang/nl.json +++ b/plugins/Intl/lang/nl.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d–d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/nn.json b/plugins/Intl/lang/nn.json index 81e8cd7d72..860fdaf1d7 100644 --- a/plugins/Intl/lang/nn.json +++ b/plugins/Intl/lang/nn.json @@ -301,12 +301,12 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Interval_Week_Long_D": "d.–d. MMMM y", - "Format_Interval_Week_Long_M": "d. MMMM–d. MMMM y", - "Format_Interval_Week_Long_Y": "d. MMMM y–d. MMMM y", - "Format_Interval_Week_Short_D": "d.–d. MMM y", - "Format_Interval_Week_Short_M": "d. MMM–d. MMM y", - "Format_Interval_Week_Short_Y": "d. MMM y–d. MMM y", + "Format_Interval_Long_D": "d.–d. MMMM y", + "Format_Interval_Long_M": "d. MMMM–d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y–d. MMMM y", + "Format_Interval_Short_D": "d.–d. MMM y", + "Format_Interval_Short_M": "d. MMM–d. MMM y", + "Format_Interval_Short_Y": "d. MMM y–d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/pl.json b/plugins/Intl/lang/pl.json index 1728b002e7..f3b23056a5 100644 --- a/plugins/Intl/lang/pl.json +++ b/plugins/Intl/lang/pl.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d.MM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "dd.MM.y", - "Format_Interval_Week_Long_D": "d–d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Week_Short_D": "dd–dd.MM.y", - "Format_Interval_Week_Short_M": "dd.MM–dd.MM.y", - "Format_Interval_Week_Short_Y": "dd.MM.y–dd.MM.y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "dd–dd.MM.y", + "Format_Interval_Short_M": "dd.MM–dd.MM.y", + "Format_Interval_Short_Y": "dd.MM.y–dd.MM.y", "Format_Month_Long": "LLLL y", "Format_Month_Short": "MM.y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/pt-br.json b/plugins/Intl/lang/pt-br.json index f55b25c397..500ac319c5 100644 --- a/plugins/Intl/lang/pt-br.json +++ b/plugins/Intl/lang/pt-br.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d 'de' MMM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "d 'de' MMM 'de' y", - "Format_Interval_Week_Long_D": "d – d 'de' MMMM 'de' y", - "Format_Interval_Week_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", - "Format_Interval_Week_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", - "Format_Interval_Week_Short_D": "d – d 'de' MMM 'de' y", - "Format_Interval_Week_Short_M": "d 'de' MMM – d 'de' MMM 'de' y", - "Format_Interval_Week_Short_Y": "d 'de' MMM 'de' y – d 'de' MMM 'de' y", + "Format_Interval_Long_D": "d – d 'de' MMMM 'de' y", + "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", + "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", + "Format_Interval_Short_D": "d – d 'de' MMM 'de' y", + "Format_Interval_Short_M": "d 'de' MMM – d 'de' MMM 'de' y", + "Format_Interval_Short_Y": "d 'de' MMM 'de' y – d 'de' MMM 'de' y", "Format_Month_Long": "MMMM 'de' y", "Format_Month_Short": "MMM 'de' y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/pt.json b/plugins/Intl/lang/pt.json index 1fb3d121a2..5dbf6f299a 100644 --- a/plugins/Intl/lang/pt.json +++ b/plugins/Intl/lang/pt.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d\/MM", "Format_Date_Long": "EEEE, d 'de' MMMM 'de' y", "Format_Date_Short": "dd\/MM\/y", - "Format_Interval_Week_Long_D": "d–d 'de' MMMM 'de' y", - "Format_Interval_Week_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", - "Format_Interval_Week_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", - "Format_Interval_Week_Short_D": "d–d 'de' MMM 'de' y", - "Format_Interval_Week_Short_M": "d 'de' MMM – d 'de' MMM 'de' y", - "Format_Interval_Week_Short_Y": "d 'de' MMM 'de' y – d 'de' MMM 'de' y", + "Format_Interval_Long_D": "d–d 'de' MMMM 'de' y", + "Format_Interval_Long_M": "d 'de' MMMM – d 'de' MMMM 'de' y", + "Format_Interval_Long_Y": "d 'de' MMMM 'de' y – d 'de' MMMM 'de' y", + "Format_Interval_Short_D": "d–d 'de' MMM 'de' y", + "Format_Interval_Short_M": "d 'de' MMM – d 'de' MMM 'de' y", + "Format_Interval_Short_Y": "d 'de' MMM 'de' y – d 'de' MMM 'de' y", "Format_Month_Long": "MMMM 'de' y", "Format_Month_Short": "MM\/y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/ro.json b/plugins/Intl/lang/ro.json index e67b65a629..bb805dd656 100644 --- a/plugins/Intl/lang/ro.json +++ b/plugins/Intl/lang/ro.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d–d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/ru.json b/plugins/Intl/lang/ru.json index 87d6551c98..d6247dba37 100644 --- a/plugins/Intl/lang/ru.json +++ b/plugins/Intl/lang/ru.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "ccc, d MMM", "Format_Date_Long": "EEEE, d MMMM y 'г'.", "Format_Date_Short": "d MMM y 'г'.", - "Format_Interval_Week_Long_D": "d–d MMMM y 'г'.", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y 'г'.", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y 'г'.", - "Format_Interval_Week_Short_D": "d–d MMM y 'г'.", - "Format_Interval_Week_Short_M": "d MMM – d MMM y 'г'.", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y 'г'.", + "Format_Interval_Long_D": "d–d MMMM y 'г'.", + "Format_Interval_Long_M": "d MMMM – d MMMM y 'г'.", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y 'г'.", + "Format_Interval_Short_D": "d–d MMM y 'г'.", + "Format_Interval_Short_M": "d MMM – d MMM y 'г'.", + "Format_Interval_Short_Y": "d MMM y – d MMM y 'г'.", "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLL y", "Format_Time": "H:mm:ss", diff --git a/plugins/Intl/lang/sk.json b/plugins/Intl/lang/sk.json index 07272e72b8..7d8482f6fe 100644 --- a/plugins/Intl/lang/sk.json +++ b/plugins/Intl/lang/sk.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d. M.", "Format_Date_Long": "EEEE, d. MMMM y", "Format_Date_Short": "d. M. y", - "Format_Interval_Week_Long_D": "d. – d. MMMM y", - "Format_Interval_Week_Long_M": "y MMMM d – MMMM d", - "Format_Interval_Week_Long_Y": "d. MMMM y – d. MMMM y", - "Format_Interval_Week_Short_D": "d. – d. MMM y", - "Format_Interval_Week_Short_M": "y MMM d – MMM d", - "Format_Interval_Week_Short_Y": "d. MMM y – d. MMM y", + "Format_Interval_Long_D": "d. – d. MMMM y", + "Format_Interval_Long_M": "y MMMM d – MMMM d", + "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Short_D": "d. – d. MMM y", + "Format_Interval_Short_M": "y MMM d – MMM d", + "Format_Interval_Short_Y": "d. MMM y – d. MMM y", "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLLL y", "Format_Time": "H:mm:ss", diff --git a/plugins/Intl/lang/sl.json b/plugins/Intl/lang/sl.json index c169e54b78..8b418062b6 100644 --- a/plugins/Intl/lang/sl.json +++ b/plugins/Intl/lang/sl.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d. MMM", "Format_Date_Long": "EEEE, dd. MMMM y", "Format_Date_Short": "d. MMM y", - "Format_Interval_Week_Long_D": "d.–d. MMMM y", - "Format_Interval_Week_Long_M": "d. MMMM – d. MMMM y", - "Format_Interval_Week_Long_Y": "d. MMMM y – d. MMMM y", - "Format_Interval_Week_Short_D": "d.–d. MMM y", - "Format_Interval_Week_Short_M": "d. MMM – d. MMM y", - "Format_Interval_Week_Short_Y": "d. MMM y – d. MMM y", + "Format_Interval_Long_D": "d.–d. MMMM y", + "Format_Interval_Long_M": "d. MMMM – d. MMMM y", + "Format_Interval_Long_Y": "d. MMMM y – d. MMMM y", + "Format_Interval_Short_D": "d.–d. MMM y", + "Format_Interval_Short_M": "d. MMM – d. MMM y", + "Format_Interval_Short_Y": "d. MMM y – d. MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/sq.json b/plugins/Intl/lang/sq.json index 000b930b77..80de7ed92a 100644 --- a/plugins/Intl/lang/sq.json +++ b/plugins/Intl/lang/sq.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d – d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Week_Short_D": "d – d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d – d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d – d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/sr.json b/plugins/Intl/lang/sr.json index 30edd515a5..ee7ccab1c6 100644 --- a/plugins/Intl/lang/sr.json +++ b/plugins/Intl/lang/sr.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d. MMM", "Format_Date_Long": "EEEE, dd. MMMM y.", "Format_Date_Short": "dd.MM.y.", - "Format_Interval_Week_Long_D": "dd.–dd. MMMM y.", - "Format_Interval_Week_Long_M": "dd. MMMM – dd. MMMM y.", - "Format_Interval_Week_Long_Y": "dd. MMMM y. – dd. MMMM y.", - "Format_Interval_Week_Short_D": "dd.–dd. MMM y.", - "Format_Interval_Week_Short_M": "dd. MMM – dd. MMM y.", - "Format_Interval_Week_Short_Y": "dd. MMM y. – dd. MMM y.", + "Format_Interval_Long_D": "dd.–dd. MMMM y.", + "Format_Interval_Long_M": "dd. MMMM – dd. MMMM y.", + "Format_Interval_Long_Y": "dd. MMMM y. – dd. MMMM y.", + "Format_Interval_Short_D": "dd.–dd. MMM y.", + "Format_Interval_Short_M": "dd. MMM – dd. MMM y.", + "Format_Interval_Short_Y": "dd. MMM y. – dd. MMM y.", "Format_Month_Long": "MMMM y.", "Format_Month_Short": "MMM y.", "Format_Time": "HH.mm.ss", diff --git a/plugins/Intl/lang/sv.json b/plugins/Intl/lang/sv.json index 3c70857be2..3935572363 100644 --- a/plugins/Intl/lang/sv.json +++ b/plugins/Intl/lang/sv.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEE d MMMM y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d–d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM–d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y–d MMMM y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM–d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y–d MMM y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM–d MMMM y", + "Format_Interval_Long_Y": "d MMMM y–d MMMM y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM–d MMM y", + "Format_Interval_Short_Y": "d MMM y–d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/ta.json b/plugins/Intl/lang/ta.json index edab5558f4..5db28a36aa 100644 --- a/plugins/Intl/lang/ta.json +++ b/plugins/Intl/lang/ta.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "MMM d, E", "Format_Date_Long": "EEEE, d MMMM, y", "Format_Date_Short": "d MMM, y", - "Format_Interval_Week_Long_D": "d – d MMMM, y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM, y", - "Format_Interval_Week_Long_Y": "d MMMM, y – d MMMM, y", - "Format_Interval_Week_Short_D": "d – d MMM, y", - "Format_Interval_Week_Short_M": "d MMM – d MMM, y", - "Format_Interval_Week_Short_Y": "d MMM, y – d MMM, y", + "Format_Interval_Long_D": "d – d MMMM, y", + "Format_Interval_Long_M": "d MMMM – d MMMM, y", + "Format_Interval_Long_Y": "d MMMM, y – d MMMM, y", + "Format_Interval_Short_D": "d – d MMM, y", + "Format_Interval_Short_M": "d MMM – d MMM, y", + "Format_Interval_Short_Y": "d MMM, y – d MMM, y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "h:mm:ss a", diff --git a/plugins/Intl/lang/te.json b/plugins/Intl/lang/te.json index fdc69e1e73..8b8a14f24b 100644 --- a/plugins/Intl/lang/te.json +++ b/plugins/Intl/lang/te.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "d, MMMM y, EEEE", "Format_Date_Short": "d MMM, y", - "Format_Interval_Week_Long_D": "d–d MMMM, y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM, y", - "Format_Interval_Week_Long_Y": "d MMMM, y – d MMMM, y", - "Format_Interval_Week_Short_D": "d–d MMM, y", - "Format_Interval_Week_Short_M": "d MMM – d MMM, y", - "Format_Interval_Week_Short_Y": "d MMM, y – d MMM, y", + "Format_Interval_Long_D": "d–d MMMM, y", + "Format_Interval_Long_M": "d MMMM – d MMMM, y", + "Format_Interval_Long_Y": "d MMMM, y – d MMMM, y", + "Format_Interval_Short_D": "d–d MMM, y", + "Format_Interval_Short_M": "d MMM – d MMM, y", + "Format_Interval_Short_Y": "d MMM, y – d MMM, y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "h:mm:ss a", diff --git a/plugins/Intl/lang/th.json b/plugins/Intl/lang/th.json index e76275f199..085880e0d3 100644 --- a/plugins/Intl/lang/th.json +++ b/plugins/Intl/lang/th.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E d MMM", "Format_Date_Long": "EEEEที่ d MMMM G y", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d–d MMMM G y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM G y", - "Format_Interval_Week_Long_Y": "d MMMM G y – d MMMM y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d–d MMMM G y", + "Format_Interval_Long_M": "d MMMM – d MMMM G y", + "Format_Interval_Long_Y": "d MMMM G y – d MMMM y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM G y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/tl.json b/plugins/Intl/lang/tl.json index 00b7b60b80..8a16e10885 100644 --- a/plugins/Intl/lang/tl.json +++ b/plugins/Intl/lang/tl.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, MMM d", "Format_Date_Long": "EEEE, MMMM d, y", "Format_Date_Short": "MMM d, y", - "Format_Interval_Week_Long_D": "MMMM d–d, y", - "Format_Interval_Week_Long_M": "MMMM d – MMMM d, y", - "Format_Interval_Week_Long_Y": "MMMM d, y – MMMM d, y", - "Format_Interval_Week_Short_D": "MMM d–d, y", - "Format_Interval_Week_Short_M": "MMM d – MMM d, y", - "Format_Interval_Week_Short_Y": "MMM d, y – MMM d, y", + "Format_Interval_Long_D": "MMMM d–d, y", + "Format_Interval_Long_M": "MMMM d – MMMM d, y", + "Format_Interval_Long_Y": "MMMM d, y – MMMM d, y", + "Format_Interval_Short_D": "MMM d–d, y", + "Format_Interval_Short_M": "MMM d – MMM d, y", + "Format_Interval_Short_Y": "MMM d, y – MMM d, y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "h:mm:ss a", diff --git a/plugins/Intl/lang/tr.json b/plugins/Intl/lang/tr.json index 803cd1dd66..b4f8db1189 100644 --- a/plugins/Intl/lang/tr.json +++ b/plugins/Intl/lang/tr.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "d MMMM E", "Format_Date_Long": "d MMMM y EEEE", "Format_Date_Short": "d MMM y", - "Format_Interval_Week_Long_D": "d–d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "MMMM y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/uk.json b/plugins/Intl/lang/uk.json index e6b1572989..3b677b7ee9 100644 --- a/plugins/Intl/lang/uk.json +++ b/plugins/Intl/lang/uk.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, d MMM", "Format_Date_Long": "EEEE, d MMMM y 'р'.", "Format_Date_Short": "d MMM y 'р'.", - "Format_Interval_Week_Long_D": "d–d MMMM y", - "Format_Interval_Week_Long_M": "d MMMM – d MMMM y", - "Format_Interval_Week_Long_Y": "d MMMM y – d MMMM y", - "Format_Interval_Week_Short_D": "d–d MMM y", - "Format_Interval_Week_Short_M": "d MMM – d MMM y", - "Format_Interval_Week_Short_Y": "d MMM y – d MMM y", + "Format_Interval_Long_D": "d–d MMMM y", + "Format_Interval_Long_M": "d MMMM – d MMMM y", + "Format_Interval_Long_Y": "d MMMM y – d MMMM y", + "Format_Interval_Short_D": "d–d MMM y", + "Format_Interval_Short_M": "d MMM – d MMM y", + "Format_Interval_Short_Y": "d MMM y – d MMM y", "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLL y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/vi.json b/plugins/Intl/lang/vi.json index 415d6b33d1..4d00266994 100644 --- a/plugins/Intl/lang/vi.json +++ b/plugins/Intl/lang/vi.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "E, dd MMM", "Format_Date_Long": "EEEE, 'ngày' dd MMMM 'năm' y", "Format_Date_Short": "dd-MM-y", - "Format_Interval_Week_Long_D": "'Ngày' dd - 'Ngày' dd 'tháng' M 'năm' y", - "Format_Interval_Week_Long_M": "'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M 'năm' y", - "Format_Interval_Week_Long_Y": "'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y", - "Format_Interval_Week_Short_D": "'Ngày' dd - 'Ngày' dd 'tháng' M 'năm' y", - "Format_Interval_Week_Short_M": "'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M 'năm' y", - "Format_Interval_Week_Short_Y": "'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y", + "Format_Interval_Long_D": "'Ngày' dd - 'Ngày' dd 'tháng' M 'năm' y", + "Format_Interval_Long_M": "'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M 'năm' y", + "Format_Interval_Long_Y": "'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y", + "Format_Interval_Short_D": "'Ngày' dd - 'Ngày' dd 'tháng' M 'năm' y", + "Format_Interval_Short_M": "'Ngày' dd 'tháng' M - 'Ngày' dd 'tháng' M 'năm' y", + "Format_Interval_Short_Y": "'Ngày' dd 'tháng' M 'năm' y - 'Ngày' dd 'tháng' M 'năm' y", "Format_Month_Long": "MMMM 'năm' y", "Format_Month_Short": "MMM y", "Format_Time": "HH:mm:ss", diff --git a/plugins/Intl/lang/zh-cn.json b/plugins/Intl/lang/zh-cn.json index b52b63a9ae..c0907c8b49 100644 --- a/plugins/Intl/lang/zh-cn.json +++ b/plugins/Intl/lang/zh-cn.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "M月d日E", "Format_Date_Long": "y年M月d日EEEE", "Format_Date_Short": "y年M月d日", - "Format_Interval_Week_Long_D": "y年M月d日至d日", - "Format_Interval_Week_Long_M": "y年M月d日至M月d日", - "Format_Interval_Week_Long_Y": "y年M月d日至y年M月d日", - "Format_Interval_Week_Short_D": "y年M月d日至d日", - "Format_Interval_Week_Short_M": "y年M月d日至M月d日", - "Format_Interval_Week_Short_Y": "y年M月d日至y年M月d日", + "Format_Interval_Long_D": "y年M月d日至d日", + "Format_Interval_Long_M": "y年M月d日至M月d日", + "Format_Interval_Long_Y": "y年M月d日至y年M月d日", + "Format_Interval_Short_D": "y年M月d日至d日", + "Format_Interval_Short_M": "y年M月d日至M月d日", + "Format_Interval_Short_Y": "y年M月d日至y年M月d日", "Format_Month_Long": "y年M月", "Format_Month_Short": "y年M月", "Format_Time": "ah:mm:ss", diff --git a/plugins/Intl/lang/zh-tw.json b/plugins/Intl/lang/zh-tw.json index 396b8530bd..0200a46ad1 100644 --- a/plugins/Intl/lang/zh-tw.json +++ b/plugins/Intl/lang/zh-tw.json @@ -305,12 +305,12 @@ "Format_Date_Day_Month": "M月d日 E", "Format_Date_Long": "y年M月d日 EEEE", "Format_Date_Short": "y年M月d日", - "Format_Interval_Week_Long_D": "y年M月d日至d日", - "Format_Interval_Week_Long_M": "y年M月d日至M月d日", - "Format_Interval_Week_Long_Y": "y年M月d日至y年M月d日", - "Format_Interval_Week_Short_D": "y年M月d日至d日", - "Format_Interval_Week_Short_M": "y年M月d日至M月d日", - "Format_Interval_Week_Short_Y": "y年M月d日至y年M月d日", + "Format_Interval_Long_D": "y年M月d日至d日", + "Format_Interval_Long_M": "y年M月d日至M月d日", + "Format_Interval_Long_Y": "y年M月d日至y年M月d日", + "Format_Interval_Short_D": "y年M月d日至d日", + "Format_Interval_Short_M": "y年M月d日至M月d日", + "Format_Interval_Short_Y": "y年M月d日至y年M月d日", "Format_Month_Long": "y年M月", "Format_Month_Short": "y年M月", "Format_Time": "ah:mm:ss", diff --git a/tests/PHPUnit/Unit/Period/DayTest.php b/tests/PHPUnit/Unit/Period/DayTest.php index 7b1c4a6422..acc4992b1d 100644 --- a/tests/PHPUnit/Unit/Period/DayTest.php +++ b/tests/PHPUnit/Unit/Period/DayTest.php @@ -8,6 +8,7 @@ namespace Piwik\Tests\Unit\Period; +use Piwik\Container\StaticContainer; use Piwik\Date; use Piwik\Period\Day; @@ -211,23 +212,45 @@ class DayTest extends BasePeriodTest $this->fail('Exception not raised'); } + public function getLocalizedShortStrings() + { + return array( + array('en', 'Wed, Oct 9'), + array('lt', '10-09, Tr'), + array('zh-cn', '10月9日周三'), + ); + } + /** * @group Core + * @dataProvider getLocalizedShortStrings */ - public function testGetLocalizedShortString() + public function testGetLocalizedShortString($language, $shouldBe) { + StaticContainer::get('Piwik\Translation\Translator')->setCurrentLanguage($language); + $month = new Day(Date::factory('2024-10-09')); - $shouldBe = 'Wed 9 Oct'; $this->assertEquals($shouldBe, $month->getLocalizedShortString()); } + public function getLocalizedLongStrings() + { + return array( + array('en', 'Wednesday, October 9, 2024'), + array('lt', '2024 m. Spalio 9 d., Trečiadienis'), + array('zh-cn', '2024年10月9日星期三'), + ); + } + /** * @group Core + * @dataProvider getLocalizedLongStrings */ - public function testGetLocalizedLongString() + public function testGetLocalizedLongString($language, $shouldBe) { + StaticContainer::get('Piwik\Translation\Translator')->setCurrentLanguage($language); + $month = new Day(Date::factory('2024-10-09')); - $shouldBe = 'Wednesday 9 October 2024'; $this->assertEquals($shouldBe, $month->getLocalizedLongString()); } diff --git a/tests/PHPUnit/Unit/Period/MonthTest.php b/tests/PHPUnit/Unit/Period/MonthTest.php index 6791cea6e6..2779a2e582 100644 --- a/tests/PHPUnit/Unit/Period/MonthTest.php +++ b/tests/PHPUnit/Unit/Period/MonthTest.php @@ -8,6 +8,7 @@ namespace Piwik\Tests\Unit\Period; +use Piwik\Container\StaticContainer; use Piwik\Date; use Piwik\Period\Month; @@ -307,17 +308,47 @@ class MonthTest extends BasePeriodTest $this->assertEquals(7, $month->getNumberOfSubperiods()); } - public function testGetLocalizedShortString() + public function getLocalizedShortStrings() { + return array( + array('en', 'Oct 2024'), + array('lt', '2024-10'), + array('zh-cn', '2024年10月'), + ); + } + + /** + * @group Core + * @group Month + * @dataProvider getLocalizedShortStrings + */ + public function testGetLocalizedShortString($language, $shouldBe) + { + StaticContainer::get('Piwik\Translation\Translator')->setCurrentLanguage($language); + $month = new Month(Date::factory('2024-10-09')); - $shouldBe = 'Oct 2024'; $this->assertEquals($shouldBe, $month->getLocalizedShortString()); } - public function testGetLocalizedLongString() + public function getLocalizedLongStrings() { + return array( + array('en', 'October 2024'), + array('lt', '2024 Spalis'), + array('zh-cn', '2024年10月'), + ); + } + + /** + * @group Core + * @group Month + * @dataProvider getLocalizedLongStrings + */ + public function testGetLocalizedLongString($language, $shouldBe) + { + StaticContainer::get('Piwik\Translation\Translator')->setCurrentLanguage($language); + $month = new Month(Date::factory('2024-10-09')); - $shouldBe = '2024, October'; $this->assertEquals($shouldBe, $month->getLocalizedLongString()); } diff --git a/tests/PHPUnit/Unit/Period/RangeTest.php b/tests/PHPUnit/Unit/Period/RangeTest.php index 24dce9e08c..115a45fd8b 100644 --- a/tests/PHPUnit/Unit/Period/RangeTest.php +++ b/tests/PHPUnit/Unit/Period/RangeTest.php @@ -1198,14 +1198,14 @@ class RangeTest extends BasePeriodTest public function testGetLocalizedShortString() { $month = new Range('range', '2000-12-09,2001-02-01'); - $shouldBe = '9 Dec 00 - 1 Feb 01'; + $shouldBe = 'Dec 9, 2000 – Feb 1, 2001'; $this->assertEquals($shouldBe, $month->getLocalizedShortString()); } public function testGetLocalizedLongString() { $month = new Range('range', '2023-05-09,2023-05-21'); - $shouldBe = '8 May 23 - 21 May 23'; + $shouldBe = 'May 8 – 21, 2023'; $this->assertEquals($shouldBe, $month->getLocalizedLongString()); } diff --git a/tests/PHPUnit/Unit/Period/WeekTest.php b/tests/PHPUnit/Unit/Period/WeekTest.php index bbf0a8935e..4adf7666a2 100644 --- a/tests/PHPUnit/Unit/Period/WeekTest.php +++ b/tests/PHPUnit/Unit/Period/WeekTest.php @@ -129,7 +129,6 @@ class WeekTest extends BasePeriodTest /** * @group Core - * @group Week * @dataProvider getLocalizedShortStrings */ public function testGetLocalizedShortString($language, $shouldBe) @@ -159,7 +158,6 @@ class WeekTest extends BasePeriodTest /** * @group Core - * @group Week * @dataProvider getLocalizedLongStrings */ public function testGetLocalizedLongString($language, $shouldBe) diff --git a/tests/PHPUnit/Unit/Period/YearTest.php b/tests/PHPUnit/Unit/Period/YearTest.php index 13d688bda9..b0d089ca71 100644 --- a/tests/PHPUnit/Unit/Period/YearTest.php +++ b/tests/PHPUnit/Unit/Period/YearTest.php @@ -8,6 +8,7 @@ namespace Piwik\Tests\Unit\Period; +use Piwik\Container\StaticContainer; use Piwik\Date; use Piwik\Period\Year; @@ -64,23 +65,48 @@ class YearTest extends BasePeriodTest $this->assertEquals($correct, $year->toString()); } + public function getLocalizedShortStrings() + { + return array( + array('en', '2024'), + array('ko', '2024년'), + array('zh-cn', '2024年'), + ); + } + /** * @group Core + * @group Year + * @dataProvider getLocalizedShortStrings */ - public function testGetLocalizedShortString() + public function testGetLocalizedShortString($language, $shouldBe) { + StaticContainer::get('Piwik\Translation\Translator')->setCurrentLanguage($language); + $year = new Year(Date::factory('2024-10-09')); - $shouldBe = '2024'; $this->assertEquals($shouldBe, $year->getLocalizedShortString()); } + public function getLocalizedLongStrings() + { + return array( + array('en', '2024'), + array('ko', '2024년'), + array('zh-cn', '2024年'), + ); + } + /** * @group Core + * @group Year + * @dataProvider getLocalizedLongStrings */ - public function testGetLocalizedLongString() + + public function testGetLocalizedLongString($language, $shouldBe) { + StaticContainer::get('Piwik\Translation\Translator')->setCurrentLanguage($language); + $year = new Year(Date::factory('2024-10-09')); - $shouldBe = '2024'; $this->assertEquals($shouldBe, $year->getLocalizedLongString()); } |