diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-15 17:12:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-15 17:12:17 +0300 |
| commit | 65f11eb4481a490543a80b197839b343d1ac8196 (patch) | |
| tree | 2bdc9b8566f5c54fadc66b3812c51f554cef02e7 /core/Date.php | |
| parent | d868c5c76d707e5e41666421ed27418c397806ef (diff) | |
[automatic Intl data updates from CLDR 40.0.0] (#18943)
* Updates Intl data from CLDR 40.0.0
* fix tests
* Handle date formats b and B as a
Co-authored-by: sgiehl <sgiehl@users.noreply.github.com>
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'core/Date.php')
| -rw-r--r-- | core/Date.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/core/Date.php b/core/Date.php index a214751b8e..6c5b4d7854 100644 --- a/core/Date.php +++ b/core/Date.php @@ -889,6 +889,10 @@ class Date case "ss": case "s": return $this->toString('s'); + // would normally also include AM, PM, Noon and Midnight + case "b": + // would normally be a textual presentation like "in the afternoon" + case "B": // am / pm case "a": return $this->toString('a') == 'am' ? $translator->translate('Intl_Time_AM') : $translator->translate('Intl_Time_PM'); @@ -911,7 +915,7 @@ class Date } protected static $tokens = array( - 'G', 'y', 'M', 'L', 'd', 'h', 'H', 'k', 'K', 'm', 's', 'E', 'c', 'e', 'D', 'F', 'w', 'W', 'a', 'z', 'Z', 'v', + 'G', 'y', 'M', 'L', 'd', 'h', 'H', 'k', 'K', 'm', 's', 'E', 'c', 'e', 'D', 'F', 'w', 'W', 'a', 'b', 'B', 'z', 'Z', 'v', ); /** |