Skip to content

Commit

Permalink
More internationalization strings for #151
Browse files Browse the repository at this point in the history
  • Loading branch information
snipe committed Jun 9, 2014
1 parent 610c405 commit 75590b6
Show file tree
Hide file tree
Showing 12 changed files with 70 additions and 69 deletions.
1 change: 1 addition & 0 deletions app/lang/en/admin/groups/message.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
),

'delete' => array(
'confirm' => 'Are you sure you wish to delete this group?',
'create' => 'There was an issue creating the group. Please try again.',
'update' => 'There was an issue updating the group. Please try again.',
'delete' => 'There was an issue deleting the group. Please try again.',
Expand Down
29 changes: 16 additions & 13 deletions app/lang/en/admin/hardware/form.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@

return array(

'create' => 'Create Asset',
'update' => 'Asset Update',
'tag' => 'Asset Tag',
'name' => 'Asset Name',
'serial' => 'Serial',
'order' => 'Order Number',
'model' => 'Model',
'date' => 'Purchase Date',
'cost' => 'Purchase Cost',
'warranty' => 'Warranty',
'status' => 'Status',
'notes' => 'Notes',
'months' => 'months',
'create' => 'Create Asset',
'update' => 'Asset Update',
'tag' => 'Asset Tag',
'name' => 'Asset Name',
'serial' => 'Serial',
'order' => 'Order Number',
'model' => 'Model',
'date' => 'Purchase Date',
'cost' => 'Purchase Cost',
'warranty' => 'Warranty',
'status' => 'Status',
'notes' => 'Notes',
'months' => 'months',
'checkout_to' => 'Checkout to',
'checkin' => 'Checkin',
'depreciation' => 'Depreciation',
)
;
8 changes: 8 additions & 0 deletions app/lang/en/admin/hardware/general.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?php

return array(
'checkin' => 'Checkin Asset',
'checkout' => 'Checkout Asset to User',
'clone' => 'Clone Asset',

);
1 change: 1 addition & 0 deletions app/lang/en/general.php
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,5 @@
'list_all' => 'List All',
'asset_models' => 'Asset Models',
'currency_symbol' => '$',
'no_results' => 'No Results.',
);
6 changes: 3 additions & 3 deletions app/views/backend/categories/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
<td>{{ $category->name }}</td>
<td>
<a href="{{ route('update/category', $category->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/category', $category->id) }}" data-content="
@lang('admin/categories/message.delete.confirm')
" data-title="Delete {{ htmlspecialchars($category->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/category', $category->id) }}" data-content="@lang('admin/categories/message.delete.confirm')"
data-title="@lang('general.delete')
{{ htmlspecialchars($category->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>

</td>
</tr>
Expand Down
6 changes: 2 additions & 4 deletions app/views/backend/depreciations/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@
<td>{{ $depreciation->months }} @lang('admin/depreciations/table.months') </td>
<td>
<a href="{{ route('update/depreciations', $depreciation->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/depreciations', $depreciation->id) }}" data-content="
@lang('admin/depreciations/message.delete.confirm')
" data-title="
@lang('general.delete')
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/depreciations', $depreciation->id) }}" data-content="@lang('admin/depreciations/message.delete.confirm')"
data-title="@lang('general.delete')
{{ htmlspecialchars($depreciation->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>


Expand Down
2 changes: 1 addition & 1 deletion app/views/backend/groups/create.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{-- Web site Title --}}
@section('title')
Create Group ::
@lang('admin/groups/titles.create_group') ::
@parent
@stop

Expand Down
2 changes: 1 addition & 1 deletion app/views/backend/groups/edit.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{-- Web site Title --}}
@section('title')
Group Update ::
@lang('admin/groups/titles.edit_group')< ::
@parent
@stop

Expand Down
8 changes: 5 additions & 3 deletions app/views/backend/groups/index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{-- Web site Title --}}
@section('title')
Group Management ::
@lang('admin/groups/titles.group_management') ::
@parent
@stop

Expand Down Expand Up @@ -38,13 +38,15 @@
<td>{{ $group->created_at->diffForHumans() }}</td>
<td>
<a href="{{ route('update/group', $group->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/group', $group->id) }}" data-content="Are you sure you wish to delete this group?" data-title="Delete {{ htmlspecialchars($group->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/group', $group->id) }}" data-content="@lang('admin/groups/message.delete.confirm')"
data-title="@lang('general.delete')"
{{ htmlspecialchars($group->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
</td>
</tr>
@endforeach
@else
<tr>
<td colspan="5">No results</td>
<td colspan="5">@lang('general.no_results')</td>
</tr>
@endif
</tbody>
Expand Down
14 changes: 5 additions & 9 deletions app/views/backend/hardware/checkin.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

{{-- Page title --}}
@section('title')
@if ($asset->id)
Checkin Asset ::
@else
Checkin Asset ::
@endif
@lang('admin/hardware/general.checkin') ::
@parent
@stop

Expand All @@ -16,7 +12,7 @@
<div class="row header">
<div class="col-md-12">
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
<h3> Checkin Asset </h3>
<h3> @lang('admin/hardware/general.checkin')</h3>
</div>
</div>

Expand All @@ -30,22 +26,22 @@

<!-- Asset tag -->
<div class="form-group">
<label class="col-sm-2 control-label">Asset Tag</label>
<label class="col-sm-2 control-label">@lang('admin/hardware/form.tag')</label>
<div class="col-md-6">
<p class="form-control-static">{{ $asset->asset_tag }}</p>
</div>
</div>

<!-- Asset name -->
<div class="form-group">
<label class="col-sm-2 control-label">Asset Name</label>
<label class="col-sm-2 control-label">@lang('admin/hardware/form.name')</label>
<div class="col-md-6">
<p class="form-control-static">{{ $asset->name }}</p>
</div>
</div>
<!-- Note -->
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
<label for="note" class="col-md-2 control-label">Note</label>
<label for="note" class="col-md-2 control-label">@lang('admin/hardware/form.notes')</label>
<div class="col-md-7">
<input class="col-md-6 form-control" type="text" name="note" id="note" value="{{ Input::old('note', $asset->note) }}" />
{{ $errors->first('note', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
Expand Down
29 changes: 10 additions & 19 deletions app/views/backend/hardware/checkout.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

{{-- Page title --}}
@section('title')
@if ($asset->id)
Checkout Asset to User::
@else
Checkout Asset to User ::
@endif
@lang('admin/hardware/general.checkout') ::
@parent
@stop

Expand All @@ -15,14 +11,9 @@

<div class="row header">
<div class="col-md-12">
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right"><i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
<h3>
@if ($asset->id)
Checkout Asset to User
@else
Create Asset
@endif
</h3>
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right">
<i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
<h3> @lang('admin/hardware/general.checkout')</h3>
</div>
</div>

Expand All @@ -36,23 +27,23 @@

<!-- Asset tag -->
<div class="form-group">
<label class="col-sm-2 control-label">Asset Tag</label>
<label class="col-sm-2 control-label">@lang('admin/hardware/form.tag')</label>
<div class="col-md-6">
<p class="form-control-static">{{ $asset->asset_tag }}</p>
</div>
</div>

<!-- Asset name -->
<div class="form-group">
<label class="col-sm-2 control-label">Asset Name</label>
<label class="col-sm-2 control-label">@lang('admin/hardware/form.name')</label>
<div class="col-md-6">
<p class="form-control-static">{{ $asset->name }}</p>
</div>
</div>
<!-- User -->

<div class="form-group {{ $errors->has('assigned_to') ? ' has-error' : '' }}">
<label for="assigned_to" class="col-md-2 control-label">Checkout to</label>
<label for="assigned_to" class="col-md-2 control-label">@lang('admin/hardware/form.checkout_to')</label>
<div class="col-md-7">
{{ Form::select('assigned_to', $users_list , Input::old('assigned_to', $asset->assigned_to), array('class'=>'select2', 'style'=>'min-width:350px')) }}
{{ $errors->first('assigned_to', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
Expand All @@ -61,7 +52,7 @@

<!-- Note -->
<div class="form-group {{ $errors->has('note') ? 'error' : '' }}">
<label for="note" class="col-md-2 control-label">Note</label>
<label for="note" class="col-md-2 control-label">@lang('admin/hardware/form.notes')</label>
<div class="col-md-7">
<input class="col-md-6 form-control" type="text" name="note" id="note" value="{{ Input::old('note', $asset->note) }}" />
{{ $errors->first('note', '<span class="alert-msg"><i class="icon-remove-sign"></i> :message</span>') }}
Expand All @@ -72,8 +63,8 @@
<div class="form-group">
<label class="col-md-2 control-label"></label>
<div class="col-md-7">
<a class="btn btn-link" href="{{ URL::previous() }}">Cancel</a>
<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> Save</button>
<a class="btn btn-link" href="{{ URL::previous() }}"> @lang('general.cancel')</a>
<button type="submit" class="btn btn-success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
</div>
</div>

Expand Down
33 changes: 17 additions & 16 deletions app/views/backend/hardware/clone.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{{-- Page title --}}
@section('title')
Clone Asset
@lang('admin/hardware/general.clone') ::
@parent
@stop

Expand All @@ -14,7 +14,7 @@
<a href="{{ URL::previous() }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
</div>

<h3>Clone Asset</h3>
<h3>@lang('admin/hardware/general.clone')</h3>
</div>


Expand All @@ -24,15 +24,15 @@

<!-- Asset Tag -->
<div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">
<label class="control-label" for="asset_tag">Asset Tag</label>
<label class="control-label" for="asset_tag">@lang('admin/hardware/form.tag')</label>
<div class="controls">
<input class="col-md-4" type="text" name="asset_tag" id="asset_tag" value="{{ Input::old('asset_tag') }}" />
{{ $errors->first('asset_tag', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>
<!-- Asset Title -->
<div class="form-group {{ $errors->has('name') ? 'error' : '' }}">
<label class="control-label" for="name">Asset Name</label>
<label class="control-label" for="name">@lang('admin/hardware/form.name')</label>
<div class="controls">
<input class="col-md-4" type="text" name="name" id="name" value="{{ Input::old('name', $asset->name) }}" />
{{ $errors->first('name', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
Expand All @@ -42,7 +42,7 @@

<!-- Serial -->
<div class="form-group {{ $errors->has('serial') ? 'error' : '' }}">
<label class="control-label" for="serial">Serial</label>
<label class="control-label" for="serial">@lang('admin/hardware/form.serial')</label>
<div class="controls">
<input class="col-md-4" type="text" name="serial" id="serial" value="{{ Input::old('serial', $asset->serial) }}" />
{{ $errors->first('serial', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
Expand All @@ -51,7 +51,7 @@

<!-- Order Number -->
<div class="form-group {{ $errors->has('order_number') ? 'error' : '' }}">
<label class="control-label" for="order_number">Order Number</label>
<label class="control-label" for="order_number">@lang('admin/hardware/form.order')</label>
<div class="controls">
<input class="col-md-4" type="text" name="order_number" id="order_number" value="{{ Input::old('order_number', $asset->order_number) }}" />
{{ $errors->first('order_number', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
Expand All @@ -60,7 +60,7 @@

<!-- Model -->
<div class="form-group {{ $errors->has('model_id') ? 'error' : '' }}">
<label class="control-label" for="parent">Model</label>
<label class="control-label" for="parent">@lang('admin/hardware/form.model')</label>
<div class="controls">
{{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:350px')) }}
{{ $errors->first('model_id', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
Expand All @@ -69,7 +69,7 @@

<!-- Purchase Date -->
<div class="form-group input-append {{ $errors->has('purchase_date') ? 'error' : '' }}" >
<label class="control-label" for="purchase_date">Purchase Date</label>
<label class="control-label" for="purchase_date">@lang('admin/hardware/form.date')</label>
<div class="controls">
<input type="text" class="datepicker span2" data-date-format="yyyy-mm-dd" placeholder="Select Date" name="purchase_date" id="purchase_date" value="{{ Input::old('purchase_date', $asset->purchase_date) }}">
{{ $errors->first('purchase_date', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
Expand All @@ -79,7 +79,7 @@

<!-- Purchase Cost -->
<div class="form-group {{ $errors->has('purchase_cost') ? 'error' : '' }}">
<label class="control-label" for="purchase_cost">Purchase Cost</label>
<label class="control-label" for="purchase_cost">@lang('admin/hardware/form.cost')</label>
<div class="controls">
<div class="input-prepend">
<span class="add-on">$</span>
Expand All @@ -91,16 +91,17 @@

<!-- Warrantee -->
<div class="form-group {{ $errors->has('warranty_months') ? 'error' : '' }}">
<label class="control-label" for="serial">Warranty</label>
<label class="control-label" for="serial">@lang('admin/hardware/form.warranty')</label>
<div class="controls">
<input class="col-md-1" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" /> months
<input class="col-md-1" type="text" name="warranty_months" id="warranty_months" value="{{ Input::old('warranty_months', $asset->warranty_months) }}" />
@lang('admin/hardware/form.months')
{{ $errors->first('warranty_months', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
</div>
</div>

<!-- Depreciation -->
<div class="form-group {{ $errors->has('depreciation_id') ? 'error' : '' }}">
<label class="control-label" for="parent">Depreciation</label>
<label class="control-label" for="parent">@lang('admin/hardware/form.depreciation')</label>
<div class="controls">
<div class="field-box">
{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $asset->depreciation_id), array('class'=>'select2', 'style'=>'width:250px')) }}
Expand All @@ -111,7 +112,7 @@

<!-- Status -->
<div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
<label class="control-label" for="parent">Status</label>
<label class="control-label" for="parent">@lang('admin/hardware/form.status')</label>
<div class="controls">
<div class="field-box">
{{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:250px')) }}
Expand All @@ -123,7 +124,7 @@

<!-- Notes -->
<div class="form-group {{ $errors->has('notes') ? 'error' : '' }}">
<label class="control-label" for="notes">Notes</label>
<label class="control-label" for="notes">@lang('admin/hardware/form.notes')</label>
<div class="controls">
<input class="col-md-6" type="text" name="notes" id="notes" value="{{ Input::old('notes', $asset->notes) }}" />
{{ $errors->first('notes', '<span class="help-inline"><i class="icon-remove-sign"></i> :message</span>') }}
Expand All @@ -133,8 +134,8 @@
<!-- Form actions -->
<div class="form-group">
<div class="controls">
<a class="btn btn-link" href="{{ URL::previous() }}">Cancel</a>
<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> Save</button>
<a class="btn btn-link" href="{{ URL::previous() }}">@lang('general.cancel')</a>
<button type="submit" class="btn-flat success"><i class="icon-ok icon-white"></i> @lang('general.save')</button>
</div>
</div>
</form>
Expand Down

0 comments on commit 75590b6

Please sign in to comment.