ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace lang with trans and escape html correctly for various views

This commit is contained in:
Jeremy Quinton 2018-09-09 11:51:20 +02:00
parent 562b8698dd
commit 920fbac64e
22 changed files with 36 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/lang/en/ManageEvent.php
View File

@ -13,7 +13,7 @@ return array (
'attendee_cancelled_help' => 'This attendee has been cancelled',
'attendees_file_requirements' => 'File must be .csv and the first line must contain first_name,last_name,email',
'attendize_qrcode_check_in' => 'Attendize QRCode Check-in',
'cancel_attendee_title' => 'Cancel <b>:cancel</b>b>',
'cancel_attendee_title' => 'Cancel <b>:cancel</b>',
'cancel_description' => 'Cancelling Attendees will remove them from the attendee list.',
'cancel_notify' => 'Notify <b>:name</b> their ticket has been cancelled.',
'cancel_order_:ref' => 'Cancel Order: <b>:ref</b>',
@ -61,7 +61,7 @@ return array (
'no_orders_yet_text' => 'New orders will appear here as they are created.',
'order_contact_will_receive_instructions' => 'The order contact will be instructed to send any reply to <b>:email</b>',
'order_details' => 'Order Details',
'order_overwiev' => 'Order Overview',
'order_overview' => 'Order Overview',
'order_ref' => 'Order: #:order_ref',
'order_refunded' => ':money of this order has been refunded.',
'price_placeholder' => 'E.g: 25.99',

2
resources/lang/pl/ManageEvent.php
View File

@ -58,7 +58,7 @@ return array (
'no_orders_yet_text' => 'Nowe zamówienia pojawią się, jak tylko zostaną złożone.',
'order_contact_will_receive_instructions' => 'Kontakt z zamówienia zostanie poinformowany o możliwości odpowiedzi na email <b>:email</b>',
'order_details' => 'Szczegóły Zamówienia',
'order_overwiev' => 'Przegląd Zamówienia',
'order_overview' => 'Przegląd Zamówienia',
'order_ref' => 'Zamówienie: #:order_ref',
'order_refunded' => ':money z tego zamówienia zostało zwróconych.',
'price_placeholder' => 'Np.: 25.99',

2
resources/views/Installer/AlreadyInstalled.blade.php
View File

@ -13,7 +13,7 @@
</div>
<h1>@lang("Installer.setup_completed")</h1>
<p>@lang("Installer.setup_completed_already_message")</p>
<p>{!! @trans("Installer.setup_completed_already_message") !!}</p>
</div>
</div>
</div>

2
resources/views/Installer/Installer.blade.php
View File

@ -216,7 +216,7 @@
'placeholder' => 'mail'
)) !!}
<div class="help-block">
@lang("Installer.mail_from_help")
{!! @trans("Installer.mail_from_help") !!}
</div>
</div>

9
resources/views/ManageAccount/Modals/EditAccount.blade.php
View File

@ -150,18 +150,17 @@
@lang("ManageAccount.version_up_to_date", ["installed" => $version_info['installed']])
@endif
</p>
<h4>
@lang("ManageAccount.licence_info")
{!! @trans("ManageAccount.licence_info") !!}
</h4>
<p>
@lang("ManageAccount.licence_info_description")
{!! @trans("ManageAccount.licence_info_description") !!}
</p>
<h4>
@lang("ManageAccount.open_source_soft")Open-source Software
{!! @trans("ManageAccount.open_source_soft") !!} Open-source Software
</h4>
<p>
@lang("ManageAccount.open_source_soft_description")
{!! @trans("ManageAccount.open_source_soft_description") !!}
</p>
</div>
</div>

6
resources/views/ManageEvent/Customize.blade.php
View File

@ -422,7 +422,7 @@
<h4>@lang("Fees.organiser_fees")</h4>
<div class="well">
@lang("Fees.organiser_fees_text")
{!! @trans("Fees.organiser_fees_text") !!}
</div>
<div class="form-group">
@ -432,7 +432,7 @@
'placeholder' => trans("Fees.service_fee_percentage_placeholder")
]) !!}
<div class="help-block">
@lang("Fees.service_fee_percentage_help")
{!! @trans("Fees.service_fee_percentage_help") !!}
</div>
</div>
<div class="form-group">
@ -442,7 +442,7 @@
'placeholder' => trans("Fees.service_fee_fixed_price_placeholder")
]) !!}
<div class="help-block">
@lang("Fees.service_fee_fixed_price_help", ["cur"=>$event->currency_symbol])
{!! @trans("Fees.service_fee_fixed_price_help", ["cur"=>$event->currency_symbol]) !!}
</div>
</div>
<div class="panel-footer mt15 text-right">

8
resources/views/ManageEvent/Modals/CancelAttendee.blade.php
View File

@ -6,7 +6,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-cancel"></i>
@lang("ManageEvent.cancel_attendee_title", ["cancel"=> $attendee->full_name])</h3>
{!! @trans("ManageEvent.cancel_attendee_title", ["cancel" => $attendee->full_name]) !!}</h3>
</div>
<div class="modal-body">
<p>
@ -14,20 +14,20 @@
</p>
<p>
@lang("ManageEvent.cancel_refund", ["url"=>route('showEventOrders', ['event_id' => $attendee->event->id, 'q' => $attendee->order->order_reference])])
{!! @trans("ManageEvent.cancel_refund", ["url"=>route('showEventOrders', ['event_id' => $attendee->event->id, 'q' => $attendee->order->order_reference])]) !!}
</p>
<br>
<div class="form-group">
<div class="checkbox custom-checkbox">
<input type="checkbox" name="notify_attendee" id="notify_attendee" value="1">
<label for="notify_attendee">&nbsp;&nbsp;@lang("ManageEvent.cancel_notify", ["name"=>$attendee->full_name])</label>
<label for="notify_attendee">{!! @trans("ManageEvent.cancel_notify", ["name"=>$attendee->full_name]) !!}</label>
</div>
</div>
@if(config('attendize.default_payment_gateway') == config('attendize.payment_gateway_stripe'))
<div class="form-group">
<div class="checkbox custom-checkbox">
<input type="checkbox" name="refund_attendee" id="refund_attendee" value="1">
<label for="refund_attendee">&nbsp;&nbsp;@lang("ManageEvent.cancel_refund_user", ["name"=>$attendee->full_name])</label>
<label for="refund_attendee">{!! @trans("ManageEvent.cancel_refund_user", ["name"=>$attendee->full_name]) !!}</label>
</div>
</div>
@endif

4
resources/views/ManageEvent/Modals/CancelOrder.blade.php
View File

@ -29,7 +29,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-cart2"></i>
@lang("ManageEvent.cancel_order_:ref", ["ref"=>$order->order_reference])</h3>
{!! @trans("ManageEvent.cancel_order_:ref", ["ref"=>$order->order_reference]) !!}</h3>
</div>
<div class="modal-body">
@ -168,7 +168,7 @@
</div>
@else
<div class="alert alert-info">
@lang("ManageEvent.cant_refund_here", ["gateway"=>$order->payment_gateway->provider_name])
{!! @trans("ManageEvent.cant_refund_here", ["gateway"=>$order->payment_gateway->provider_name]) !!}
</div>
@endif

2
resources/views/ManageEvent/Modals/EditAttendee.blade.php
View File

@ -6,7 +6,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-edit"></i>
@lang("ManageEvent.edit_attendee_title", ["attendee"=>$attendee->full_name])
{!! @trans("ManageEvent.edit_attendee_title", ["attendee"=>$attendee->full_name]) !!}
</h3>
</div>
<div class="modal-body">

2
resources/views/ManageEvent/Modals/EditOrder.blade.php
View File

@ -15,7 +15,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-cart"></i>
@lang("ManageEvent.edit_order_title", ["order_ref"=>$order->order_reference])
{!! @trans("ManageEvent.edit_order_title", ["order_ref"=>$order->order_reference]) !!}
</h3>
</div>
<div class="modal-body">

2
resources/views/ManageEvent/Modals/EditQuestion.blade.php
View File

@ -90,7 +90,7 @@
</label>
@foreach ($event->tickets as $ticket)
<div class="custom-checkbox mb5">
<input {{in_array($ticket->id, $question->tickets->lists('id')->toArray()) ? 'checked' : ''}} id="ticket_{{ $ticket->id }}" data-toggle="toggle" name="tickets[]" type="checkbox" value="{{ $ticket->id }}">
<input {{in_array($ticket->id, $question->tickets->pluck('id')->toArray()) ? 'checked' : ''}} id="ticket_{{ $ticket->id }}" data-toggle="toggle" name="tickets[]" type="checkbox" value="{{ $ticket->id }}">
<label for="ticket_{{ $ticket->id }}">&nbsp; {{ $ticket->title }}</label>
</div>
@endforeach

4
resources/views/ManageEvent/Modals/ManageOrder.blade.php
View File

@ -11,7 +11,7 @@
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h3 class="modal-title">
<i class="ico-cart"></i>
@lang("ManageEvent.manage_order_title", ["order_ref"=>$order->order_reference])
{!! @trans("ManageEvent.manage_order_title", ["order_ref"=>$order->order_reference]) !!}
</h3>
</div>
<div class="modal-body">
@ -29,7 +29,7 @@
<a data-id="{{ $order->id }}" data-route="{{ route('postMarkPaymentReceived', ['order_id' => $order->id]) }}" class="btn btn-primary btn-sm markPaymentReceived" href="javascript:void(0);">@lang("ManageEvent.mark_payment_received")</a>
@endif
<h3>@lang("ManageEvent.order_overwiev")</h3>
<h3>@lang("ManageEvent.order_overview")</h3>
<style>
.order_overview b {
text-transform: uppercase;

2
resources/views/ManageEvent/Modals/MessageAttendee.blade.php
View File

@ -40,7 +40,7 @@
</div>
<div class="help-block">
@lang("Message.before_send_message", ["organiser"=>$attendee->event->organiser->email])
{!! @trans("Message.before_send_message", ["organiser"=>$attendee->event->organiser->email]) !!}
</div>
</div> <!-- /end modal body-->
<div class="modal-footer">

2
resources/views/ManageEvent/Modals/MessageOrder.blade.php
View File

@ -43,7 +43,7 @@
</div>
<div class="help-block">
@lang("ManageEvent.order_contact_will_receive_instructions", ["email"=>$order->event->organiser->email])
{!! @trans("ManageEvent.order_contact_will_receive_instructions", ["email"=>$order->event->organiser->email]) !!}
</div>
</div> <!-- /end modal body-->

2
resources/views/ManageEvent/Modals/ResendTicketToAttendee.blade.php
View File

@ -11,7 +11,7 @@
</div>
<div class="modal-body">
<div class="help-block">
@lang("ManageEvent.resend_ticket_help", ["email"=>$attendee->email])
{!! @trans("ManageEvent.resend_ticket_help", ["email"=>$attendee->email]) !!}
</div>
</div> <!-- /end modal body-->
<div class="modal-footer">

2
resources/views/ManageEvent/Orders.blade.php
View File

@ -18,7 +18,7 @@
<i class='ico-cart mr5'></i>
@lang("Event.event_orders")
<span class="page_title_sub_title hide">
@lang("Event.showing_num_of_orders", [30, \App\Models\Order::scope()->count()])
{!! @trans("Event.showing_num_of_orders", [30, \App\Models\Order::scope()->count()]) !!}
</span>
@stop

2
resources/views/ManageEvent/Partials/TopNav.blade.php
View File

@ -6,7 +6,7 @@
}
</style>
<div class="alert alert-warning top_of_page_alert">
@lang("ManageEvent.event_not_live_with_activate", ["url"=>route('MakeEventLive', ['event_id' => $event->id])]) .
{!! @trans("ManageEvent.event_not_live_with_activate", ["url"=>route('MakeEventLive', ['event_id' => $event->id])]) !!} .
</div>
@endif
@stop

3
resources/views/ManageEvent/PrintAttendees.blade.php
View File

@ -19,7 +19,8 @@
</head>
<body style="background-color: #FFFFFF;" onload="window.print();">
<div class="well" style="border:none; margin: 0;">
@lang("Event.n_attendees_for_event", ["num"=>$attendees->count(), "name"=>$event->title, "date"=>$event->start_date->toDayDateTimeString()])<br>
{!! @trans("Event.n_attendees_for_event", ["num"=>$attendees->count(), "name"=>$event->title, "date"=>$event->start_date->toDayDateTimeString()]) !!}
<br>
</div>
<table class="table table-hover table-striped">

4
resources/views/ManageOrganiser/Dashboard.blade.php
View File

@ -119,9 +119,9 @@
<p class="list-group-text">
<a href="{{ route('showEventOrders', ['event_id' => $order->event_id, 'q' => $order->order_reference]) }}">
<b>#{{ $order->order_reference }}</b></a> -
@lang("Order.user_registered_n_tickets", ["name"=>$order->full_name,
{!! @trans("Order.user_registered_n_tickets", ["name"=>$order->full_name,
"url"=>route('showEventAttendees', ['event_id'=>$order->event->id,'q'=>$order->order_reference]),
"n"=>$order->attendees()->withTrashed()->count()])
"n"=>$order->attendees()->withTrashed()->count()]) !!}
</p>
<h6>
{{ $order->created_at->diffForHumans() }} &bull; <span

2
resources/views/Public/LoginAndRegister/Signup.blade.php
View File

@ -79,7 +79,7 @@
{!! Form::submit(trans("User.sign_up"), array('class'=>"btn btn-block btn-success")) !!}
</div>
<div class="signup">
<span>@lang("User.already_have_account", ["url"=>route("login")])</span>
<span>{!! @trans("User.already_have_account", ["url"=>route("login")]) !!}</span>
</div>
</div>
{!! Form::close() !!}

2
resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php
View File

@ -53,7 +53,7 @@
</div>
<div class="help-block">
@lang("Public_ViewEvent.time", ["time"=>"<span id='countdown'></span>"])
{!! @trans("Public_ViewEvent.time", ["time"=>"<span id='countdown'></span>"]) !!}
</div>
</div>
<div class="col-md-8 col-md-pull-4">

5
resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php
View File

@ -53,10 +53,9 @@
<span class="massive-icon">
<i class="ico ico-checkmark-circle"></i>
</span>
<h1>@lang("Public_ViewEvent.thank_you_for_your_order")</h1>
<h1>{!! @trans("Public_ViewEvent.thank_you_for_your_order") !!}</h1>
<h2>
@lang("Public_ViewEvent.download_links", ["title" => trans("Public_ViewEvent.download_tickets"), "url"=>route('showOrderTickets', ['order_reference' => $order->order_reference])."?download=1"])
{!! @trans("Public_ViewEvent.download_links", ["title" => trans("Public_ViewEvent.download_tickets"), "url"=>route('showOrderTickets', ['order_reference' => $order->order_reference])."?download=1"]) !!}
</h2>
</div>
</div>