From c4b736ba66686ef7860bc3207c1c41cf949061b5 Mon Sep 17 00:00:00 2001 From: Peter Decuyper Date: Thu, 28 Feb 2019 13:54:16 +0100 Subject: [PATCH 1/2] OPEN-246: Added missing day of the month postfix for german date notation. --- resources/lang/de/openinghourApi.php | 2 ++ resources/lang/en/openinghourApi.php | 2 ++ resources/lang/es/openinghourApi.php | 2 ++ resources/lang/fr/openinghourApi.php | 2 ++ resources/lang/nl/openinghourApi.php | 2 ++ resources/views/api/openinghours/day_info.blade.php | 2 +- 6 files changed, 11 insertions(+), 1 deletion(-) diff --git a/resources/lang/de/openinghourApi.php b/resources/lang/de/openinghourApi.php index 80854517..cc022b15 100644 --- a/resources/lang/de/openinghourApi.php +++ b/resources/lang/de/openinghourApi.php @@ -23,6 +23,8 @@ 'LONG_HOUR' => '', 'HH:MM' => ':HH::MM', + 'DAY_OF_MONTH_POSTFIX' => '.', + 'day_0' => 'Sonntag', 'day_1' => 'Montag', 'day_2' => 'Dienstag', diff --git a/resources/lang/en/openinghourApi.php b/resources/lang/en/openinghourApi.php index ed821c45..ad6a3c7f 100644 --- a/resources/lang/en/openinghourApi.php +++ b/resources/lang/en/openinghourApi.php @@ -23,6 +23,8 @@ 'LONG_HOUR' => '', 'HH:MM' => ':HH::MM', + 'DAY_OF_MONTH_POSTFIX' => '', + 'day_0' => 'Sunday', 'day_1' => 'Monday', 'day_2' => 'Tuesday', diff --git a/resources/lang/es/openinghourApi.php b/resources/lang/es/openinghourApi.php index bdc16d15..beaead83 100644 --- a/resources/lang/es/openinghourApi.php +++ b/resources/lang/es/openinghourApi.php @@ -23,6 +23,8 @@ 'LONG_HOUR' => '', 'HH:MM' => ':HH::MM', + 'DAY_OF_THE_MONTH_POSTFIX' => '', + 'day_0' => 'Domingo', 'day_1' => 'Lunes', 'day_2' => 'Martes', diff --git a/resources/lang/fr/openinghourApi.php b/resources/lang/fr/openinghourApi.php index 3a6f1ae6..6b4d1ad4 100644 --- a/resources/lang/fr/openinghourApi.php +++ b/resources/lang/fr/openinghourApi.php @@ -23,6 +23,8 @@ 'LONG_HOUR' => '', 'HH:MM' => ':HH::MM', + 'DAY_OF_MONTH_POSTFIX' => '', + 'day_0' => 'Dimanche', 'day_1' => 'Lundi', 'day_2' => 'Mardi', diff --git a/resources/lang/nl/openinghourApi.php b/resources/lang/nl/openinghourApi.php index 4886f7b3..3f2e600e 100644 --- a/resources/lang/nl/openinghourApi.php +++ b/resources/lang/nl/openinghourApi.php @@ -23,6 +23,8 @@ 'LONG_HOUR' => 'uur', 'HH:MM' => ':HH.:MM', + 'DAY_OF_MONTH_POSTFIX' => '', + 'day_0' => 'zondag', 'day_1' => 'maandag', 'day_2' => 'dinsdag', diff --git a/resources/views/api/openinghours/day_info.blade.php b/resources/views/api/openinghours/day_info.blade.php index bda9f4d7..5598c9f2 100644 --- a/resources/views/api/openinghours/day_info.blade.php +++ b/resources/views/api/openinghours/day_info.blade.php @@ -37,7 +37,7 @@ {{ $specialDayName }}, @endif {{ $translatedDayName }} - {{ $dayOfMonth }} + {{ $dayOfMonth }}@lang('openinghourApi.DAY_OF_MONTH_POSTFIX') {{ $translatedMonthName }} @if(!$isSameYear) {{ $date->year }} From 279101e6ad657736ee686bf06fd2fa6318609a4e Mon Sep 17 00:00:00 2001 From: Peter Decuyper Date: Thu, 28 Feb 2019 14:10:45 +0100 Subject: [PATCH 2/2] OPEN-246: Changed the method to format the day of the month. --- resources/lang/de/openinghourApi.php | 2 +- resources/lang/en/openinghourApi.php | 2 +- resources/lang/es/openinghourApi.php | 2 +- resources/lang/fr/openinghourApi.php | 2 +- resources/lang/nl/openinghourApi.php | 2 +- resources/views/api/openinghours/day_info.blade.php | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/lang/de/openinghourApi.php b/resources/lang/de/openinghourApi.php index cc022b15..b0a815e2 100644 --- a/resources/lang/de/openinghourApi.php +++ b/resources/lang/de/openinghourApi.php @@ -23,7 +23,7 @@ 'LONG_HOUR' => '', 'HH:MM' => ':HH::MM', - 'DAY_OF_MONTH_POSTFIX' => '.', + 'DAY_OF_MONTH' => ':DAY.', 'day_0' => 'Sonntag', 'day_1' => 'Montag', diff --git a/resources/lang/en/openinghourApi.php b/resources/lang/en/openinghourApi.php index ad6a3c7f..57d0a216 100644 --- a/resources/lang/en/openinghourApi.php +++ b/resources/lang/en/openinghourApi.php @@ -23,7 +23,7 @@ 'LONG_HOUR' => '', 'HH:MM' => ':HH::MM', - 'DAY_OF_MONTH_POSTFIX' => '', + 'DAY_OF_MONTH' => ':DAY', 'day_0' => 'Sunday', 'day_1' => 'Monday', diff --git a/resources/lang/es/openinghourApi.php b/resources/lang/es/openinghourApi.php index beaead83..973b8314 100644 --- a/resources/lang/es/openinghourApi.php +++ b/resources/lang/es/openinghourApi.php @@ -23,7 +23,7 @@ 'LONG_HOUR' => '', 'HH:MM' => ':HH::MM', - 'DAY_OF_THE_MONTH_POSTFIX' => '', + 'DAY_OF_MONTH' => ':DAY', 'day_0' => 'Domingo', 'day_1' => 'Lunes', diff --git a/resources/lang/fr/openinghourApi.php b/resources/lang/fr/openinghourApi.php index 6b4d1ad4..b68ef1b9 100644 --- a/resources/lang/fr/openinghourApi.php +++ b/resources/lang/fr/openinghourApi.php @@ -23,7 +23,7 @@ 'LONG_HOUR' => '', 'HH:MM' => ':HH::MM', - 'DAY_OF_MONTH_POSTFIX' => '', + 'DAY_OF_MONTH' => ':DAY', 'day_0' => 'Dimanche', 'day_1' => 'Lundi', diff --git a/resources/lang/nl/openinghourApi.php b/resources/lang/nl/openinghourApi.php index 3f2e600e..8b7e24a1 100644 --- a/resources/lang/nl/openinghourApi.php +++ b/resources/lang/nl/openinghourApi.php @@ -23,7 +23,7 @@ 'LONG_HOUR' => 'uur', 'HH:MM' => ':HH.:MM', - 'DAY_OF_MONTH_POSTFIX' => '', + 'DAY_OF_MONTH' => ':DAY', 'day_0' => 'zondag', 'day_1' => 'maandag', diff --git a/resources/views/api/openinghours/day_info.blade.php b/resources/views/api/openinghours/day_info.blade.php index 5598c9f2..269c0273 100644 --- a/resources/views/api/openinghours/day_info.blade.php +++ b/resources/views/api/openinghours/day_info.blade.php @@ -37,7 +37,7 @@ {{ $specialDayName }}, @endif {{ $translatedDayName }} - {{ $dayOfMonth }}@lang('openinghourApi.DAY_OF_MONTH_POSTFIX') + @lang('openinghourApi.DAY_OF_MONTH', ['DAY' => $dayOfMonth]) {{ $translatedMonthName }} @if(!$isSameYear) {{ $date->year }} @@ -67,4 +67,4 @@ @endif - \ No newline at end of file +