kamilniemczycki/toby
1
0
Fork 0
Code Issues Pull Requests 2 Projects Releases Activity

Merge branch 'main' into #42-global-notifications

Browse Source 
# Conflicts:
#	app/Domain/Enums/VacationRequestState.php
#	app/Domain/VacationRequestStateManager.php
#	app/Eloquent/Models/Vacation.php
#	app/Infrastructure/Http/Controllers/VacationCalendarController.php
#	app/Infrastructure/Http/Controllers/VacationRequestController.php
#	database/factories/VacationFactory.php
#	database/migrations/2022_02_07_133018_create_vacations_table.php
#	database/seeders/DatabaseSeeder.php
#	resources/js/Pages/Calendar.vue
#	resources/js/Shared/Activity.vue
#	resources/js/Shared/MainMenu.vue
#	resources/js/Shared/Status.vue
#	tailwind.config.js
#	tests/Feature/VacationRequestTest.php
#	tests/Unit/VacationRequestStatesTest.php
This commit is contained in:
EwelinaLasowy
2022-02-15 15:17:01 +01:00
parent 425d7c7608 6c352b629c
commit c301ab7c26
29 changed files with 545 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/lang/pl.json
View File

@@ -28,7 +28,7 @@
"accepted_by_administrative": "Zaakceptowany przez administracyjnego",
"You have pending vacation request in this range.": "Masz oczekujący wniosek urlopowy w tym zakresie dat.",
"You have approved vacation request in this range.": "Masz zaakceptowany wniosek urlopowy w tym zakresie dat.",
"You have exceeded your vacation limit.": "Przekroczyłeś/aś limit urlopu.",
"Vacation limit has been exceeded.": "Limit urlopu został przekroczony.",
"Vacation needs minimum one day.": "Urlop musi być co najmniej na jeden dzień.",
"The vacation request cannot be created at the turn of the year.": "Wniosek urlopowy nie może zostać złożony na przełomie roku.",
"User has been created.": "Użytkownik został utworzony.",