FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

frontend translation + other stuff

Browse Source
This commit is contained in:
lordwilbur
2018-05-21 09:54:18 -05:00
committed by Nabeel Shahzad
parent ba8a819c7d
commit a346b0df2e
54 changed files with 966 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/layouts/default/profile/edit.blade.php
+2 -2
View File
@@ -1,10 +1,10 @@
@extends('app')
@section('title', __('Edit Profile'))
@section('title', trans('frontend.profile.editprofile'))
@section('content')
<div class="row">
<div class="col-md-12">
<h2 class="description">{{ __('Edit Your Profile') }}</h2>
<h2 class="description">@lang('frontend.profile.edityourprofile')</h2>
@include('flash::message')
{{ Form::model($user, ['route' => ['frontend.profile.update', $user->id], 'files' => true, 'method' => 'patch']) }}
@include("profile.fields")
resources/views/layouts/default/profile/fields.blade.php
+12 -11
View File
@@ -2,7 +2,7 @@
<div class="col-md-12">
<table class="table">
<tr>
<td>{{ __('Name') }}</td>
<td>@lang('frontend.global.name')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('name') ? ' has-danger' : '' }}">
{{ Form::text('name', null, ['class' => 'form-control']) }}
@@ -14,7 +14,7 @@
</tr>
<tr>
<td>{{ __('Email') }}</td>
<td>@lang('frontend.global.email')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('email') ? ' has-danger' : '' }}">
{{ Form::text('email', null, ['class' => 'form-control']) }}
@@ -26,7 +26,7 @@
</tr>
<tr>
<td>{{ __('Airline') }}</td>
<td>@lang('frontend.global.airline')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('airline') ? ' has-danger' : '' }}">
{{ Form::select('airline_id', $airlines, null , ['class' => 'form-control select2']) }}
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>{{ __('Home Airport') }}</td>
<td>@lang('frontend.global.homeairport')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('home_airport_id') ? ' has-danger' : '' }}">
{{ Form::select('home_airport_id', $airports, null , ['class' => 'form-control select2']) }}
@@ -50,7 +50,7 @@
</tr>
<tr>
<td>{{ __('Country') }}</td>
<td>@lang('frontend.global.country')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('country') ? ' has-danger' : '' }}">
{{ Form::select('country', $countries, null, ['class' => 'form-control select2' ]) }}
@@ -62,7 +62,7 @@
</tr>
<tr>
<td>{{ __('Timezone') }}</td>
<td>@lang('frontend.global.timezone')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('timezone') ? ' has-danger' : '' }}">
{{ Form::select('timezone', $timezones, null, ['class' => 'form-control select2' ]) }}
@@ -74,8 +74,9 @@
</tr>
<tr>
<td>{{ __('Change Password') }}</td>
<td>@lang('frontend.profile.changepassword')</td>
<td>
<p>@lang('frontend.profile.newpassword'):</p>
<div class="input-group form-group-no-border{{ $errors->has('password') ? ' has-danger' : '' }}">
{{ Form::password('password', ['class' => 'form-control']) }}
</div>
@@ -83,7 +84,7 @@
<p class="text-danger">{{ $errors->first('password') }}</p>
@endif
<p>{{ __('Confirm Password') }}:</p>
<p>@lang('frontend.global.confirmpassword'):</p>
<div class="input-group form-group-no-border{{ $errors->has('password_confirmation') ? ' has-danger' : '' }}">
{{ Form::password('password_confirmation', ['class' => 'form-control']) }}
</div>
@@ -92,12 +93,12 @@
@endif
</td>
</tr>
<td>{{ __('Avatar') }}</td>
<td>@lang('frontend.profile.avatar')</td>
<td>
<div class="input-group form-group-no-border{{ $errors->has('avatar') ? ' has-danger' : '' }}">
{{ Form::file('avatar', null) }}
</div>
<p class="small">This avatar will be resized to {{ config('phpvms.avatar.width'). ' x '. config('phpvms.avatar.height') }}</p>
<p class="small">@lang('frontend.profile.avatarresize', ['width' => config('phpvms.avatar.width'), 'height' => config('phpvms.avatar.height')])</p>
@if ($errors->has('avatar'))
<p class="text-danger">{{ $errors->first('avatar') }}</p>
@endif
@@ -106,7 +107,7 @@
</table>
<div style="width: 100%; text-align: right; padding-top: 20px;">
{{ Form::submit(__('Update Profile'), ['class' => 'btn btn-primary']) }}
{{ Form::submit(trans('frontend.profile.updateprofile'), ['class' => 'btn btn-primary']) }}
</div>
</div>
</div>
resources/views/layouts/default/profile/index.blade.php
+11 -11
View File
@@ -1,5 +1,5 @@
@extends('app')
@section('title', __('Profile'))
@section('title', trans('frontend.global.profile'))
@section('content')
<div class="row profile-page content-center text-color-dark-beige">
@@ -23,25 +23,25 @@
<div class="content">
<div class="social-description">
<h2>{{ $user->flights}}</h2>
<p>{{ __trans_choice('Flight', $user->flights) }}</p>
<p>{{ trans_choice('frontend.global.flight', $user->flights) }}</p>
</div>
<div class="social-description">
<h2>{{ \App\Facades\Utils::minutesToTimeString($user->flight_time, false) }}</h2>
<p>{{ __('Flight Hours') }}</p>
<p>@lang('frontend.profile.flighthours')</p>
</div>
@if($user->home_airport)
<div class="social-description">
<h2>{{ $user->home_airport->icao }}</h2>
<p>{{ __('Home Airport') }}</p>
<p>@lang('frontend.global.homeairport')</p>
</div>
@endif
@if($user->current_airport)
<div class="social-description">
<h2>{{ $user->current_airport->icao }}</h2>
<p>{{ __('Current Airport') }}</p>
<p>@lang('frontend.global.currentairport')</p>
</div>
@endif
@@ -58,24 +58,24 @@
<div class="col-sm-12">
<div class="text-right">
<a href="{{ route('frontend.profile.regen_apikey') }}" class="btn btn-warning"
onclick="return confirm({{ __('Are you sure? This will reset your API key.') }})">{{ __('New API Key') }}</a>
onclick="return confirm({{ __('Are you sure? This will reset your API key.') }})">@lang('frontend.profile.newapikey')</a>
&nbsp;
<a href="{{ route('frontend.profile.edit', ['id' => $user->id]) }}"
class="btn btn-primary">{{ __('Edit') }}</a>
class="btn btn-primary">@lang('frontend.global.edit')</a>
</div>
<h3 class="description">{{ __('Your Profile') }}</h3>
<h3 class="description">@lang('frontend.profile.yourprofile')</h3>
<table class="table table-full-width">
<tr>
<td>{{ __('Email') }}</td>
<td>@lang('frontend.global.email')</td>
<td>{{ $user->email }}</td>
</tr>
<tr>
<td>{{ __('API Key') }}&nbsp;&nbsp;<span class="description">({{ __('don\'t share this!') }})</span></td>
<td>@lang('frontend.profile.apikey')&nbsp;&nbsp;<span class="description">(@lang('frontend.profile.dontshare'))</span></td>
<td>{{ $user->api_key }}</td>
</tr>
<tr>
<td>{{ __('Timezone') }}</td>
<td>@lang('frontend.global.timezone')</td>
<td>{{ $user->timezone }}</td>
</tr>
</table>