From 920fbac64e1a6b2c263989cd5a34c696f19578c8 Mon Sep 17 00:00:00 2001 From: Jeremy Quinton Date: Sun, 9 Sep 2018 11:51:20 +0200 Subject: [PATCH] replace lang with trans and escape html correctly for various views --- resources/lang/en/ManageEvent.php | 4 ++-- resources/lang/pl/ManageEvent.php | 2 +- resources/views/Installer/AlreadyInstalled.blade.php | 2 +- resources/views/Installer/Installer.blade.php | 2 +- .../views/ManageAccount/Modals/EditAccount.blade.php | 9 ++++----- resources/views/ManageEvent/Customize.blade.php | 6 +++--- .../views/ManageEvent/Modals/CancelAttendee.blade.php | 8 ++++---- resources/views/ManageEvent/Modals/CancelOrder.blade.php | 4 ++-- .../views/ManageEvent/Modals/EditAttendee.blade.php | 2 +- resources/views/ManageEvent/Modals/EditOrder.blade.php | 2 +- .../views/ManageEvent/Modals/EditQuestion.blade.php | 2 +- resources/views/ManageEvent/Modals/ManageOrder.blade.php | 4 ++-- .../views/ManageEvent/Modals/MessageAttendee.blade.php | 2 +- .../views/ManageEvent/Modals/MessageOrder.blade.php | 2 +- .../ManageEvent/Modals/ResendTicketToAttendee.blade.php | 2 +- resources/views/ManageEvent/Orders.blade.php | 2 +- resources/views/ManageEvent/Partials/TopNav.blade.php | 2 +- resources/views/ManageEvent/PrintAttendees.blade.php | 3 ++- resources/views/ManageOrganiser/Dashboard.blade.php | 4 ++-- resources/views/Public/LoginAndRegister/Signup.blade.php | 2 +- .../ViewEvent/Partials/EventCreateOrderSection.blade.php | 2 +- .../ViewEvent/Partials/EventViewOrderSection.blade.php | 5 ++--- 22 files changed, 36 insertions(+), 37 deletions(-) diff --git a/resources/lang/en/ManageEvent.php b/resources/lang/en/ManageEvent.php index fc25af16..10b54ddc 100644 --- a/resources/lang/en/ManageEvent.php +++ b/resources/lang/en/ManageEvent.php @@ -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 :cancelb>', + 'cancel_attendee_title' => 'Cancel :cancel', 'cancel_description' => 'Cancelling Attendees will remove them from the attendee list.', 'cancel_notify' => 'Notify :name their ticket has been cancelled.', 'cancel_order_:ref' => 'Cancel Order: :ref', @@ -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 :email', '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', diff --git a/resources/lang/pl/ManageEvent.php b/resources/lang/pl/ManageEvent.php index 19a97ddd..82b74952 100644 --- a/resources/lang/pl/ManageEvent.php +++ b/resources/lang/pl/ManageEvent.php @@ -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 :email', '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', diff --git a/resources/views/Installer/AlreadyInstalled.blade.php b/resources/views/Installer/AlreadyInstalled.blade.php index b27c180a..b77d77f3 100644 --- a/resources/views/Installer/AlreadyInstalled.blade.php +++ b/resources/views/Installer/AlreadyInstalled.blade.php @@ -13,7 +13,7 @@

@lang("Installer.setup_completed")

-

@lang("Installer.setup_completed_already_message")

+

{!! @trans("Installer.setup_completed_already_message") !!}

diff --git a/resources/views/Installer/Installer.blade.php b/resources/views/Installer/Installer.blade.php index 13880b61..6d4468e7 100644 --- a/resources/views/Installer/Installer.blade.php +++ b/resources/views/Installer/Installer.blade.php @@ -216,7 +216,7 @@ 'placeholder' => 'mail' )) !!}
- @lang("Installer.mail_from_help") + {!! @trans("Installer.mail_from_help") !!}
diff --git a/resources/views/ManageAccount/Modals/EditAccount.blade.php b/resources/views/ManageAccount/Modals/EditAccount.blade.php index 1e66157d..19e8366e 100644 --- a/resources/views/ManageAccount/Modals/EditAccount.blade.php +++ b/resources/views/ManageAccount/Modals/EditAccount.blade.php @@ -150,18 +150,17 @@ @lang("ManageAccount.version_up_to_date", ["installed" => $version_info['installed']]) @endif

-

- @lang("ManageAccount.licence_info") + {!! @trans("ManageAccount.licence_info") !!}

- @lang("ManageAccount.licence_info_description") + {!! @trans("ManageAccount.licence_info_description") !!}

- @lang("ManageAccount.open_source_soft")Open-source Software + {!! @trans("ManageAccount.open_source_soft") !!} Open-source Software

- @lang("ManageAccount.open_source_soft_description") + {!! @trans("ManageAccount.open_source_soft_description") !!}

diff --git a/resources/views/ManageEvent/Customize.blade.php b/resources/views/ManageEvent/Customize.blade.php index f18f9ec0..8855f0d0 100644 --- a/resources/views/ManageEvent/Customize.blade.php +++ b/resources/views/ManageEvent/Customize.blade.php @@ -422,7 +422,7 @@

@lang("Fees.organiser_fees")

- @lang("Fees.organiser_fees_text") + {!! @trans("Fees.organiser_fees_text") !!}
@@ -432,7 +432,7 @@ 'placeholder' => trans("Fees.service_fee_percentage_placeholder") ]) !!}
- @lang("Fees.service_fee_percentage_help") + {!! @trans("Fees.service_fee_percentage_help") !!}
@@ -442,7 +442,7 @@ 'placeholder' => trans("Fees.service_fee_fixed_price_placeholder") ]) !!}
- @lang("Fees.service_fee_fixed_price_help", ["cur"=>$event->currency_symbol]) + {!! @trans("Fees.service_fee_fixed_price_help", ["cur"=>$event->currency_symbol]) !!}
diff --git a/resources/views/ManageEvent/Modals/CancelAttendee.blade.php b/resources/views/ManageEvent/Modals/CancelAttendee.blade.php index 0293af31..0e7b8085 100644 --- a/resources/views/ManageEvent/Modals/CancelAttendee.blade.php +++ b/resources/views/ManageEvent/Modals/CancelAttendee.blade.php @@ -6,7 +6,7 @@

- @lang("ManageEvent.cancel_attendee_title", ["cancel"=> $attendee->full_name])

+ {!! @trans("ManageEvent.cancel_attendee_title", ["cancel" => $attendee->full_name]) !!}

@@ -14,20 +14,20 @@

- @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])]) !!}


- +
@if(config('attendize.default_payment_gateway') == config('attendize.payment_gateway_stripe'))
- +
@endif diff --git a/resources/views/ManageEvent/Modals/CancelOrder.blade.php b/resources/views/ManageEvent/Modals/CancelOrder.blade.php index 3e3109dd..e1b19184 100644 --- a/resources/views/ManageEvent/Modals/CancelOrder.blade.php +++ b/resources/views/ManageEvent/Modals/CancelOrder.blade.php @@ -29,7 +29,7 @@

- @lang("ManageEvent.cancel_order_:ref", ["ref"=>$order->order_reference])

+ {!! @trans("ManageEvent.cancel_order_:ref", ["ref"=>$order->order_reference]) !!}
@@ -168,7 +168,7 @@
@else
- @lang("ManageEvent.cant_refund_here", ["gateway"=>$order->payment_gateway->provider_name]) + {!! @trans("ManageEvent.cant_refund_here", ["gateway"=>$order->payment_gateway->provider_name]) !!}
@endif diff --git a/resources/views/ManageEvent/Modals/EditAttendee.blade.php b/resources/views/ManageEvent/Modals/EditAttendee.blade.php index 52905839..f31750b3 100644 --- a/resources/views/ManageEvent/Modals/EditAttendee.blade.php +++ b/resources/views/ManageEvent/Modals/EditAttendee.blade.php @@ -6,7 +6,7 @@

- @lang("ManageEvent.edit_attendee_title", ["attendee"=>$attendee->full_name]) + {!! @trans("ManageEvent.edit_attendee_title", ["attendee"=>$attendee->full_name]) !!}

diff --git a/resources/views/ManageEvent/Modals/EditOrder.blade.php b/resources/views/ManageEvent/Modals/EditOrder.blade.php index 4c8dfba8..b236db6b 100644 --- a/resources/views/ManageEvent/Modals/EditOrder.blade.php +++ b/resources/views/ManageEvent/Modals/EditOrder.blade.php @@ -15,7 +15,7 @@

- @lang("ManageEvent.edit_order_title", ["order_ref"=>$order->order_reference]) + {!! @trans("ManageEvent.edit_order_title", ["order_ref"=>$order->order_reference]) !!}

diff --git a/resources/views/ManageEvent/Modals/EditQuestion.blade.php b/resources/views/ManageEvent/Modals/EditQuestion.blade.php index 6d9030da..e84accfc 100644 --- a/resources/views/ManageEvent/Modals/EditQuestion.blade.php +++ b/resources/views/ManageEvent/Modals/EditQuestion.blade.php @@ -90,7 +90,7 @@ @foreach ($event->tickets as $ticket)
- id, $question->tickets->lists('id')->toArray()) ? 'checked' : ''}} id="ticket_{{ $ticket->id }}" data-toggle="toggle" name="tickets[]" type="checkbox" value="{{ $ticket->id }}"> + id, $question->tickets->pluck('id')->toArray()) ? 'checked' : ''}} id="ticket_{{ $ticket->id }}" data-toggle="toggle" name="tickets[]" type="checkbox" value="{{ $ticket->id }}">
@endforeach diff --git a/resources/views/ManageEvent/Modals/ManageOrder.blade.php b/resources/views/ManageEvent/Modals/ManageOrder.blade.php index ea3295d7..ef024327 100644 --- a/resources/views/ManageEvent/Modals/ManageOrder.blade.php +++ b/resources/views/ManageEvent/Modals/ManageOrder.blade.php @@ -11,7 +11,7 @@

- @lang("ManageEvent.manage_order_title", ["order_ref"=>$order->order_reference]) + {!! @trans("ManageEvent.manage_order_title", ["order_ref"=>$order->order_reference]) !!}

@@ -29,7 +29,7 @@ @lang("ManageEvent.mark_payment_received") @endif -

@lang("ManageEvent.order_overwiev")

+

@lang("ManageEvent.order_overview")

- @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])]) !!} .
@endif @stop diff --git a/resources/views/ManageEvent/PrintAttendees.blade.php b/resources/views/ManageEvent/PrintAttendees.blade.php index 414f0465..8a9f4409 100644 --- a/resources/views/ManageEvent/PrintAttendees.blade.php +++ b/resources/views/ManageEvent/PrintAttendees.blade.php @@ -19,7 +19,8 @@
- @lang("Event.n_attendees_for_event", ["num"=>$attendees->count(), "name"=>$event->title, "date"=>$event->start_date->toDayDateTimeString()])
+ {!! @trans("Event.n_attendees_for_event", ["num"=>$attendees->count(), "name"=>$event->title, "date"=>$event->start_date->toDayDateTimeString()]) !!} +
diff --git a/resources/views/ManageOrganiser/Dashboard.blade.php b/resources/views/ManageOrganiser/Dashboard.blade.php index 793cbf9a..e4ddb105 100644 --- a/resources/views/ManageOrganiser/Dashboard.blade.php +++ b/resources/views/ManageOrganiser/Dashboard.blade.php @@ -119,9 +119,9 @@

#{{ $order->order_reference }} - - @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()]) !!}

{{ $order->created_at->diffForHumans() }} • "btn btn-block btn-success")) !!} {!! Form::close() !!} diff --git a/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php index 6a1e834f..2fc3a620 100644 --- a/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php +++ b/resources/views/Public/ViewEvent/Partials/EventCreateOrderSection.blade.php @@ -53,7 +53,7 @@
- @lang("Public_ViewEvent.time", ["time"=>""]) + {!! @trans("Public_ViewEvent.time", ["time"=>""]) !!}
diff --git a/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php b/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php index 85d6191c..f3d0ffbb 100644 --- a/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php +++ b/resources/views/Public/ViewEvent/Partials/EventViewOrderSection.blade.php @@ -53,10 +53,9 @@ -

@lang("Public_ViewEvent.thank_you_for_your_order")

+

{!! @trans("Public_ViewEvent.thank_you_for_your_order") !!}

- @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"]) !!}