Merge branch 'main' into #39-generate-timesheet

# Conflicts: # composer.lock # resources/lang/pl.json
2022-02-21 12:33:50 +01:00
parent d6afa561a7 597d6f0ddb
commit 0f5b9ecc0b
20 changed files with 696 additions and 2507 deletions
--- a/app/Infrastructure/Http/Controllers/VacationRequestController.php
+++ b/app/Infrastructure/Http/Controllers/VacationRequestController.php
@@ -116,7 +116,7 @@ class VacationRequestController extends Controller
        $stateManager->cancel($vacationRequest);

        return redirect()->back()
-            ->with("success", __("Vacation request has been canceled."));
+            ->with("success", __("Vacation request has been cancelled."));
    }

    public function acceptAsTechnical(