diff --git a/app/Enums/DateFormat.php b/app/Enums/DateFormat.php index d628bbb0..b785964a 100644 --- a/app/Enums/DateFormat.php +++ b/app/Enums/DateFormat.php @@ -10,26 +10,26 @@ enum DateFormat: string { use LaravelEnumHelper; - case PointSeperatedDMYYYY = 'point-seperated-d-m-yyyy'; - case SlashSeperatedMMDDYYYY = 'slash-seperated-mm-dd-yyyy'; + case PointSeparatedDMYYYY = 'point-separated-d-m-yyyy'; + case SlashSeparatedMMDDYYYY = 'slash-separated-mm-dd-yyyy'; - case SlashSeperatedDDMMYYYY = 'slash-seperated-dd-mm-yyyy'; + case SlashSeparatedDDMMYYYY = 'slash-separated-dd-mm-yyyy'; - case HyphenSeperatedDDMMYYY = 'hyphen-seperated-dd-mm-yyyy'; + case HyphenSeparatedDDMMYYY = 'hyphen-separated-dd-mm-yyyy'; - case HyphenSeperatedMMDDDYYYY = 'hyphen-seperated-mm-dd-yyyy'; + case HyphenSeparatedMMDDDYYYY = 'hyphen-separated-mm-dd-yyyy'; - case HyphenSeperatedYYYYMMDD = 'hyphen-seperated-yyyy-mm-dd'; + case HyphenSeparatedYYYYMMDD = 'hyphen-separated-yyyy-mm-dd'; public function toCarbonFormat(): string { return match ($this->value) { - self::PointSeperatedDMYYYY->value => 'j.n.Y', - self::SlashSeperatedMMDDYYYY->value => 'm/d/Y', - self::SlashSeperatedDDMMYYYY->value => 'd/m/Y', - self::HyphenSeperatedDDMMYYY->value => 'd-m-Y', - self::HyphenSeperatedMMDDDYYYY->value => 'm-d-Y', - self::HyphenSeperatedYYYYMMDD->value => 'Y-m-d', + self::PointSeparatedDMYYYY->value => 'j.n.Y', + self::SlashSeparatedMMDDYYYY->value => 'm/d/Y', + self::SlashSeparatedDDMMYYYY->value => 'd/m/Y', + self::HyphenSeparatedDDMMYYY->value => 'd-m-Y', + self::HyphenSeparatedMMDDDYYYY->value => 'm-d-Y', + self::HyphenSeparatedYYYYMMDD->value => 'Y-m-d', }; } diff --git a/app/Enums/IntervalFormat.php b/app/Enums/IntervalFormat.php index 869aab76..46e2aa77 100644 --- a/app/Enums/IntervalFormat.php +++ b/app/Enums/IntervalFormat.php @@ -13,9 +13,9 @@ enum IntervalFormat: string case Decimal = 'decimal'; case HoursMinutes = 'hours-minutes'; - case HoursMinutesColonSeperated = 'hours-minutes-colon-seperated'; + case HoursMinutesColonSeparated = 'hours-minutes-colon-separated'; - case HoursMinutesSecondsColonSeperated = 'hours-minutes-seconds-colon-seperated'; + case HoursMinutesSecondsColonSeparated = 'hours-minutes-seconds-colon-separated'; /** * @return array diff --git a/app/Service/LocalizationService.php b/app/Service/LocalizationService.php index c39efc60..54f6516e 100644 --- a/app/Service/LocalizationService.php +++ b/app/Service/LocalizationService.php @@ -85,11 +85,11 @@ class LocalizationService $interval->cascade(); return ((int) floor($interval->totalHours)).'h '.$interval->format('%I').'m'; - } elseif ($this->intervalFormat === IntervalFormat::HoursMinutesColonSeperated) { + } elseif ($this->intervalFormat === IntervalFormat::HoursMinutesColonSeparated) { $interval->cascade(); return ((int) floor($interval->totalHours)).':'.$interval->format('%I'); - } elseif ($this->intervalFormat === IntervalFormat::HoursMinutesSecondsColonSeperated) { + } elseif ($this->intervalFormat === IntervalFormat::HoursMinutesSecondsColonSeparated) { $interval->cascade(); return ((int) floor($interval->totalHours)).':'.$interval->format('%I:%S'); diff --git a/config/app.php b/config/app.php index 4cc14159..8acf6252 100644 --- a/config/app.php +++ b/config/app.php @@ -147,7 +147,7 @@ return [ 'default_currency' => env('LOCALIZATION_DEFAULT_CURRENCY', 'EUR'), 'default_number_format' => env('LOCALIZATION_DEFAULT_NUMBER_FORMAT', NumberFormat::ThousandsPointDecimalComma->value), 'default_currency_format' => env('LOCALIZATION_DEFAULT_CURRENCY_FORMAT', CurrencyFormat::ISOCodeAfterWithSpace->value), - 'default_date_format' => env('LOCALIZATION_DEFAULT_DATE_FORMAT', DateFormat::HyphenSeperatedYYYYMMDD->value), + 'default_date_format' => env('LOCALIZATION_DEFAULT_DATE_FORMAT', DateFormat::HyphenSeparatedYYYYMMDD->value), 'default_time_format' => env('LOCALIZATION_DEFAULT_TIME_FORMAT', TimeFormat::TwentyFourHours->value), 'default_interval_format' => env('LOCALIZATION_DEFAULT_INTERVAL_FORMAT', IntervalFormat::HoursMinutes->value), ], diff --git a/database/migrations/2025_05_06_152804_fix_typos_in_organizations_table_format_columns.php b/database/migrations/2025_05_06_152804_fix_typos_in_organizations_table_format_columns.php new file mode 100644 index 00000000..8294c17b --- /dev/null +++ b/database/migrations/2025_05_06_152804_fix_typos_in_organizations_table_format_columns.php @@ -0,0 +1,44 @@ + [ - DateFormat::PointSeperatedDMYYYY->value => 'D.M.YYYY', - DateFormat::SlashSeperatedMMDDYYYY->value => 'MM/DD/YYYY', - DateFormat::SlashSeperatedDDMMYYYY->value => 'DD/MM/YYYY', - DateFormat::HyphenSeperatedDDMMYYY->value => 'DD-MM-YYYY', - DateFormat::HyphenSeperatedMMDDDYYYY->value => 'MM-DD-YYYY', - DateFormat::HyphenSeperatedYYYYMMDD->value => 'YYYY-MM-DD', + DateFormat::PointSeparatedDMYYYY->value => 'D.M.YYYY', + DateFormat::SlashSeparatedMMDDYYYY->value => 'MM/DD/YYYY', + DateFormat::SlashSeparatedDDMMYYYY->value => 'DD/MM/YYYY', + DateFormat::HyphenSeparatedDDMMYYY->value => 'DD-MM-YYYY', + DateFormat::HyphenSeparatedMMDDDYYYY->value => 'MM-DD-YYYY', + DateFormat::HyphenSeparatedYYYYMMDD->value => 'YYYY-MM-DD', ], 'time_format' => [ @@ -46,8 +46,8 @@ return [ 'interval_format' => [ IntervalFormat::Decimal->value => 'Decimal', IntervalFormat::HoursMinutes->value => '12h 3m', - IntervalFormat::HoursMinutesColonSeperated->value => '12:03', - IntervalFormat::HoursMinutesSecondsColonSeperated->value => '12:03:45', + IntervalFormat::HoursMinutesColonSeparated->value => '12:03', + IntervalFormat::HoursMinutesSecondsColonSeparated->value => '12:03:45', ], 'currency_format' => [ diff --git a/resources/js/Pages/Teams/Partials/OrganizationFormatSettings.vue b/resources/js/Pages/Teams/Partials/OrganizationFormatSettings.vue index 805901ba..ef0adc34 100644 --- a/resources/js/Pages/Teams/Partials/OrganizationFormatSettings.vue +++ b/resources/js/Pages/Teams/Partials/OrganizationFormatSettings.vue @@ -11,9 +11,9 @@ import { useMutation, useQueryClient } from '@tanstack/vue-query'; type NumberFormat = 'point-comma' | 'comma-point' | 'space-comma' | 'space-point' | 'apostrophe-point'; type CurrencyFormat = 'iso-code-before-with-space' | 'iso-code-after-with-space' | 'symbol-before' | 'symbol-after' | 'symbol-before-with-space' | 'symbol-after-with-space'; -type DateFormat = 'point-seperated-d-m-yyyy' | 'slash-seperated-mm-dd-yyyy' | 'slash-seperated-dd-mm-yyyy' | 'hyphen-seperated-dd-mm-yyyy' | 'hyphen-seperated-mm-dd-yyyy' | 'hyphen-seperated-yyyy-mm-dd'; +type DateFormat = 'point-separated-d-m-yyyy' | 'slash-separated-mm-dd-yyyy' | 'slash-separated-dd-mm-yyyy' | 'hyphen-separated-dd-mm-yyyy' | 'hyphen-separated-mm-dd-yyyy' | 'hyphen-separated-yyyy-mm-dd'; type TimeFormat = '12-hours' | '24-hours'; -type IntervalFormat = 'decimal' | 'hours-minutes' | 'hours-minutes-colon-seperated' | 'hours-minutes-seconds-colon-seperated'; +type IntervalFormat = 'decimal' | 'hours-minutes' | 'hours-minutes-colon-separated' | 'hours-minutes-seconds-colon-separated'; interface FormValues { number_format: NumberFormat | undefined; @@ -118,12 +118,12 @@ async function submit() { - D.M.YYYY - MM/DD/YYYY - DD/MM/YYYY - DD-MM-YYYY - MM-DD-YYYY - YYYY-MM-DD + D.M.YYYY + MM/DD/YYYY + DD/MM/YYYY + DD-MM-YYYY + MM-DD-YYYY + YYYY-MM-DD @@ -156,8 +156,8 @@ async function submit() { Decimal 12h 3m - 12:03 - 12:03:45 + 12:03 + 12:03:45 @@ -165,11 +165,11 @@ async function submit() { - \ No newline at end of file + diff --git a/resources/js/packages/api/src/openapi.json.client.ts b/resources/js/packages/api/src/openapi.json.client.ts index 06e903a1..c6de12d6 100644 --- a/resources/js/packages/api/src/openapi.json.client.ts +++ b/resources/js/packages/api/src/openapi.json.client.ts @@ -324,18 +324,18 @@ const CurrencyFormat = z.enum([ 'symbol-after-with-space', ]); const DateFormat = z.enum([ - 'point-seperated-d-m-yyyy', - 'slash-seperated-mm-dd-yyyy', - 'slash-seperated-dd-mm-yyyy', - 'hyphen-seperated-dd-mm-yyyy', - 'hyphen-seperated-mm-dd-yyyy', - 'hyphen-seperated-yyyy-mm-dd', + 'point-separated-d-m-yyyy', + 'slash-separated-mm-dd-yyyy', + 'slash-separated-dd-mm-yyyy', + 'hyphen-separated-dd-mm-yyyy', + 'hyphen-separated-mm-dd-yyyy', + 'hyphen-separated-yyyy-mm-dd', ]); const IntervalFormat = z.enum([ 'decimal', 'hours-minutes', - 'hours-minutes-colon-seperated', - 'hours-minutes-seconds-colon-seperated', + 'hours-minutes-colon-separated', + 'hours-minutes-seconds-colon-separated', ]); const TimeFormat = z.enum(['12-hours', '24-hours']); const OrganizationUpdateRequest = z diff --git a/tests/Unit/Service/LocalizationServiceTest.php b/tests/Unit/Service/LocalizationServiceTest.php index 3bbd8057..62d83bdc 100644 --- a/tests/Unit/Service/LocalizationServiceTest.php +++ b/tests/Unit/Service/LocalizationServiceTest.php @@ -29,7 +29,7 @@ class LocalizationServiceTest extends TestCaseWithDatabase parent::setUp(); $this->localizationService = new LocalizationService( CurrencyFormat::SymbolAfterWithSpace, - DateFormat::PointSeperatedDMYYYY, + DateFormat::PointSeparatedDMYYYY, TimeFormat::TwelveHours, NumberFormat::ThousandsPointDecimalComma, IntervalFormat::Decimal, @@ -105,11 +105,11 @@ class LocalizationServiceTest extends TestCaseWithDatabase $this->assertSame('30001h 03m', $formatted); } - public function test_format_interval_with_type_hours_minutes_colon_seperated(): void + public function test_format_interval_with_type_hours_minutes_colon_separated(): void { // Arrange $interval = CarbonInterval::seconds(4 + (60 * 3) + (60 * 60 * 30001)); - $this->localizationService->setIntervalFormat(IntervalFormat::HoursMinutesColonSeperated); + $this->localizationService->setIntervalFormat(IntervalFormat::HoursMinutesColonSeparated); // Act $formatted = $this->localizationService->formatInterval($interval); @@ -118,11 +118,11 @@ class LocalizationServiceTest extends TestCaseWithDatabase $this->assertSame('30001:03', $formatted); } - public function test_format_interval_with_type_hours_minutes_seconds_colon_seperated(): void + public function test_format_interval_with_type_hours_minutes_seconds_colon_separated(): void { // Arrange $interval = CarbonInterval::seconds(4 + (60 * 3) + (60 * 60 * 30001)); - $this->localizationService->setIntervalFormat(IntervalFormat::HoursMinutesSecondsColonSeperated); + $this->localizationService->setIntervalFormat(IntervalFormat::HoursMinutesSecondsColonSeparated); // Act $formatted = $this->localizationService->formatInterval($interval); @@ -215,10 +215,10 @@ class LocalizationServiceTest extends TestCaseWithDatabase $this->assertSame('EUR 1 234 567,89', $formatted); } - public function test_format_date_with_type_slash_seperated_ddmmy(): void + public function test_format_date_with_type_slash_separated_ddmmy(): void { // Arrange - $this->localizationService->setDateFormat(DateFormat::SlashSeperatedDDMMYYYY); + $this->localizationService->setDateFormat(DateFormat::SlashSeparatedDDMMYYYY); $date = Carbon::createFromDate(2001, 2, 3); // Act