v0.5.9 - Fixed en/dk messages + added backend en/dk messages

This commit is contained in:
Anders
2020-08-07 10:51:10 +02:00
parent b5fb505eaa
commit a23337b9d4
12 changed files with 75 additions and 42 deletions
+13 -9
View File
@@ -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",
+9 -9
View File
@@ -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",
];
@@ -22,12 +22,12 @@
<input type="text" name="name_last" id="name_last" placeholder="Efternavn" required>
<label for="email">Email:</label>
<input type="email" name="email" id="email" placeholder="x@y.z" required>
<label for="password1">Password:</label>
<label for="password1">Adgangskode:</label>
<div class="input-group text-left">
<input type="password" class="form-control" name="password" id="password1" placeholder="******" required>
<span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-new" onclick="show('password1', 'fa-new')"></span>
</div>
<label for="password2">Confirm Password:</label>
<label for="password2">Bekræft Adgangskode:</label>
<div class="input-group text-left">
<input type="password" class="form-control" name="password2" id="password2" placeholder="******" required>
<span class="fa fa-fw fa-eye field-icon toggle-password" id="fa-confirm" onclick="show('password2', 'fa-confirm')"></span>
@@ -5,7 +5,7 @@
@section("content")
<main>
<h1 class="text-center sde-blue mt-0 mb-0">{{__('msg.kontakt')}}</h1>
<h1 class="text-center sde-blue mt-0 mb-0">{{__('msg.kontakter')}}</h1>
@if(!$contacts->isEmpty())
@foreach($contacts as $contact)
<h4 class="mt-2">{{__('msg.navn')}}: {{ $contact->contactname }}</h4>
@@ -16,7 +16,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">{{__('msg.tilmelde')}}</button>
<button type="submit" class="btn text-center btn-sde-blue" id="tilmeld">{{__('msg.tilmeld')}}</button>
</form>
@endforeach
@else
@@ -15,7 +15,7 @@
<h3 class="sde-blue bold text-center mb-0">{{$userevent->name}}</h3>
<p class="text-center mt-0">{{ \Illuminate\Support\Facades\Date::createFromTimeStamp(strtotime($userevent->date))->format('d/m/Y \k\l\. H:i') }}</p>
<p class="text-center">{!! $userevent->description !!}</p>
<button type="submit" class="btn text-center btn-sde-blue" onclick="return confirm('Are you sure you want to remove this event?');">Afmeld</button>
<button type="submit" class="btn text-center btn-sde-blue" onclick="return confirm('Are you sure you want to remove this event?');">{{__('msg.afmeld')}}</button>
</form>
@endforeach
@else
@@ -9,11 +9,12 @@
<div class="brand">
<img src="{{URL::asset('/images/logos/Logo-hvid.svg')}}" alt="Syddansk Erhvervsskole">
</div>
<form action="" method="post">
<form action="{{ route('users.forgot') }}" method="post">
@csrf
<input class="appinput" type="email" name="email" placeholder="Email" required>
{!! session()->get('errornosuchuser') !!}
<input class="btn btn-dark" type="submit" value="Send reset mail">
<button class="btn btn-dark" onclick="window.location.href = '{{ route("users.login") }}';">Tilbage</button>
<a class="btn btn-dark text-center" href="{{ route("users.login") }}">Tilbage</a>
</form>
</main>
@endsection
@@ -11,7 +11,7 @@
<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">{{__('msg.accepterer')}}</span>
<span class="toggle__text sde-blue semi-bold">{{__('msg.accepter')}}</span>
</span>
</label>
<span class="text-center sde-black-20 mt-2">+45 24 62 94 50</span>
@@ -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");