Added localized strings for account

resources/lang/en/general.php

@@ -6,6 +6,7 @@
     'accessory'				=> 'Accessory',
     'accessory_report'		=> 'Accessory Report',
     'action'                => 'Action',
+    'actions'               => 'Actions',
     'activity_report'		=> 'Activity Report',
     'address'				=> 'Address',
     'admin'					=> 'Admin',
@@ -62,6 +63,7 @@
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
     'current'  				=> 'Current',
+    'current_password'      => 'Current Password',
     'custom_report'         => 'Custom Asset Report',
     'dashboard'				=> 'Dashboard',
     'days'      			=> 'days',
@@ -104,9 +106,10 @@
     'file_type'             => 'File Type',
     'file_uploads'			=> 'File Uploads',
     'generate'				=> 'Generate',
-     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Groups',
     'gravatar_email'        => 'Gravatar Email Address',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
     'history'  			    => 'History',
     'history_for'  			=> 'History for',
     'id'  					=> 'ID',
@@ -122,6 +125,7 @@
     'asset_maintenance_report' => 'Asset Maintenance Report',
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Item',
+    'item_name'             => 'Item Name',
     'insufficient_permissions' => 'Insufficient permissions!',
     'kits'       			=> 'Predefined Kits',
     'language'				=> 'Language',
@@ -151,6 +155,7 @@
     'months'				=> 'months',
     'moreinfo'				=> 'More Info',
     'name'					=> 'Name',
+    'new_password'          => 'New Password',
     'next'					=> 'Next',
     'next_audit_date'		=> 'Next Audit Date',
     'last_audit'		    => 'Last Audit',
@@ -178,7 +183,10 @@
     'reports'				=> 'Reports',
     'restored'				=> 'restored',
     'restore'				=> 'Restore',
+    'requestable_models'    => 'Requestable Models',
     'requested'				=> 'Requested',
+    'requested_date'        => 'Requested Date',
+    'requested_assets'      => 'Requested Assets',
     'request_canceled'      => 'Request Canceled',
     'save'  				=> 'Save',
     'select'				=> 'Select',
@@ -231,6 +239,7 @@
     'users'                 => 'Users',
     'viewall'				=> 'View All',
     'viewassets'  			=> 'View Assigned Assets',
+    'viewassetsfor'         => 'View Assets for :name',
     'website'               => 'Website',
     'welcome'				=> 'Welcome, :name',
     'years'					=> 'years',

resources/views/account/accept-asset.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-    {{trans('general.accept', ['asset' => $item->present()->name()])}}
+    {{ trans('general.accept', ['asset' => $item->present()->name()]) }}
     @parent
 @stop
 

resources/views/account/accept/create.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-    Accept {{ $acceptance->checkoutable->present()->name() }}
+    {{ trans('general.accept', array('asset' => $acceptance->checkoutable->present()->name())) }}
     @parent
 @stop
 
@@ -47,14 +47,14 @@
             <div class="radio">
               <label>
                 <input type="radio" name="asset_acceptance" id="accepted" value="accepted">
-                I accept
+                {{ trans('general.i_accept') }}
               </label>
             </div>
 
             <div class="radio">
               <label>
                 <input type="radio" name="asset_acceptance" id="declined" value="declined">
-                I decline
+                {{ trans('general.i_decline') }}
               </label>
             </div>
 
@@ -69,7 +69,7 @@
             @if ($snipeSettings->require_accept_signature=='1')
             <div class="col-md-12 col-sm-12 text-center" style="padding-top: 20px">
 
-              <h3>Sign below to indicate that you agree to the terms of service:</h3>
+              <h3>{{ trans('general.sign_tos') }}</h3>
 
               <div id="signature-pad" class="m-signature-pad">
                 <div class="m-signature-pad--body col-md-12 col-sm-12 col-lg-12 col-xs-12">
@@ -77,7 +77,7 @@
                     <input type="hidden" name="signature_output" id="signature_output">
                 </div>
                <div class="col-md-12 col-sm-12 col-lg-12 col-xs-12 text-center">
-                  <button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">Clear Signature</button>
+                  <button type="button" class="btn btn-sm btn-default clear" data-action="clear" id="clear_button">{{ trans('general.clear_signature') }}</button>
                 </div>
               </div>
             </div> <!-- .col-md-12.text-center-->

resources/views/account/accept/index.blade.php

@@ -2,6 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
+//TODO: Debug page as it is not viewable in browser due to crash
 Accept assets  {{ $user->present()->fullName() }}
 @parent
 @stop
@@ -34,8 +35,8 @@ Accept assets  {{ $user->present()->fullName() }}
                   }'>
             <thead>
               <tr>
-                <th>Name</th>
+                <th>{{ trans('general.name')}}</th>
-                <th>Actions</th>
+                <th>{{ trans('general.actions')}}</th>
               </tr>
             </thead>
             <tbody>

resources/views/account/api.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-    Personal API Keys
+    {{ trans('account/api.personal_api_keys') }}
     @parent
 @stop
 
@@ -24,18 +24,17 @@
             </div>
             <div class="col-md-4">
                 <div class="alert alert-warning"><i class="fas fa-exclamation-triangle faa-pulse animated"></i>
-                    When generating an API token, be sure to copy it down immediately as they
+                    {{ trans('account/api.api_key_warning') }}
-                    will not be visible to you again. </div>
+                </div>
 
-                <p>Your API base url is located at:<br>
+                <p>{{ trans('account/api.api_base_url') }}<br>
-                    <code>{{ url('/api/v1') }}/&lt;endpoint&gt;</code></p>
+                    <code>{{ url('/api/v1') }}{{!! trans('account/api.api_base_url_endpoint') !!}}</code></p>
 
-                <p>API tokens are set to expire in:
+                <p>{{ trans('account/api.api_token_expiration_time') }}
-                    <strong>{{ config('passport.expiration_years') }} years</strong>.</p>
+                    <strong>{{ config('passport.expiration_years') }} {{ trans('general.years') }} </strong>.</p>
 
 
-                <p>Please check the <a href="https://snipe-it.readme.io/reference" target="_blank">API reference</a> to
+                <p>{{!! trans('account/api.api_reference') !!}}</p>
-                    find specific API endpoints and additional API documentation.</p>
             </div>
         </div>
 

resources/views/account/change-password.blade.php

@@ -20,7 +20,7 @@
 
     <!-- Old Password -->
     <div class="form-group {{ $errors->has('current_password') ? ' has-error' : '' }}">
-        <label for="current_password" class="col-md-3 control-label">Current Password
+        <label for="current_password" class="col-md-3 control-label"> {{ trans('general.current_password') }} </label>
         </label>
         <div class="col-md-5 required">
             <input class="form-control" type="password" name="current_password" id="current_password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
@@ -32,7 +32,7 @@
     </div>
 
     <div class="form-group {{ $errors->has('password') ? ' has-error' : '' }}">
-        <label for="password" class="col-md-3 control-label">New Password</label>
+        <label for="password" class="col-md-3 control-label">{{ trans('general.new_password') }}</label>
         <div class="col-md-5 required">
             <input class="form-control" type="password" name="password" id="password" {{ (config('app.lock_passwords') ? ' disabled' : '') }}>
             {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -44,7 +44,7 @@
 
 
     <div class="form-group {{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
-        <label for="password_confirmation" class="col-md-3 control-label">New Password</label>
+        <label for="password_confirmation" class="col-md-3 control-label">{{ trans('general.new_password') }}</label>
         <div class="col-md-5 required">
             <input class="form-control" type="password" name="password_confirmation" id="password_confirmation"  {{ (config('app.lock_passwords') ? ' disabled' : '') }} aria-label="password_confirmation">
             {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}

resources/views/account/profile.blade.php

@@ -97,7 +97,7 @@
             {!! $errors->first('gravatar', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             <p>
               <img src="//secure.gravatar.com/avatar/{{ md5(strtolower(trim($user->gravatar))) }}" width="30" height="30" alt="{{ $user->present()->fullName() }} avatar image">
-              <a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.
+              {{!! trans('general.gravatar_url') !!}}
             </p>
           </div>
         </div>

resources/views/account/requestable-assets.blade.php

@@ -72,7 +72,7 @@
                         <div class="col-md-12">
 
                             @if ($models->count() > 0)
-                            <h2>Requestable Models</h4>
+                            <h2>{{ trans('general.requestable_models') }}</h4>
                                 <table
                                         name="requested-assets"
                                         data-toolbar="#toolbar"

resources/views/account/requested.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-   Requested Assets
+   {{ trans('general.requested_assets')}}
 @stop
 
 {{-- Account page content --}}
@@ -32,13 +32,13 @@
                 }'>
                         <thead>
                         <tr>
-                            <th class="col-md-1" data-field="image" data-formatter="imageFormatter">Image</th>
+                            <th class="col-md-1" data-field="image" data-formatter="imageFormatter">{{ trans('general.image') }}</th>
-                            <th class="col-md-2" data-field="name">Item Name</th>
+                            <th class="col-md-2" data-field="name">{{ trans('general.item_name') }}</th>
-                            <th class="col-md-2" data-field="type">Type</th>
+                            <th class="col-md-2" data-field="type">{{ trans('general.type') }}</th>
                             <th class="col-md-2" data-field="qty">{{ trans('general.qty') }}</th>
                             <th class="col-md-2" data-field="location">{{ trans('admin/hardware/table.location') }}</th>
                             <th class="col-md-2" data-field="expected_checkin" data-formatter="dateDisplayFormatter"> {{ trans('admin/hardware/form.expected_checkin') }}</th>
-                            <th class="col-md-2" data-field="request_date" data-formatter="dateDisplayFormatter">Requested Date</th>
+                            <th class="col-md-2" data-field="request_date" data-formatter="dateDisplayFormatter"> {{ trans('general.requested_date') }}</th>
                         </tr>
                         </thead>
                     </table>

resources/views/account/view-assets.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-View Assets for  {{ $user->present()->fullName() }}
+{{ trans('general.viewassetsfor', array('name' => $user->fullName)) }}
 @parent
 @stop
 
@@ -294,7 +294,7 @@ View Assets for  {{ $user->present()->fullName() }}
       @if ($user->id)
       <div class="box-header with-border">
         <div class="box-heading">
-          <h2 class="box-title"> History</h2>
+          <h2 class="box-title"> {{ trans('general.history') }}</h2>
         </div>
       </div><!-- /.box-header -->
       @endif