cahng laravel translation, move route for languages from api to web, fix contact formular

This commit is contained in:
Milos Holba
2021-03-23 21:00:25 +01:00
parent df5d5cb75f
commit 4142f829be
17 changed files with 152 additions and 196 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ const Helpers = {
return new Promise((resolve, reject) => {
let locale = language ? language : this.$store.getters.config.language
axios.get(`/api/language/${locale}`)
axios.get(`/language/${locale}`)
.then((response) => {
let lang = response.data.language_strings
+49 -49
View File
@@ -1,66 +1,66 @@
<?php
return [
'app_description' => __t('app_description'),
'user_not_fount' => __t('user_not_fount'),
'incorrect_password' => __t('incorrect_password'),
'time' => __t('time'),
'home' => __t('home'),
// return [
// 'app_description' => __t('app_description'),
// 'user_not_fount' => __t('user_not_fount'),
// 'incorrect_password' => __t('incorrect_password'),
// 'time' => __t('time'),
// 'home' => __t('home'),
//Shared link email message
'shared_link_email_subject' => __t('shared_link_email_subject'),
'shared_link_email_greeting' => __t('shared_link_email_greeting'),
'shared_link_email_user' => __t('shared_link_email_user'),
'shared_link_email_link' => __t('shared_link_email_link'),
'shared_link_email_salutation' => __t('shared_link_email_salutation'),
// //Shared link email message
// 'shared_link_email_subject' => __t('shared_link_email_subject'),
// 'shared_link_email_greeting' => __t('shared_link_email_greeting'),
// 'shared_link_email_user' => __t('shared_link_email_user'),
// 'shared_link_email_link' => __t('shared_link_email_link'),
// 'shared_link_email_salutation' => __t('shared_link_email_salutation'),
// Reset password email
'reset_password_greeting' => __t('reset_password_greeting'),
'reset_password_subject' => __t('reset_password_subject'),
'reset_password_line_1' => __t('reset_password_line_1'),
'reset_password_line_2' => __t('reset_password_line_2'),
'reset_password_action' => __t('reset_password_action'),
// // Reset password email
// 'reset_password_greeting' => __t('reset_password_greeting'),
// 'reset_password_subject' => __t('reset_password_subject'),
// 'reset_password_line_1' => __t('reset_password_line_1'),
// 'reset_password_line_2' => __t('reset_password_line_2'),
// 'reset_password_action' => __t('reset_password_action'),
'salutation' => __t('salutation'),
// 'salutation' => __t('salutation'),
// Invoice
'print_button' => __t('print_button'),
// 'print_button' => __t('print_button'),
'vat' => __t('vat'),
'vat_included' => __t('vat_included'),
'subtotal' => __t('subtotal'),
// 'vat' => __t('vat'),
// 'vat_included' => __t('vat_included'),
// 'subtotal' => __t('subtotal'),
'tax_exempted' => __t('tax_exempted'),
'tax_be_paid_reverse' => __t('tax_be_paid_reverse'),
// 'tax_exempted' => __t('tax_exempted'),
// 'tax_be_paid_reverse' => __t('tax_be_paid_reverse'),
'invoice_title' => __t('invoice_title'),
'date' => __t('date'),
'product' => __t('product'),
'subscription' => __t('subscription'),
'invoice_number' => __t('invoice_number'),
// 'invoice_title' => __t('invoice_title'),
// 'date' => __t('date'),
// 'product' => __t('product'),
// 'subscription' => __t('subscription'),
// 'invoice_number' => __t('invoice_number'),
'seller' => __t('seller'),
'client' => __t('client'),
// 'seller' => __t('seller'),
// 'client' => __t('client'),
'seller_vat' => __t('seller_vat'),
'seller_name' => __t('seller_name'),
'seller_phone' => __t('seller_phone'),
// 'seller_vat' => __t('seller_vat'),
// 'seller_name' => __t('seller_name'),
// 'seller_phone' => __t('seller_phone'),
'name' => __t('name'),
'phone' => __t('phone'),
'address' => __t('address'),
'city' => __t('city'),
'state' => __t('state'),
'postal_code' => __t('postal_code'),
'country' => __t('country'),
// 'name' => __t('name'),
// 'phone' => __t('phone'),
// 'address' => __t('address'),
// 'city' => __t('city'),
// 'state' => __t('state'),
// 'postal_code' => __t('postal_code'),
// 'country' => __t('country'),
'col_description' => __t('col_description'),
'col_date' => __t('col_date'),
'col_amount' => __t('col_amount'),
// 'col_description' => __t('col_description'),
// 'col_date' => __t('col_date'),
// 'col_amount' => __t('col_amount'),
'total' => __t('total'),
// 'total' => __t('total'),
// OG Page
'user_sending' => __t('user_sending'),
'protected_file' => __t('protected_file'),
];
// 'user_sending' => __t('user_sending'),
// 'protected_file' => __t('protected_file'),
// ];
+4 -4
View File
@@ -4,17 +4,17 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">
<meta name="description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}">
<meta name="description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __t('app_description') }}">
<title>{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}</title>
<title>{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __t('app_description') }}</title>
{{--StyleSheet--}}
<link href="{{ asset('css/app.css') }}?v={{ get_version() }}" rel="stylesheet">
{{--OG items--}}
<meta property="og:url" content="{{ url('/') }}">
<meta property="og:title" content="{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}">
<meta property="og:description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __('vuefilemanager.app_description') }}">
<meta property="og:title" content="{{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }} | {{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __t('app_description') }}">
<meta property="og:description" content="{{ isset($settings->app_description) && $settings->app_description ? $settings->app_description : __t('app_description') }}">
<meta property="og:image" content="{{ asset('assets/images/vuefilemanager-og-image.jpg') }}">
{{-- Apple Mobile Web App--}}
+4 -4
View File
@@ -7,16 +7,16 @@
<meta name="fragment" content="!">
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="{{ __('vuefilemanager.user_sending', ['name' => $metadata['user']]) }}">
<meta name="description" content="{{ __t('user_sending', ['name' => $metadata['user']]) }}">
{{--OG Public items--}}
<meta property="og:url" content="{{ $metadata['url'] }}">
<meta property="og:description" content="{{ __('vuefilemanager.user_sending', ['name' => $metadata['user']]) }}">
<meta property="og:description" content="{{ __t('user_sending', ['name' => $metadata['user']]) }}">
{{--Show protected og metadata--}}
@if($metadata['is_protected'])
<meta property="og:title" content="{{ __('vuefilemanager.protected_file') }} | {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}">
<title>{{ __('vuefilemanager.protected_file') }} | {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}</title>
<meta property="og:title" content="{{ __t('protected_file') }} | {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}">
<title>{{ __t('protected_file') }} | {{ isset($settings->app_title) && $settings->app_title ? $settings->app_title : 'VueFileManager' }}</title>
@endif
{{--Show public og metadata--}}
@@ -2,7 +2,7 @@
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
<head>
<meta charset="utf-8">
<title>@lang('vuefilemanager.invoice_title')</title>
<title>{{ __t('invoice_title') }}</title>
<link href="https://fonts.googleapis.com/css2?family=Nunito:wght@200;300;400;600;700;900&display=swap"
rel="stylesheet">
@@ -28,7 +28,7 @@
<path d="M6 18H4a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2h-2"></path>
<rect x="6" y="14" width="12" height="8"></rect>
</svg>
<span class="label">@lang('vuefilemanager.print_button')</span>
<span class="label">{{ __t('print_button') }}</span>
</button>
</div>
<div id="invoice-wrapper">
@@ -42,28 +42,28 @@
@endif
</div>
<div class="title">
<h1>@lang('vuefilemanager.invoice_title')</h1>
<h1>{{ __t('invoice_title') }}</h1>
</div>
</header>
<section class="invoice-subject">
<ul class="list">
<li class="list-item">
<b>@lang('vuefilemanager.date'):</b>
<b>{{ __t('date') }}:</b>
<span>{{ format_date($invoice->date()) }}</span>
</li>
<li class="list-item">
<b>@lang('vuefilemanager.product'):</b>
<span>@lang('vuefilemanager.subscription')</span>
<b>{{ __t('product') }}:</b>
<span>{{ __t('subscription') }}</span>
</li>
<li class="list-item">
<b>@lang('vuefilemanager.invoice_number'):</b>
<b>{{ __t('invoice_number') }}:</b>
<span>{{ $invoice->number }}</span>
</li>
<!-- Extra / VAT Information -->
@if (isset($vat))
<li class="list-item">
<b>@lang('vuefilemanager.vat'):</b>
<b>{{ __t('vat') }}:</b>
<span>{{ $vat }}</span>
</li>
@endif
@@ -71,25 +71,25 @@
</section>
<div class="invoice-partners">
<div class="partner">
<h2 class="partner-title">@lang('vuefilemanager.seller'):</h2>
<h2 class="partner-title">{{ __t('seller') }}:</h2>
<ul class="list">
@isset($settings->billing_vat_number)
<li class="list-item">
<b>@lang('vuefilemanager.seller_vat'):</b>
<b>{{ __t('seller_vat') }}:</b>
<span>{{ $settings->billing_vat_number }}</span>
</li>
@endisset
@isset($settings->billing_name)
<li class="list-item">
<b>@lang('vuefilemanager.seller_name'):</b>
<b>{{ __t('seller_name') }}:</b>
<span>{{ $settings->billing_name }}</span>
</li>
@endisset
@isset($settings->billing_phone_number)
<li class="list-item">
<b>@lang('vuefilemanager.seller_phone'):</b>
<b>{{ __t('seller_phone') }}:</b>
<span>{{ $settings->billing_phone_number }}</span>
</li>
@endisset
@@ -97,54 +97,54 @@
<ul class="list">
@isset($settings->billing_address)
<li class="list-item">
<b>@lang('vuefilemanager.address'):</b>
<b>{{ __t('address') }}:</b>
<span>{{ $settings->billing_address }}</span>
</li>
@endisset
@isset($settings->billing_city)
<li class="list-item">
<b>@lang('vuefilemanager.city'):</b>
<b>{{ __t('city') }}:</b>
<span>{{ $settings->billing_city }}</span>
</li>
@endisset
@isset($settings->billing_state)
<li class="list-item">
<b>@lang('vuefilemanager.state'):</b>
<b>{{ __t('state') }}:</b>
<span>{{ $settings->billing_state }}</span>
</li>
@endisset
@isset($settings->billing_postal_code)
<li class="list-item">
<b>@lang('vuefilemanager.postal_code'):</b>
<b>{{ __t('postal_code') }}:</b>
<span>{{ $settings->billing_postal_code }}</span>
</li>
@endisset
@isset($settings->billing_country)
<li class="list-item">
<b>@lang('vuefilemanager.country'):</b>
<b>{{ __t('country') }}:</b>
<span>{{ $settings->billing_country }}</span>
</li>
@endisset
</ul>
</div>
<div class="partner">
<h2 class="partner-title">@lang('vuefilemanager.client'):</h2>
<h2 class="partner-title">{{ __t('client') }}:</h2>
<ul class="list">
@isset($invoice->customer_name)
<li class="list-item">
<b>@lang('vuefilemanager.name'):</b>
<b>{{ __t('name') }}:</b>
<span>{{ $invoice->customer_name }}</span>
</li>
@endisset
@isset($invoice->customer_phone)
<li class="list-item">
<b>@lang('vuefilemanager.phone'):</b>
<b>{{ __t('phone') }}:</b>
<span>{{ $invoice->customer_phone }}</span>
</li>
@endisset
@@ -152,35 +152,35 @@
<ul class="list">
@isset($invoice->customer_address['line1'])
<li class="list-item">
<b>@lang('vuefilemanager.address'):</b>
<b>{{ __t('address') }}:</b>
<span>{{ $invoice->customer_address['line1'] }}</span>
</li>
@endisset
@isset($invoice->customer_address['city'])
<li class="list-item">
<b>@lang('vuefilemanager.city'):</b>
<b>{{ __t('city') }}:</b>
<span>{{ $invoice->customer_address['city'] }}</span>
</li>
@endisset
@isset($invoice->customer_address['state'])
<li class="list-item">
<b>@lang('vuefilemanager.state'):</b>
<b>{{ __t('state') }}:</b>
<span>{{ $invoice->customer_address['state'] }}</span>
</li>
@endisset
@isset($invoice->customer_address['postal_code'])
<li class="list-item">
<b>@lang('vuefilemanager.postal_code'):</b>
<b>{{ __t('postal_code') }}:</b>
<span>{{ $invoice->customer_address['postal_code'] }}</span>
</li>
@endisset
@isset($invoice->customer_address['country'])
<li class="list-item">
<b>@lang('vuefilemanager.country'):</b>
<b>{{ __t('country') }}:</b>
<span>{{ $invoice->customer_address['country'] }}</span>
</li>
@endisset
@@ -209,7 +209,7 @@
--}}{{--Display subscription--}}{{--
@foreach($invoice->subscriptions() as $subscription)
<tr>
<td>@lang('vuefilemanager.subscription') ({{ $subscription->quantity }})</td>
<td>{{ __t('subscription') }} ({{ $subscription->quantity }})</td>
<td>{{ $subscription->startDateAsCarbon()->formatLocalized('%d. %B. %Y') }} -
{{ $subscription->endDateAsCarbon()->formatLocalized('%d. %B. %Y') }}</td>
<td>{{ $subscription->total() }}</td>
@@ -246,12 +246,12 @@
<table width="100%" class="table" border="0">
<thead class="table-header">
<tr>
<td>@lang('vuefilemanager.col_description')</td>
<td>@lang('vuefilemanager.col_date')</td>
<td>{{ __t('col_description') }}</td>
<td>{{ __t('col_date') }}</td>
@if ($invoice->hasTax())
<td align="right">@lang('vuefilemanager.vat')</td>
<td align="right">{{ __t('vat')}}</td>
@endif
<td>@lang('vuefilemanager.col_amount')</td>
<td>{{ __t('col_amount') }}</td>
</tr>
</thead>
@@ -285,7 +285,7 @@
<!-- Display The Subscriptions -->
@foreach ($invoice->subscriptions() as $subscription)
<tr class="row">
<td>@lang('vuefilemanager.subscription') ({{ $subscription->quantity }})</td>
<td>{{ __t('subscription') }} ({{ $subscription->quantity }})</td>
<td>
{{ $subscription->startDateAsCarbon()->formatLocalized('%B %e, %Y') }} -
{{ $subscription->endDateAsCarbon()->formatLocalized('%B %e, %Y') }}
@@ -294,7 +294,7 @@
@if ($invoice->hasTax())
<td>
@if ($inclusiveTaxPercentage = $subscription->inclusiveTaxPercentage())
{{ $inclusiveTaxPercentage }}% @lang('vuefilemanager.vat_included')
{{ $inclusiveTaxPercentage }}% {{ __t('vat_included') }}
@endif
@if ($subscription->hasBothInclusiveAndExclusiveTax())
@@ -314,7 +314,7 @@
<!-- Display The Subtotal -->
@if ($invoice->hasDiscount() || $invoice->hasTax() || $invoice->hasStartingBalance())
<tr>
<td colspan="{{ $invoice->hasTax() ? 3 : 2 }}" style="text-align: right;">@lang('vuefilemanager.subtotal')</td>
<td colspan="{{ $invoice->hasTax() ? 3 : 2 }}" style="text-align: right;">{{ __t('subtotal')}}</td>
<td>{{ $invoice->subtotal() }}</td>
</tr>
@endif
@@ -324,9 +324,9 @@
<tr>
<td colspan="{{ $invoice->hasTax() ? 3 : 2 }}" style="text-align: right;">
@if ($invoice->isTaxExempt())
@lang('vuefilemanager.tax_exempted')
{{ __t('tax_exempted')}}
@else
@lang('vuefilemanager.tax_be_paid_reverse')
{{ __t('tax_be_paid_reverse') }}
@endif
</td>
<td></td>
@@ -336,7 +336,7 @@
<tr>
<td colspan="3" style="text-align: right;">
{{ $tax->display_name }} {{ $tax->jurisdiction ? ' - '.$tax->jurisdiction : '' }}
({{ $tax->percentage }}%{{ $tax->isInclusive() ? ' ' . __('vuefilemanager.vat_included') : '' }})
({{ $tax->percentage }}%{{ $tax->isInclusive() ? ' ' . __t('vat_included') : '' }})
</td>
<td>{{ $tax->amount() }}</td>
</tr>
@@ -346,7 +346,7 @@
<!-- Display The Final Total -->
<tr>
<td colspan="{{ $invoice->hasTax() ? 3 : 2 }}" style="text-align: right;">
<strong>@lang('vuefilemanager.total')</strong>
<strong>{{ __t('total') }}</strong>
</td>
<td>
<strong>{{ $invoice->total() }}</strong>
@@ -357,7 +357,7 @@
</table>
</div>
<div class="invoice-summary">
<b>@lang('vuefilemanager.total') {{ $invoice->total() }}</b>
<b>{{ __t('total') }} {{ $invoice->total() }}</b>
</div>
</div>
</body>