Merge pull request #3 from sebathefox/Multi-language

v.0.5.8 - Multi language
This commit is contained in:
Neerholt
2020-08-07 08:53:29 +02:00
committed by GitHub
37 changed files with 295 additions and 74 deletions
@@ -5,25 +5,25 @@
@section("content")
<main>
<h1 class="text-center sde-blue mt-0 mb-0">Kontakt</h1>
<h1 class="text-center sde-blue mt-0 mb-0">{{__('msg.kontakt')}}</h1>
@if(!$contacts->isEmpty())
@foreach($contacts as $contact)
<h4 class="mt-2">Navn: {{ $contact->contactname }}</h4>
<h4 class="mt-0">Email: {{ $contact->email }}</h4>
<h4 class="mt-2">{{__('msg.navn')}}: {{ $contact->contactname }}</h4>
<h4 class="mt-0">{{__('msg.email')}}: {{ $contact->email }}</h4>
<h4 class="mt-0">{{ $contact->title }}</h4>
@if($contact->phonetimes)
<h4 class="mt-0 mb-0">Telefontid:</h4>
<h4 class="mt-0 mb-0">{{__('msg.telefontid')}}:</h4>
{!! $contact->phonetimes !!}
@endif
@if($contact->phone)
<span class="text-center sde-black-20 mt-1">+45 {{ chunk_split($contact->phone, 2, ' ') }}</span>
<a class="btn text-center btn-sde-blue mt-1" href="tel:+45{{ $contact->phone }}">Ring</a>
<a class="btn text-center btn-sde-blue mt-1" href="tel:+45{{ $contact->phone }}">{{__('msg.ring')}}</a>
@endif
@endforeach
@else
<p class="text-center">Der er ingen kontakter!</p>
<p class="text-center">{{__('msg.dereringenkontakter')}}!</p>
@endif
<span class="text-center sde-black-20 mt-1">Send feedback omkring hvem el. hvad som helst</span>
<a class="btn text-center btn-sde-blue mt-1" href="{{ route('feedbacks.create') }}">Giv Feedback</a>
<span class="text-center sde-black-20 mt-1">{{__('msg.sendfeedback')}}</span>
<a class="btn text-center btn-sde-blue mt-1" href="{{ route('feedbacks.create') }}">{{__('msg.givfeedback')}}</a>
</main>
@endsection
@@ -5,7 +5,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mb-0">Aktiviteter</h1>
<h1 class="text-center sde-blue mb-0">{{ __('msg.aktiviteter') }}</h1>
@if(!$events->isEmpty())
@foreach($events as $event)
<form method="get" action="{{ route("userevents.create") }}">
@@ -16,12 +16,12 @@
<input type="hidden" name="event_id" value="{{ $event->id }}">
{!! session()->get('error#' . $event->id) !!}
{!! session()->get('signup#' . $event->id) !!}
<button type="submit" class="btn text-center btn-sde-blue" id="tilmeld">Tilmeld</button>
<button type="submit" class="btn text-center btn-sde-blue" id="tilmeld">{{__('msg.tilmelde')}}</button>
</form>
@endforeach
@else
<p class="text-center">Der er ingen aktiviteter!</p>
<p class="text-center">{{__('msg.dereringenaktiviteter')}}!</p>
@endif
<a href="{{ route("userevents.index") }}" type="submit" class="mt-2 btn text-center btn-sde-blue" id="tilmeld">Se Tilmeldte Aktiviteter</a>
<a href="{{ route("userevents.index") }}" type="submit" class="mt-2 btn text-center btn-sde-blue" id="tilmeld">{{__('msg.setilmeldteaktiviteter')}}</a>
</main>
@endsection
@@ -5,7 +5,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mb-0">Tilmeldte Aktiviteter</h1>
<h1 class="text-center sde-blue mb-0">{{__('msg.tilmeldteaktiviteter')}}</h1>
{!! session()->get('eventunsubscribed') !!}
@if(!$userevents->isEmpty())
@foreach($userevents as $userevent)
@@ -19,8 +19,8 @@
</form>
@endforeach
@else
<p class="text-center">Du har ikke tilmeldt dig nogen aktiviteter!</p>
<p class="text-center">{{__('msg.duharikketilmeldtdignogenaktiviteter')}}!</p>
@endif
<a href="{{ route("events.index") }}" type="submit" class="mt-2 btn text-center btn-sde-blue">Tilbage</a>
<a href="{{ route("events.index") }}" type="submit" class="mt-2 btn text-center btn-sde-blue">{{__('msg.tilbage')}}</a>
</main>
@endsection
@@ -11,7 +11,7 @@
}
</style>
<main>
<h1 class="text-center sde-blue mt-0">Vejledninger</h1>
<h1 class="text-center sde-blue mt-0">{{__('msg.vejledning')}}</h1>
@if(!$guides->isEmpty())
@foreach($guides as $guide)
<h2 class="text-center sde-blue mt-0">{{ $guide->name }}</h2>
@@ -19,7 +19,7 @@
<hr class="w-100">
@endforeach
@else
<p style="margin: 0 18px;">Der er ingen vejledninger.</p>
<p style="margin: 0 18px;">{{__('msg.dereringenvejledninger')}}.</p>
@endif
</main>
@endsection
@@ -20,15 +20,15 @@
<a href="{{ route("menu-plans.index") }}">
<img src="{{URL::asset('/images/icons/Menuplan.svg')}}" alt="Menuplan">
Menuplan
{{ __('msg.menuplan') }}
</a>
<a href="{{ route("events.index") }}">
<img src="{{URL::asset('/images/icons/Aktiviteter.svg')}}" alt="Aktiviteter">
Aktiviteter
{{ __('msg.aktiviteter') }}
</a>
<a href="{{ route("washing-reservations.appindex") }}">
<img src="{{URL::asset('/images/icons/Vaske booking liste.svg')}}" alt="Reservationer">
Reservationer
{{ __('msg.reservationer') }}
</a>
{{-- IKKE SLETTES!!!! --}}
{{-- <a href="# ">--}}
@@ -37,23 +37,23 @@
{{-- </a>--}}
<a href="{{ route("contacts.index") }}">
<img src="{{URL::asset('/images/icons/Kontoret.svg')}}" alt="Kontoret">
Kontoret
{{ __('msg.kontoret') }}
</a>
<a href="{{ route("phones.index") }}">
<img src="{{URL::asset('/images/icons/Vagttelefon-hvid.svg')}}" alt="Vagttelefon">
Vagttelefon
{{ __('msg.vagttelefon') }}
</a>
<a href="{{ route("guides.index") }}">
<img src="{{URL::asset('/images/icons/Vejledninger.svg')}}" alt="Guide">
Vejledninger
{{ __('msg.vejledning') }}
</a>
<a href="{{ route("users.account") }}">
<img src="{{URL::asset('/images/icons/user-hvid.svg')}}" alt="Konto">
Konto
{{ __('msg.konto') }}
</a>
<a href="{{ route('users.logout') }}">
<img src="{{URL::asset('/images/icons/Logout.svg')}}" alt="Logud">
Log Ud
{{ __('msg.logud') }}
</a>
</div>
@@ -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)
<h1 class="text-center sde-blue mb-0">Menuplan</h1>
<span class="text-center sde-black-80 bold">Uge: {{$menuplan->week}}</span>
<h1 class="text-center sde-blue mb-0">{{ __('msg.menuplan') }}</h1>
<span class="text-center sde-black-80 bold">{{ __('msg.uge') }}: {{$menuplan->week}}</span>
<div class="col w-100 mt-auto text-center">
<div class="w-100" id="mandag">
<h3 class="sde-blue bold mb-0">Mandag</h3>
<h3 class="sde-blue bold mb-0">{{ __('msg.mandag') }}</h3>
<p>{{$menuplan->monday}}</p>
</div>
<div class="w-100" id="tirsdag">
<h3 class="sde-blue bold mb-0">Tirsdag</h3>
<h3 class="sde-blue bold mb-0">{{ __('msg.tirsdag') }}</h3>
<p>{{$menuplan->tuesday}}</p>
</div>
<div class="w-100" id="onsdag">
<h3 class="sde-blue bold mb-0">Onsdag</h3>
<h3 class="sde-blue bold mb-0">{{ __('msg.onsdag') }}</h3>
<p>{{$menuplan->wednesday}}</p>
</div>
<div class="w-100" id="torsdag">
<h3 class="sde-blue bold mb-0">Torsdag</h3>
<h3 class="sde-blue bold mb-0">{{ __('msg.torsdag') }}</h3>
<p>{{$menuplan->thursday}}</p>
</div>
</div>
@endif
@endforeach
@else
<h1 class="text-center sde-blue mb-0">Menuplan</h1>
<p class="text-center">Der er ingen menuplaner denne uge!</p>
<h1 class="text-center sde-blue mb-0">{{ __('msg.menuplan') }}</h1>
<p class="text-center">{{__('msg.dereringenmenuplanerdenneuge')}}!</p>
@endif
</main>
{{ $menuPlans->links() }}
@@ -5,13 +5,50 @@
@endsection
@section("content")
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
<main>
<h1 class="text-center sde-blue mt-0">Konto</h1>
<h4 class="mt-0">Navn: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}</h4>
<h4 class="mt-0">Email: {{ Auth::user()->email }}</h4>
<h4 class="mt-0">Telefon Nr.: {{ Auth::user()->phone }}</h4>
<h1 class="text-center sde-blue mt-0">{{__('msg.konto')}}</h1>
<h4 class="mt-0">{{__('msg.navn')}}: {{ Auth::user()->name_first . " " . Auth::user()->name_last }}</h4>
<h4 class="mt-0">{{__('msg.email')}}: {{ Auth::user()->email }}</h4>
<h4 class="mt-0">{{__('msg.telefon')}} Nr.: {{ Auth::user()->phone }}</h4>
{!! session()->get('success#credentialschanged') !!}
<a class="btn text-center btn-sde-blue mt-1" href="{{ route("users.accountedit") }}">Rediger Oplysninger</a>
<a class="btn text-center btn-sde-blue mt-1" href="{{ route("users.accounteditpass") }}">Ændre Password</a>
<a class="btn text-center btn-sde-blue mt-1" href="{{ route("users.accountedit") }}">{{__('msg.redigeroplysninger')}}</a>
<a class="btn text-center btn-sde-blue mt-1" href="{{ route("users.accounteditpass") }}">{{__('msg.ændrepassword')}}</a>
<label for="langu">Sprog / Languages:</label>
<select name="langName" id="lang">
@if(request()->cookie('languagesSetting') == "dk")
<option selected name="langDK" value="dk">Dansk</option>
@else
<option name="langDK" value="dk">Dansk</option>
@endif
@if(request()->cookie('languagesSetting') == "en")
<option selected name="langEN" value="en">English</option>
@else
<option name="langEN" value="en">English</option>
@endif
</select>
</main>
<script>
$(document).ready(function (){
$('#lang').change(function () {
$value = $('#lang').find(":selected").val();
$.ajax({
type: 'get',
url: '{{route('users.setLanguages')}}',
data: {'lang':$value},
success:function (data) {
console.log($value);
location.reload();
},
error:function (data) {
console.log(data);
}
});
})
})
</script>
@endsection
@@ -6,18 +6,18 @@
@section("content")
<main>
<h1 class="text-center sde-blue mt-0">Konto</h1>
<h1 class="text-center sde-blue mt-0">{{__('msg.konto')}}</h1>
<form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}">
@csrf
@method("put")
<span>Navn:</span>
<span>{{__('msg.navn')}}:</span>
<input type="text" value="{{ Auth::user()->name_first . " " . Auth::user()->name_last }}" disabled>
<span>Email:</span>
<span>{{__('msg.email')}}:</span>
<input type="email" name="email" id="email" value="{{ Auth::user()->email }}" required>
<span>Telefon Nr.:</span>
<span>{{__('msg.telefon')}} Nr.:</span>
<input type="text" name="phone" id="phone" value="{{ Auth::user()->phone }}" required>
<button type="submit" class="btn text-center btn-sde-blue mt-1">Rediger</button>
<a href="{{ route('users.account') }}" class="btn text-center btn-sde-blue mt-1">Tilbage</a>
<button type="submit" class="btn text-center btn-sde-blue mt-1">{{__('msg.rediger')}}</button>
<button onclick="window.location.href = '{{ route('users.account') }}';" class="btn text-center btn-sde-blue mt-1">{{__('msg.tilbage')}}</button>
</form>
</main>
@endsection
@@ -6,29 +6,31 @@
@section("content")
<main>
<h1 class="text-center sde-blue mt-0">Konto</h1>
<h1 class="text-center sde-blue mt-0">{{__('msg.konto')}}</h1>
<form method="post" action="{{ route("users.accountupdate", ['user' => Auth::user()]) }}">
@csrf
@method("put")
<span>Nuværende Password:</span>
<span>{{__('msg.nuværendepassword')}}:</span>
<div class="input-group text-left">
<input type="password" class="form-control" name="oldpassword" id="old" placeholder="******">
<span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-old" onclick="show('old', 'fa-old')"></span>
</div>
<span>Nyt Password:</span>
<span>{{__('msg.nytpassword')}}:</span>
<div class="input-group text-left">
<input type="password" class="form-control" name="password" id="new" placeholder="******" required>
<span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-new" onclick="show('new', 'fa-new')"></span>
</div>
<span>Confirm Password:</span>
<span>{{__('msg.confirmpassword')}}:</span>
<div class="input-group text-left">
<input type="password" class="form-control" name="confirmpassword" id="confirm" placeholder="******" required>
<span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-confirm" onclick="show('confirm', 'fa-confirm')"></span>
</div>
{!! session()->get('error#notsamepass') !!}
{!! session()->get('error#oldpass') !!}
<button type="submit" class="btn text-center btn-sde-blue mt-1">Rediger</button>
<button type="submit" class="btn text-center btn-sde-blue mt-1">{{__('msg.rediger')}}</button>
<a href="{{ route('users.account') }}" class="btn text-center btn-sde-blue mt-1">{{__('msg.tilbage')}}</a>
</form>
</main>
<style>
input {
@@ -3,12 +3,12 @@
@section('content')
<main id="main" style="justify-content: space-between;">
<div class="d-flex col block-container mt-2">
<a href="{{ route('menu-plans.index') }}" class="block text-center mb-1">Menuplan</a>
<a href="{{ route('events.index') }}" class="block text-center mb-1">Aktiviteter</a>
<a href="{{ route('washing-reservations.appindex') }}" class="block text-center mb-1">Reservationer</a>
<a href="{{ route('contacts.index') }}" class="block text-center mb-1">Kontoret</a>
<a href="{{ route('phones.index') }}" class="block text-center mb-1">Vagttelefon</a>
<a href="{{ route('guides.index') }}" class="block text-center mb-1">Vejledninger</a>
<a href="{{ route('menu-plans.index') }}" class="block text-center mb-1">{{ __('msg.menuplan') }}</a>
<a href="{{ route('events.index') }}" class="block text-center mb-1">{{ __('msg.aktiviteter') }}</a>
<a href="{{ route('washing-reservations.appindex') }}" class="block text-center mb-1">{{ __('msg.reservationer') }}</a>
<a href="{{ route('contacts.index') }}" class="block text-center mb-1">{{ __('msg.kontoret') }}</a>
<a href="{{ route('phones.index') }}" class="block text-center mb-1">{{ __('msg.vagttelefon') }}</a>
<a href="{{ route('guides.index') }}" class="block text-center mb-1">{{ __('msg.vejledning') }}</a>
</div>
<div class="row" style="align-self: center; margin: 8px 0 8px 0;">
<a href="https://www.facebook.com" target="_blank" class="link">
@@ -6,16 +6,16 @@
@section("content")
<main>
<img class="mt-3" src="{{ URL::asset('/images/icons/Vagttelefon-normal.svg') }}" alt="Vagttelefon" style="height: 16vw;">
<h1 class="text-center sde-blue mt-0">Vagttelefon</h1>
<h1 class="text-center sde-blue mt-0">{{__('msg.vagttelefon')}}</h1>
<p class="mt-0">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nunc sodales pulvinar congue aenean suspendisse.</p>
<label class="toggle">
<input class="toggle__input" type="checkbox" name="accept" id="input" onclick="check()">
<span class="toggle__label sde-blue">
<span class="toggle__text sde-blue semi-bold">Accepterer</span>
<span class="toggle__text sde-blue semi-bold">{{__('msg.accepterer')}}</span>
</span>
</label>
<span class="text-center sde-black-20 mt-2">+45 56 30 45 66</span>
<a class="btn text-center btn-sde-blue btn-disabled" id="call">Tilkald</a>
<span class="text-center sde-black-20 mt-2">+45 24 62 94 50</span>
<a class="btn text-center btn-sde-blue btn-disabled" id="call">{{__('msg.ring')}}</a>
</main>
@endsection
@@ -6,7 +6,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mb-0">Booking Liste</h1>
<h1 class="text-center sde-blue mb-0">{{__('msg.bookingliste')}}</h1>
{!! session()->get('ReservationExists') !!}
<div class="col w-100 mt-auto">
<div class="calendar-container">
@@ -30,7 +30,7 @@
@csrf
</form>
@if(count(\App\WashingMachine::all()) < 1)
<p style="margin: 0 18px;">Der er ingen vaskemaskiner.</p>
<p style="margin: 0 18px;">{{__('msg.dereringenvaskemaskiner')}}.</p>
@endif
</div>
</main>
@@ -47,7 +47,7 @@
return moment(index, "e").locale("da").startOf("week").weekday(index).format("ddd");
});
document.getElementById("title").innerHTML = 'Uge ' + moment().locale("da").day(weekDays[0]).week(week).isoWeek().toString();
document.getElementById("title").innerHTML = '{{__('msg.ugestor')}} ' + moment().locale("da").day(weekDays[0]).week(week).isoWeek().toString();
const calendar = document.getElementById("calendar");
@@ -160,7 +160,7 @@
else {
let span = document.createElement("span");
span.classList.add("events__title");
span.innerText = "Maskiner";
span.innerText = "{{__('msg.maskiner')}}";
let select = document.createElement("select");
select.classList.add("events__title");
@@ -181,7 +181,7 @@
else {
let span = document.createElement("span");
span.classList.add("events__title");
span.innerText = "Tilgængelige tider";
span.innerText = "{{__('msg.tilgængeligetider')}}";
let select = document.createElement("select");
select.classList.add("events__title");
@@ -199,7 +199,7 @@
let button = document.createElement("button");
button.id = "create-reservation";
button.innerText = "Reserver";
button.innerText = "{{__('msg.reserver')}}";
button.type = "submit";
container.appendChild(button);
@@ -5,25 +5,25 @@
@section("content")
<main style="min-height: calc(100% - 61.34px);">
<h2 class="text-center sde-blue mb-0">Dine reservationer</h2>
<h2 class="text-center sde-blue mb-0">{{__('msg.dinereservationer')}}</h2>
@foreach($reservations as $reservation)
<div class="reservation" style="margin: 0 32px 1.75rem 32px;">
<h3>{{ \App\WashingMachine::query()->find($reservation->machine_id)->name }}</h3>
<div class="row align-items-center">
<span style="font-size: 4vw"><b>Tid:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</span>
<span style="font-size: 4vw"><b>{{__('msg.tid')}}:</b> {{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($reservation->time))->format('d/m/Y \k\l\. H:i') }}</span>
<form class="ml-auto" method="post" action="{{ route("washing-reservations.destroy", [ "washing_reservation" => $reservation ]) }}">
@csrf
@method("delete")
<input type="hidden" name="id" value="{{ $reservation->id }}">
<button class="btn btn-sde-blue mb-0" type="submit" onclick="return confirm('Are you sure you want to remove this reservation?');">Fjern</button>
<button class="btn btn-sde-blue mb-0" type="submit" onclick="return confirm('Are you sure you want to remove this reservation?');">{{__('msg.fjern')}}</button>
</form>
</div>
</div>
@endforeach
@if(count($reservations) < 1)
<p style="margin: 0 18px;">Du har ingen reservationer.</p>
<p style="margin: 0 18px;">{{__('msg.duharingenreservationer')}}.</p>
@endif
<a href="{{ route("washing-reservations.create") }}" class="btn btn-sde-blue mt-auto mb-1">Reserver vaskemaskine</a>
<a href="{{ route("washing-reservations.create") }}" class="btn btn-sde-blue mt-auto mb-1">{{__('msg.reservervaskemaskine')}}</a>
</main>
@endsection