diff --git a/skolehjem/app/Http/Controllers/ContactController.php b/skolehjem/app/Http/Controllers/ContactController.php index e3e706c..204cbf9 100644 --- a/skolehjem/app/Http/Controllers/ContactController.php +++ b/skolehjem/app/Http/Controllers/ContactController.php @@ -13,6 +13,7 @@ class ContactController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:contact.list" ])->only("index"); $this->middleware([ "check.auth:contact.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 399ec20..85cbecf 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -15,6 +15,7 @@ class EventController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:event.list" ])->only("index"); $this->middleware([ "check.auth:event.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/FeedbackController.php b/skolehjem/app/Http/Controllers/FeedbackController.php index 5d39190..5bd25bc 100644 --- a/skolehjem/app/Http/Controllers/FeedbackController.php +++ b/skolehjem/app/Http/Controllers/FeedbackController.php @@ -13,6 +13,7 @@ class FeedbackController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:feedback.list" ])->only("index"); $this->middleware([ "check.auth:feedback.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/GuideController.php b/skolehjem/app/Http/Controllers/GuideController.php index 7c73f01..d452315 100644 --- a/skolehjem/app/Http/Controllers/GuideController.php +++ b/skolehjem/app/Http/Controllers/GuideController.php @@ -13,6 +13,7 @@ class GuideController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:guides.list" ])->only("index"); $this->middleware([ "check.auth:guides.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/LocationController.php b/skolehjem/app/Http/Controllers/LocationController.php index 92af4c5..5a6f9a4 100644 --- a/skolehjem/app/Http/Controllers/LocationController.php +++ b/skolehjem/app/Http/Controllers/LocationController.php @@ -11,6 +11,7 @@ class LocationController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:locations.list" ])->only("index"); $this->middleware([ "check.auth:locations.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index f10fc7b..6219089 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -17,6 +17,7 @@ class MenuPlanController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:menuplan.list" ])->only("index"); $this->middleware([ "check.auth:menuplan.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/PermissionController.php b/skolehjem/app/Http/Controllers/PermissionController.php index 0b627f3..8d06041 100644 --- a/skolehjem/app/Http/Controllers/PermissionController.php +++ b/skolehjem/app/Http/Controllers/PermissionController.php @@ -8,6 +8,12 @@ use Spatie\Permission\Models\Permission; class PermissionController extends Controller { + public function __construct() + { + $this->middleware(["auth"]); + $this->middleware(["lang"]); + } + /** * Display a listing of the resource. * diff --git a/skolehjem/app/Http/Controllers/PhoneController.php b/skolehjem/app/Http/Controllers/PhoneController.php index e2c3466..6772654 100644 --- a/skolehjem/app/Http/Controllers/PhoneController.php +++ b/skolehjem/app/Http/Controllers/PhoneController.php @@ -7,6 +7,12 @@ use Illuminate\Http\Response; class PhoneController extends Controller { + public function __construct() + { + $this->middleware(["auth"]); + $this->middleware(["lang"]); + } + function index() { return Response::detect("vagttelefons.index"); } diff --git a/skolehjem/app/Http/Controllers/ResourceCategoryController.php b/skolehjem/app/Http/Controllers/ResourceCategoryController.php index 657c6ec..dcfdb71 100644 --- a/skolehjem/app/Http/Controllers/ResourceCategoryController.php +++ b/skolehjem/app/Http/Controllers/ResourceCategoryController.php @@ -11,6 +11,7 @@ class ResourceCategoryController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:resource.category.list" ])->only("index"); $this->middleware([ "check.auth:resource.category.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/ResourceController.php b/skolehjem/app/Http/Controllers/ResourceController.php index 7fe829d..20fe0ed 100644 --- a/skolehjem/app/Http/Controllers/ResourceController.php +++ b/skolehjem/app/Http/Controllers/ResourceController.php @@ -12,6 +12,7 @@ class ResourceController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:resource.list" ])->only("index"); $this->middleware([ "check.auth:resource.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/ResourceExtensionController.php b/skolehjem/app/Http/Controllers/ResourceExtensionController.php index 422ecc5..b13606e 100644 --- a/skolehjem/app/Http/Controllers/ResourceExtensionController.php +++ b/skolehjem/app/Http/Controllers/ResourceExtensionController.php @@ -11,6 +11,7 @@ class ResourceExtensionController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:resource.extension.list" ])->only("index"); $this->middleware([ "check.auth:resource.extension.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/RolesController.php b/skolehjem/app/Http/Controllers/RolesController.php index ae68be2..8997ffd 100644 --- a/skolehjem/app/Http/Controllers/RolesController.php +++ b/skolehjem/app/Http/Controllers/RolesController.php @@ -12,6 +12,7 @@ class rolesController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:roles.list" ])->only("index"); $this->middleware([ "check.auth:roles.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/RootController.php b/skolehjem/app/Http/Controllers/RootController.php index d147e5b..28112ee 100644 --- a/skolehjem/app/Http/Controllers/RootController.php +++ b/skolehjem/app/Http/Controllers/RootController.php @@ -10,6 +10,7 @@ class RootController extends Controller function __construct() { $this->middleware("auth"); + $this->middleware([ "lang" ]); } public function index() { diff --git a/skolehjem/app/Http/Controllers/UserController.php b/skolehjem/app/Http/Controllers/UserController.php index 4aeda12..86ed353 100644 --- a/skolehjem/app/Http/Controllers/UserController.php +++ b/skolehjem/app/Http/Controllers/UserController.php @@ -6,6 +6,7 @@ use App\Helpers\Detector; use Illuminate\Http\Request; use Illuminate\Http\Response; use App\User; +use Illuminate\Support\Facades\App; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Hash; @@ -20,6 +21,7 @@ class UserController extends Controller { $this->middleware([ "auth" ])->only("logout"); $this->middleware([ "guest" ])->only("login"); + $this->middleware([ "lang" ])->except(["login", "showLogin", "showForgot", "forgot"]); $this->middleware([ "check.auth:user.list" ])->only("index"); $this->middleware([ "check.auth:user.show" ])->only("show"); @@ -457,4 +459,23 @@ class UserController extends Controller return Response($output); } } + + + + public function setLanguages(Request $request){ + if($request->ajax()){ + if($request->lang === "en"){ + $response = new Response('Set Cookie'); + $response->withCookie(cookie('languagesSetting', $request->lang, 5259488)); + + return $response; + }elseif($request->lang === "dk"){ + $response = new Response('Set Cookie'); + $response->withCookie(cookie('languagesSetting', $request->lang, 5259488)); + + return $response; + } + } + } + } diff --git a/skolehjem/app/Http/Controllers/UserEventController.php b/skolehjem/app/Http/Controllers/UserEventController.php index 4303acb..74e655b 100644 --- a/skolehjem/app/Http/Controllers/UserEventController.php +++ b/skolehjem/app/Http/Controllers/UserEventController.php @@ -8,6 +8,11 @@ use Illuminate\Http\Response; class UserEventController extends Controller { + public function __construct() + { + $this->middleware(["auth"]); + $this->middleware(["lang"]); + } /** * Update the specified resource in storage. * diff --git a/skolehjem/app/Http/Controllers/WashingMachineController.php b/skolehjem/app/Http/Controllers/WashingMachineController.php index 9ef3096..d4e30f3 100644 --- a/skolehjem/app/Http/Controllers/WashingMachineController.php +++ b/skolehjem/app/Http/Controllers/WashingMachineController.php @@ -17,6 +17,7 @@ class WashingMachineController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:washing.machine.list" ])->only("index"); $this->middleware([ "check.auth:washing.machine.show" ])->only("show"); diff --git a/skolehjem/app/Http/Controllers/WashingReservationController.php b/skolehjem/app/Http/Controllers/WashingReservationController.php index 11c77a5..b212eba 100644 --- a/skolehjem/app/Http/Controllers/WashingReservationController.php +++ b/skolehjem/app/Http/Controllers/WashingReservationController.php @@ -20,6 +20,7 @@ class WashingReservationController extends Controller public function __construct() { $this->middleware([ "auth" ]); + $this->middleware([ "lang" ]); $this->middleware([ "check.auth:washing.machine.reservation.list" ])->only(["index", "appindex"]); $this->middleware([ "check.auth:washing.machine.reservation.show" ])->only("show"); diff --git a/skolehjem/app/Http/Kernel.php b/skolehjem/app/Http/Kernel.php index 3e1e21b..7b37d2d 100644 --- a/skolehjem/app/Http/Kernel.php +++ b/skolehjem/app/Http/Kernel.php @@ -2,6 +2,7 @@ namespace App\Http; +use App\Http\Middleware\SetLocale; use Illuminate\Foundation\Http\Kernel as HttpKernel; class Kernel extends HttpKernel @@ -67,7 +68,7 @@ class Kernel extends HttpKernel 'role' => \Spatie\Permission\Middlewares\RoleMiddleware::class, 'permission' => \Spatie\Permission\Middlewares\PermissionMiddleware::class, 'role_or_permission' => \Spatie\Permission\Middlewares\RoleOrPermissionMiddleware::class, - + 'lang' => \App\Http\Middleware\SetLocale::class, "check.auth" => \App\Http\Middleware\CheckAuth::class ]; } diff --git a/skolehjem/app/Http/Middleware/SetLocale.php b/skolehjem/app/Http/Middleware/SetLocale.php new file mode 100644 index 0000000..3d9a932 --- /dev/null +++ b/skolehjem/app/Http/Middleware/SetLocale.php @@ -0,0 +1,21 @@ +setLocale($request->user()->getLocale($request)); + return $next($request); + } +} diff --git a/skolehjem/app/User.php b/skolehjem/app/User.php index 0db07bf..1f8aca1 100644 --- a/skolehjem/app/User.php +++ b/skolehjem/app/User.php @@ -7,6 +7,7 @@ namespace App; //allows the use of many libraries. +use http\Env\Request; use Illuminate\Contracts\Auth\MustVerifyEmail; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Foundation\Auth\User as Authenticatable; @@ -52,4 +53,8 @@ class User extends Authenticatable public function setPasswordAttribute($password) { $this->attributes["password"] = Hash::make($password); } + + public function getLocale(\Illuminate\Http\Request $request) { + return $request->cookie('languagesSetting'); + } } diff --git a/skolehjem/config/app.php b/skolehjem/config/app.php index b7644e6..2c1b451 100644 --- a/skolehjem/config/app.php +++ b/skolehjem/config/app.php @@ -80,7 +80,7 @@ return [ | */ - 'locale' => 'en', + 'locale' => 'dk', /* |-------------------------------------------------------------------------- @@ -93,7 +93,7 @@ return [ | */ - 'fallback_locale' => 'en', + 'fallback_locale' => 'dk', /* |-------------------------------------------------------------------------- diff --git a/skolehjem/resources/lang/dk/msg.php b/skolehjem/resources/lang/dk/msg.php new file mode 100644 index 0000000..8684692 --- /dev/null +++ b/skolehjem/resources/lang/dk/msg.php @@ -0,0 +1,47 @@ + "Menuplan", + "aktiviteter" => "Aktiviteter", + "Home" => "Home", + "reservationer" => "Reservationer", + "kontoret" => "Kontoret", + "vagttelefon" => "Vagttelefon", + "vejledning" => "Vejledninger", + "konto" => "Konto", + "logud" => "Log ud", + "dereringenmenuplanerdenneuge" => "Der er ingen menuplaner denne uge", + "dereringenaktiviteter" => "Der er ingen aktiviteter", + "setilmeldteaktiviteter" => "Se tilmeldte aktiviteter", + "dinereservationer" => "Dine reservationer", + "duharingenreservationer" => "Du har ingen reservationer", + "reservervaskemaskine" => "Reserver vaskemaskine", + "kontakt" => "Kontakt", + "navn" => "Navn", + "email"=> "E-mail", + "ring" => "Ring", + "givfeedback" => "Giv feedback", + "sendfeedback" => "Send feedback omkring hvem el. hvad som helst", + "accepterer" => "Accepterer", + "dereringenvejledninger" => "Der er ingen vejledninger", + "telefon" => "Telefon", + "redigeroplysninger" => "Rediger Oplysninger", + "ændrepassword" => "Ænder Password", + "tilmeldteaktiviteter" => "Tilmeldte aktiviteter", + "duharikketilmeldtdignogenaktiviteter" => "Du har ikke tilmeldt dig nogen aktiviteter", + "tilbage" => "Tilbage", + "bookingliste" => "Bokking Liste", + "ugestor" => "Uge", + "maskiner" => "Maskiner", + "tilgængeligetider" => "Tilgængelige tider", + "reserver" => "Reserver", + "rediger" => "Rediger", + "nuværendepassword" => "Nuværende Password", + "nytpassword" => "Nyt password", + "confirmpassword" => "Gentag adgangskode", + + + + + +]; diff --git a/skolehjem/resources/lang/en/msg.php b/skolehjem/resources/lang/en/msg.php new file mode 100644 index 0000000..76c9e00 --- /dev/null +++ b/skolehjem/resources/lang/en/msg.php @@ -0,0 +1,55 @@ + "Menu", + "aktiviteter" => "Activities", + "reservationer" => "Reservations", + "kontoret" => "The office", + "vagttelefon" => "Emergency phone", + "vejledning" => "Guide", + "home" => "Home", + "logud" => "Log out", + "konto" => "Account", + "mandag" => "Monday", + "trisdag" => "Tuesday", + "onsdag" => "Wednesday", + "torsdag" => "Thursday", + "dereringenmenuplanerdenneuge" => "There is no menu for this week", + "uge" => "week", + "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", + "tilbage" => "Go Back", + "dinereservationer" => "Your reservations", + "fjern" => "Remove", + "tid" => "Time", + "reservervaskemaskine" => "Reserve washing machine", + "duharingenreservationer" => "You have no reservations", + "bookingliste" => "Booking List", + "dereringenvaskemaskiner" => "There are no washing machines", + "tilgængeligetider" => "Available times", + "maskiner" => "Washing machine", + "reserver" => "Reserves", + "kontakt" => "Contacts", + "navn" => "Name", + "email" => "E-mail", + "telefontid" => "Telephone hours", + "ring" => "Call", + "givfeedback" => "Feedback", + "sendfeedback" => "Send us feedback about what you like and what you don't like", + "dereringenkontakter" => "There are no contacts", + "accepterer" => "Accept", + "dereringenvejledninger" => "There are no guides", + "tilmelde" => "Participating", + "telefon" => "Phone", + "redigeroplysninger" => "Edit information", + "ændrepassword" => "Change Password", + "rediger" => "Edit", + "nuværendepassword" => "Current password", + "nytpassword" => "New password", + "confirmpassword" => "Confirm password", + +]; diff --git a/skolehjem/resources/views/app/contacts/index.blade.php b/skolehjem/resources/views/app/contacts/index.blade.php index 50a2741..816511d 100644 --- a/skolehjem/resources/views/app/contacts/index.blade.php +++ b/skolehjem/resources/views/app/contacts/index.blade.php @@ -5,25 +5,25 @@ @section("content")
-

Kontakt

+

{{__('msg.kontakt')}}

@if(!$contacts->isEmpty()) @foreach($contacts as $contact) -

Navn: {{ $contact->contactname }}

-

Email: {{ $contact->email }}

+

{{__('msg.navn')}}: {{ $contact->contactname }}

+

{{__('msg.email')}}: {{ $contact->email }}

{{ $contact->title }}

@if($contact->phonetimes) -

Telefontid:

+

{{__('msg.telefontid')}}:

{!! $contact->phonetimes !!} @endif @if($contact->phone) +45 {{ chunk_split($contact->phone, 2, ' ') }} - Ring + {{__('msg.ring')}} @endif @endforeach @else -

Der er ingen kontakter!

+

{{__('msg.dereringenkontakter')}}!

@endif - Send feedback omkring hvem el. hvad som helst - Giv Feedback + {{__('msg.sendfeedback')}} + {{__('msg.givfeedback')}}
@endsection diff --git a/skolehjem/resources/views/app/events/index.blade.php b/skolehjem/resources/views/app/events/index.blade.php index 164d4ff..debaba0 100644 --- a/skolehjem/resources/views/app/events/index.blade.php +++ b/skolehjem/resources/views/app/events/index.blade.php @@ -5,7 +5,7 @@ @section("content")
-

Aktiviteter

+

{{ __('msg.aktiviteter') }}

@if(!$events->isEmpty()) @foreach($events as $event)
@@ -16,12 +16,12 @@ {!! session()->get('error#' . $event->id) !!} {!! session()->get('signup#' . $event->id) !!} - +
@endforeach @else -

Der er ingen aktiviteter!

+

{{__('msg.dereringenaktiviteter')}}!

@endif - Se Tilmeldte Aktiviteter + {{__('msg.setilmeldteaktiviteter')}}
@endsection diff --git a/skolehjem/resources/views/app/events/yourevents.blade.php b/skolehjem/resources/views/app/events/yourevents.blade.php index 035cc5b..2b01287 100644 --- a/skolehjem/resources/views/app/events/yourevents.blade.php +++ b/skolehjem/resources/views/app/events/yourevents.blade.php @@ -5,7 +5,7 @@ @section("content")
-

Tilmeldte Aktiviteter

+

{{__('msg.tilmeldteaktiviteter')}}

{!! session()->get('eventunsubscribed') !!} @if(!$userevents->isEmpty()) @foreach($userevents as $userevent) @@ -19,8 +19,8 @@ @endforeach @else -

Du har ikke tilmeldt dig nogen aktiviteter!

+

{{__('msg.duharikketilmeldtdignogenaktiviteter')}}!

@endif - Tilbage + {{__('msg.tilbage')}}
@endsection diff --git a/skolehjem/resources/views/app/guides/index.blade.php b/skolehjem/resources/views/app/guides/index.blade.php index 09a3303..2c17dd1 100644 --- a/skolehjem/resources/views/app/guides/index.blade.php +++ b/skolehjem/resources/views/app/guides/index.blade.php @@ -11,7 +11,7 @@ }
-

Vejledninger

+

{{__('msg.vejledning')}}

@if(!$guides->isEmpty()) @foreach($guides as $guide)

{{ $guide->name }}

@@ -19,7 +19,7 @@
@endforeach @else -

Der er ingen vejledninger.

+

{{__('msg.dereringenvejledninger')}}.

@endif
@endsection diff --git a/skolehjem/resources/views/app/layout/base.blade.php b/skolehjem/resources/views/app/layout/base.blade.php index 7d29a33..efb0573 100644 --- a/skolehjem/resources/views/app/layout/base.blade.php +++ b/skolehjem/resources/views/app/layout/base.blade.php @@ -20,15 +20,15 @@ Menuplan - Menuplan + {{ __('msg.menuplan') }} Aktiviteter - Aktiviteter + {{ __('msg.aktiviteter') }} Reservationer - Reservationer + {{ __('msg.reservationer') }} {{-- MÅ IKKE SLETTES!!!! --}} {{-- --}} @@ -37,23 +37,23 @@ {{-- --}} Kontoret - Kontoret + {{ __('msg.kontoret') }} Vagttelefon - Vagttelefon + {{ __('msg.vagttelefon') }} Guide - Vejledninger + {{ __('msg.vejledning') }} Konto - Konto + {{ __('msg.konto') }} Logud - Log Ud + {{ __('msg.logud') }} diff --git a/skolehjem/resources/views/app/menuplans/index.blade.php b/skolehjem/resources/views/app/menuplans/index.blade.php index 639ee20..8a620ae 100644 --- a/skolehjem/resources/views/app/menuplans/index.blade.php +++ b/skolehjem/resources/views/app/menuplans/index.blade.php @@ -11,31 +11,31 @@ @if($menuPlans->contains('week', $Week)) {{-- If any of the menues in the menu table has the number of the week in the 'week' column, do this --}} @foreach($menuPlans as $menuplan) @if($menuplan->week == $Week) -

Menuplan

- Uge: {{$menuplan->week}} +

{{ __('msg.menuplan') }}

+ {{ __('msg.uge') }}: {{$menuplan->week}}
-

Mandag

+

{{ __('msg.mandag') }}

{{$menuplan->monday}}

-

Tirsdag

+

{{ __('msg.tirsdag') }}

{{$menuplan->tuesday}}

-

Onsdag

+

{{ __('msg.onsdag') }}

{{$menuplan->wednesday}}

-

Torsdag

+

{{ __('msg.torsdag') }}

{{$menuplan->thursday}}

@endif @endforeach @else -

Menuplan

-

Der er ingen menuplaner denne uge!

+

{{ __('msg.menuplan') }}

+

{{__('msg.dereringenmenuplanerdenneuge')}}!

@endif {{ $menuPlans->links() }} diff --git a/skolehjem/resources/views/app/users/account.blade.php b/skolehjem/resources/views/app/users/account.blade.php index 1f420db..79bc768 100644 --- a/skolehjem/resources/views/app/users/account.blade.php +++ b/skolehjem/resources/views/app/users/account.blade.php @@ -5,13 +5,50 @@ @endsection @section("content") +
-

Konto

-

Navn: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}

-

Email: {{ Auth::user()->email }}

-

Telefon Nr.: {{ Auth::user()->phone }}

+

{{__('msg.konto')}}

+

{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}

+

{{__('msg.email')}}: {{ Auth::user()->email }}

+

{{__('msg.telefon')}} Nr.: {{ Auth::user()->phone }}

{!! session()->get('success#credentialschanged') !!} - Rediger Oplysninger - Ændre Password + {{__('msg.redigeroplysninger')}} + {{__('msg.ændrepassword')}} + + +
+ + + @endsection diff --git a/skolehjem/resources/views/app/users/edit.blade.php b/skolehjem/resources/views/app/users/edit.blade.php index 6cdbf83..f6f8f33 100644 --- a/skolehjem/resources/views/app/users/edit.blade.php +++ b/skolehjem/resources/views/app/users/edit.blade.php @@ -6,18 +6,18 @@ @section("content")
-

Konto

+

{{__('msg.konto')}}

Auth::user()]) }}"> @csrf @method("put") - Navn: + {{__('msg.navn')}}: name_last }}" disabled> - Email: + {{__('msg.email')}}: - Telefon Nr.: + {{__('msg.telefon')}} Nr.: - - Tilbage + +
@endsection diff --git a/skolehjem/resources/views/app/users/editpass.blade.php b/skolehjem/resources/views/app/users/editpass.blade.php index 9497b5d..ecc20d4 100644 --- a/skolehjem/resources/views/app/users/editpass.blade.php +++ b/skolehjem/resources/views/app/users/editpass.blade.php @@ -6,29 +6,31 @@ @section("content")
-

Konto

+

{{__('msg.konto')}}

Auth::user()]) }}"> @csrf @method("put") - Nuværende Password: + {{__('msg.nuværendepassword')}}:
- Nyt Password: + {{__('msg.nytpassword')}}:
- Confirm Password: + {{__('msg.confirmpassword')}}:
{!! session()->get('error#notsamepass') !!} {!! session()->get('error#oldpass') !!} - + + {{__('msg.tilbage')}}
+