diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php
index 85cbecf..60bcbda 100644
--- a/skolehjem/app/Http/Controllers/EventController.php
+++ b/skolehjem/app/Http/Controllers/EventController.php
@@ -70,9 +70,9 @@ class EventController extends Controller
$allEvents = Event::query()->where('name', '=', $request->name)->get();
- if(count($allEvents) > 0)
+ if(count($allEvents) > 0) {
return redirect()->route("events.index", ['events' => $event])->with('EventNameExists', '
Der findes allerede et event med det navn!
');
- else {
+ } else {
$event->save();
$event = Event::query()->paginate($request->input("limit", 20));
return redirect()->route("events.index", ['events' => $event]);
diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php
index 86ed353..04cd68f 100644
--- a/skolehjem/app/Http/Controllers/UserController.php
+++ b/skolehjem/app/Http/Controllers/UserController.php
@@ -143,7 +143,7 @@ class UserController extends Controller
if($id === Auth::id() || auth()->user()->hasPermissionTo("user.edit")) {
if ($request->roles != null && auth()->user()->hasPermissionTo("user.edit")) { //You can only edit roles on the admin site, so if there is an input roles, then update user info and edit roles
if(count($allUsersEmail) > 0)
- return redirect()->route('users.edit', ['user' => $id])->with('EmailExists', 'Der findes allerede en bruger med den Email!
');
+ return redirect()->route('users.edit', ['user' => $id])->with('EmailExists', 'Der findes allerede en bruger med den Email!
');
elseif(count($allUsersPhone) > 0)
return redirect()->route('users.edit', ['user' => $id])->with('PhoneExists', 'Der findes allerede en bruger med det Telefon Nr.!
');
elseif ($request->password != "") { // If you have edited the password, then run this
@@ -152,7 +152,7 @@ class UserController extends Controller
/** @var User $user */
$user->update($data);
} else // Else go back with an error message
- return redirect()->route("users.edit", ['user' => $id])->with('error#notsamepass', 'Der stod ikke det samme i `Password` & `Confirm Password`!
');
+ return redirect()->route("users.edit", ['user' => $id])->with('error#notsamepass', 'Der stod ikke det samme i `Password` & `Bekræft Adgangskode`!
');
}
else { // If you haven't touched the password, then update everything else but password
$data = $request->only(['name_first', 'name_last', 'email', 'phone', 'roles']);
@@ -211,13 +211,19 @@ class UserController extends Controller
return redirect()->route("root.index");
}
- return redirect()->back(303)->with('error#wrongcredentials', 'Email eller Password matchede ikke!
');
+ if (request()->cookie('languagesSetting') == "dk")
+ return redirect()->back(303)->with('error#wrongcredentials', 'Email eller Password matchede ikke!
');
+ if (request()->cookie('languagesSetting') == "en")
+ return redirect()->back(303)->with('error#wrongcredentials', 'Wrong Email or Password!
');
}
public function logout(Request $request) {
Auth::logout();
- return redirect()->route("users.login")->with('success#loggedout', 'Du er hermed logget ud!
');
+ if (request()->cookie('languagesSetting') == "dk")
+ return redirect()->route("users.login")->with('success#loggedout', 'Du er hermed logget ud!
');
+ if (request()->cookie('languagesSetting') == "en")
+ return redirect()->route("users.login")->with('success#loggedout', 'You are logged out!
');
}
/*******************************************/
@@ -232,7 +238,7 @@ class UserController extends Controller
$user = User::query()->where('email', '=', $request->email)->first();
if($user == null){
- return redirect()->back()->with('errornosuchuser', 'Denne email findes ikke i systemet!
');
+ return redirect()->back()->with('errornosuchuser', 'Denne email findes ikke i systemet!
');
}
//Send email
@@ -290,21 +296,33 @@ class UserController extends Controller
if ($request->input('password') != null) { // If you're editing the password
$data = $request->only(['name_first', 'name_last', 'email', 'phone', 'password']);
if ($request->input('password') != $request->input('confirmpassword')) { // If new password and new password confirm is not the same, go back with fail message.
- return redirect()->route("users.accounteditpass")->with('error#notsamepass', 'Der stod ikke det samme i `Nyt Password` & `Confirm Password`!
');
+ if (request()->cookie('languagesSetting') == "dk")
+ return redirect()->route("users.accounteditpass")->with('error#notsamepass', 'Der stod ikke det samme i `Nyt Password` & `Confirm Password`!
');
+ elseif (request()->cookie('languagesSetting') == "en")
+ return redirect()->route("users.accounteditpass")->with('error#notsamepass', '`New Password` & `Confirm Password` was not the same!
');
} elseif (!Hash::check($request->input('oldpassword'), $user->password)) { // If the written current password and current password in DB is not the same, go back with fail message.
- return redirect()->route("users.accounteditpass")->with('error#oldpass', 'Det indtastede password i `Nuværende Password` er ikke dit nuværende password!
');
+ if (request()->cookie('languagesSetting') == "dk")
+ return redirect()->route("users.accounteditpass")->with('error#oldpass', 'Det indtastede password i `Nuværende Password` er ikke dit nuværende password!
');
+ elseif (request()->cookie('languagesSetting') == "en")
+ return redirect()->route("users.accounteditpass")->with('error#oldpass', 'The entered `Current Password` was not the same as your current password!
');
} else { // If new password and current password is the same AND current written and current DB password is the same. Then update and logout.
/** @var User $user */
$user->update($data);
Auth::logout();
- return redirect()->route("users.login")->with('success#passwordchange', 'Dit password er hermed ændret!
');
+ if (request()->cookie('languagesSetting') == "dk")
+ return redirect()->route("users.login")->with('success#passwordchange', 'Dit password er hermed ændret!
');
+ elseif (request()->cookie('languagesSetting') == "en")
+ return redirect()->route("users.login")->with('success#passwordchange', 'Your password was changed successfully!
');
}
} else { // Else if you're not editing the password but anything else (Email, Phone Number). Then update user.
$data = $request->only(['email', 'phone']);
$user->update($data);
- return redirect()->route("users.account")->with('success#credentialschanged', 'Dine oplysninger er hermed ændret!
');
+ if (request()->cookie('languagesSetting') == "dk")
+ return redirect()->route("users.account")->with('success#credentialschanged', 'Dine oplysninger er hermed ændret!
');
+ elseif (request()->cookie('languagesSetting') == "en")
+ return redirect()->route("users.account")->with('success#credentialschanged', 'Your information has changed!
');
}
$users = User::query()->paginate(20);
diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php
index 74e655b..7273f03 100644
--- a/skolehjem/app/Http/Controllers/UserEventController.php
+++ b/skolehjem/app/Http/Controllers/UserEventController.php
@@ -48,15 +48,22 @@ class UserEventController extends Controller
->where('event_id', $request->event_id)->get();
// If the row has both, then go back and show an error - Cause you're not allowed to be on the same event twice.
- if (count($getTableInfo) > 0)
- return redirect()->route("events.index")->with('error#' . $request->event_id, 'Du har allerede tilmeldt dig denne Aktivitet!
');
+ if (count($getTableInfo) > 0) {
+ if (request()->cookie('languagesSetting') == "dk")
+ return redirect()->route("events.index")->with('error#' . $request->event_id, 'Du har allerede tilmeldt dig denne Aktivitet!
');
+ if (request()->cookie('languagesSetting') == "en")
+ return redirect()->route("events.index")->with('error#' . $request->event_id, 'You are already participating in this event!
');
+ }
// If not, then it keeps going and saves and shows a success message
$UserEvent = new UserEvent($data);
$UserEvent->user_id = auth()->user()->id;
$UserEvent->save();
- return redirect()->route("events.index")->with('signup#' . $request->event_id, 'Du er hermed tilmeldt denne aktivitet!
');
+ if (request()->cookie('languagesSetting') == "dk")
+ return redirect()->route("events.index")->with('signup#' . $request->event_id, 'Du er hermed tilmeldt denne aktivitet!
');
+ if (request()->cookie('languagesSetting') == "en")
+ return redirect()->route("events.index")->with('signup#' . $request->event_id, 'You are now participating in this event!
');
}
/**
@@ -76,7 +83,10 @@ class UserEventController extends Controller
$JoinedEvents = UserEvent::query()->join('events', 'events.id', '=', 'user_events.event_id')->where('user_id', "=", auth()->user()->id)->get();
- return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', 'Du er hermed afmeldt aktiviteten!
');
+ if (request()->cookie('languagesSetting') == "dk")
+ return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', 'Du er hermed afmeldt aktiviteten!
');
+ if (request()->cookie('languagesSetting') == "en")
+ return redirect()->route("userevents.index", [ "userevents" => $JoinedEvents ])->with('eventunsubscribed', 'You are no longer participating in this event!
');
}
public function show()
diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php
index 8684692..51fe5fd 100644
--- a/skolehjem/resources/lang/dk/msg.php
+++ b/skolehjem/resources/lang/dk/msg.php
@@ -12,33 +12,37 @@ return[
"logud" => "Log ud",
"dereringenmenuplanerdenneuge" => "Der er ingen menuplaner denne uge",
"dereringenaktiviteter" => "Der er ingen aktiviteter",
- "setilmeldteaktiviteter" => "Se tilmeldte aktiviteter",
+ "setilmeldteaktiviteter" => "Se Tilmeldte Aktiviteter",
"dinereservationer" => "Dine reservationer",
"duharingenreservationer" => "Du har ingen reservationer",
"reservervaskemaskine" => "Reserver vaskemaskine",
- "kontakt" => "Kontakt",
+ "dereringenvaskemaskiner" => "Der er ikke nogen vaskemaskiner",
+ "lokation" => "Lokation",
+ "kontakter" => "Kontakt",
"navn" => "Navn",
"email"=> "E-mail",
"ring" => "Ring",
"givfeedback" => "Giv feedback",
"sendfeedback" => "Send feedback omkring hvem el. hvad som helst",
- "accepterer" => "Accepterer",
+ "accepter" => "Accepter",
"dereringenvejledninger" => "Der er ingen vejledninger",
"telefon" => "Telefon",
"redigeroplysninger" => "Rediger Oplysninger",
- "ændrepassword" => "Ænder Password",
+ "ændrepassword" => "Ændre Password",
"tilmeldteaktiviteter" => "Tilmeldte aktiviteter",
+ "tilmeld" => "Tilmeld",
"duharikketilmeldtdignogenaktiviteter" => "Du har ikke tilmeldt dig nogen aktiviteter",
+ "afmeld" => "Afmeld",
"tilbage" => "Tilbage",
- "bookingliste" => "Bokking Liste",
+ "bookingliste" => "Booking Liste",
"ugestor" => "Uge",
- "maskiner" => "Maskiner",
+ "maskiner" => "Vaskemaskiner",
"tilgængeligetider" => "Tilgængelige tider",
"reserver" => "Reserver",
"rediger" => "Rediger",
- "nuværendepassword" => "Nuværende Password",
- "nytpassword" => "Nyt password",
- "confirmpassword" => "Gentag adgangskode",
+ "nuværendepassword" => "Nuværende Adgangskode",
+ "nytpassword" => "Ny Adgangskode",
+ "confirmpassword" => "Gentag Adgangskode",
diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php
index 76c9e00..9821d73 100644
--- a/skolehjem/resources/lang/en/msg.php
+++ b/skolehjem/resources/lang/en/msg.php
@@ -4,7 +4,7 @@ return[
"menuplan" => "Menu",
"aktiviteter" => "Activities",
"reservationer" => "Reservations",
- "kontoret" => "The office",
+ "kontoret" => "The Bureau",
"vagttelefon" => "Emergency phone",
"vejledning" => "Guide",
"home" => "Home",
@@ -19,11 +19,11 @@ return[
"ugestor" => "Week",
"dereringenaktiviteter" => "There is no activity this week",
"setilmeldteaktiviteter" => "See Registered Activities",
- "tilmeld" => "Register Activities ",
"tilmeldteaktiviteter" => "Your Registered Activities",
"duharikketilmeldtdignogenaktiviteter" => "You have not signed up for any activities",
+ "afmeld" => "Cancel",
"tilbage" => "Go Back",
- "dinereservationer" => "Your reservations",
+ "dinereservationer" => "Your Reservations",
"fjern" => "Remove",
"tid" => "Time",
"reservervaskemaskine" => "Reserve washing machine",
@@ -31,9 +31,10 @@ return[
"bookingliste" => "Booking List",
"dereringenvaskemaskiner" => "There are no washing machines",
"tilgængeligetider" => "Available times",
- "maskiner" => "Washing machine",
- "reserver" => "Reserves",
- "kontakt" => "Contacts",
+ "maskiner" => "Washing machines",
+ "reserver" => "Reserve",
+ "lokation" => "Location",
+ "kontakter" => "Contacts",
"navn" => "Name",
"email" => "E-mail",
"telefontid" => "Telephone hours",
@@ -41,9 +42,9 @@ return[
"givfeedback" => "Feedback",
"sendfeedback" => "Send us feedback about what you like and what you don't like",
"dereringenkontakter" => "There are no contacts",
- "accepterer" => "Accept",
+ "accepter" => "Accept",
"dereringenvejledninger" => "There are no guides",
- "tilmelde" => "Participating",
+ "tilmeld" => "Participating",
"telefon" => "Phone",
"redigeroplysninger" => "Edit information",
"ændrepassword" => "Change Password",
@@ -51,5 +52,4 @@ return[
"nuværendepassword" => "Current password",
"nytpassword" => "New password",
"confirmpassword" => "Confirm password",
-
];
diff --git a/skolehjem/resources/views/admin/users/create.blade.php b/skolehjem/resources/views/admin/users/create.blade.php
index 1832b95..4180ea9 100644
--- a/skolehjem/resources/views/admin/users/create.blade.php
+++ b/skolehjem/resources/views/admin/users/create.blade.php
@@ -22,12 +22,12 @@
Email:
- Password:
+ Adgangskode:
- Confirm Password:
+ Bekræft Adgangskode:
diff --git a/skolehjem/resources/views/app/contacts/index.blade.php b/skolehjem/resources/views/app/contacts/index.blade.php
index 816511d..8c338a4 100644
--- a/skolehjem/resources/views/app/contacts/index.blade.php
+++ b/skolehjem/resources/views/app/contacts/index.blade.php
@@ -5,7 +5,7 @@
@section("content")
- {{__('msg.kontakt')}}
+ {{__('msg.kontakter')}}
@if(!$contacts->isEmpty())
@foreach($contacts as $contact)
{{__('msg.navn')}}: {{ $contact->contactname }}
diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php
index debaba0..a62effc 100644
--- a/skolehjem/resources/views/app/events/index.blade.php
+++ b/skolehjem/resources/views/app/events/index.blade.php
@@ -16,7 +16,7 @@
{!! session()->get('error#' . $event->id) !!}
{!! session()->get('signup#' . $event->id) !!}
- {{__('msg.tilmelde')}}
+ {{__('msg.tilmeld')}}
@endforeach
@else
diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php
index 2b01287..c7bef5f 100644
--- a/skolehjem/resources/views/app/events/yourevents.blade.php
+++ b/skolehjem/resources/views/app/events/yourevents.blade.php
@@ -15,7 +15,7 @@
{{$userevent->name}}
{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}
{!! $userevent->description !!}
- Afmeld
+ {{__('msg.afmeld')}}
@endforeach
@else
diff --git a/skolehjem/resources/views/app/users/forgot.blade.php b/skolehjem/resources/views/app/users/forgot.blade.php
index 20b0f85..34909e0 100644
--- a/skolehjem/resources/views/app/users/forgot.blade.php
+++ b/skolehjem/resources/views/app/users/forgot.blade.php
@@ -9,11 +9,12 @@
-
@endsection
diff --git a/skolehjem/resources/views/app/vagttelefons/index.blade.php b/skolehjem/resources/views/app/vagttelefons/index.blade.php
index be7617b..859c907 100644
--- a/skolehjem/resources/views/app/vagttelefons/index.blade.php
+++ b/skolehjem/resources/views/app/vagttelefons/index.blade.php
@@ -11,7 +11,7 @@
- {{__('msg.accepterer')}}
+ {{__('msg.accepter')}}
+45 24 62 94 50
diff --git a/skolehjem/resources/views/app/washing-reservations/create.blade.php b/skolehjem/resources/views/app/washing-reservations/create.blade.php
index 19cbf9c..ce55a6d 100644
--- a/skolehjem/resources/views/app/washing-reservations/create.blade.php
+++ b/skolehjem/resources/views/app/washing-reservations/create.blade.php
@@ -139,7 +139,7 @@
else {
let span = document.createElement("span");
span.classList.add("events__title");
- span.innerText = "Lokation";
+ span.innerText = "{{__('msg.lokation')}}";
let select = document.createElement("select");
select.classList.add("events__title");