v0.5.7 - Add the last support for english

This commit is contained in:
Neerholt 2020-08-06 20:33:46 +02:00
parent f96d23814b
commit 23929310f7
12 changed files with 126 additions and 62 deletions

View File

@ -10,6 +10,38 @@ return[
"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",
];

View File

@ -16,7 +16,40 @@ return[
"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",
];

View File

@ -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

View File

@ -15,7 +15,7 @@
<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

View File

@ -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

View File

@ -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

View File

@ -7,28 +7,28 @@
@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
<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>
</select>
</main>
<script>
@ -40,7 +40,7 @@
url: '{{route('users.setLanguages')}}',
data: {'lang':$value},
success:function (data) {
console.log($value);
console.log($value);
location.reload();
},
error:function (data) {
@ -51,6 +51,4 @@
})
</script>
@endsection

View File

@ -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>
<a href="{{ route('users.account') }}" class="btn text-center btn-sde-blue mt-1">{{__('msg.tilbage')}}</a>
</form>
</main>
@endsection

View File

@ -6,29 +6,30 @@
@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>
</form>
<a href="{{ route('users.account') }}" class="btn text-center btn-sde-blue mt-1">{{__('msg.tilbage')}}</a>
</main>
<style>
input {

View File

@ -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

View File

@ -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");
@ -133,7 +133,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");
@ -154,7 +154,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");
@ -172,7 +172,7 @@
let button = document.createElement("button");
button.id = "create-reservation";
button.innerText = "Reserver";
button.innerText = "{{__('msg.reserver')}}";
button.type = "submit";
container.appendChild(button);

View File

@ -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