Skip to content

Commit c937796

Browse files
snipesnipe
committed
More language strings, per #151 
1 parent 74653d3 commit c937796

File tree

10 files changed

+76
-47
lines changed

10 files changed

+76
-47
lines changed

‎app/lang/en/admin/settings/general.php‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?php
2+
3+
return array(
4+
'display_qr' => 'Display QR Codes',
5+
'info' => 'These settings let you customize certain aspects of your installation.',
6+
'php_gd_info' => 'You must install php-gd to display QR codes, see <a href="http://www.php.net/manual/en/image.installation.php">install instructions</a>.',
7+
'php_gd_warning' => 'PHP Image Processing and GD plugin is NOT installed.',
8+
'qr_help' => 'Enable QR Codes first to set this',
9+
'qr_text' => 'QR Code Text',
10+
'setting' => 'Setting',
11+
'title' => 'Settings',
12+
'update' => 'Update Settings',
13+
'value' => 'Value',
14+
);

‎app/lang/en/admin/statuslabels/table.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<?php
22

33
return array(
4-
'name' => 'Status Name',
4+
'name' => 'Status Name',
5+
'title' => 'Status Labels',
6+
'update' => 'Update Status Label',
7+
'create' => 'Create Status Label',
8+
'about' => 'About Status Labels',
9+
'info' => 'Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. It could be broken, out for diagnostics, out for repair, lost or stolen, etc. Status labels allow your team to show the progression.',
510
);

‎app/lang/en/admin/users/table.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
'last_login' => 'Last Login',
1212
'last_name' => 'Last Name',
1313
'name' => 'Name',
14-
15-
14+
'manager' => 'Manager',
15+
'job' => 'Job Title',
16+
'title' => 'User Manager',
1617
);

‎app/lang/en/general.php‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,14 @@
5050
'no' => 'No',
5151
'pending' => 'Pending',
5252
'people' => 'People',
53+
'per_page' => 'Results Per Page',
5354
'profile' => 'Your profile',
5455
'ready_to_deploy' => 'Ready to Deploy',
5556
'reports' => 'Reports',
5657
'save' => 'Save',
5758
'settings' => 'Settings',
5859
'sign_in' => 'Sign in',
60+
'site_name' => 'Site Name',
5961
'state' => 'State',
6062
'status_labels' => 'Status Labels',
6163
'status' => 'Status',

‎app/views/backend/reports/index.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{-- Page title --}}
44
@section('title')
5-
Depreciation Report
5+
@lang('general.depreciation_report') ::
66
@parent
77
@stop
88

‎app/views/backend/settings/edit.blade.php‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{-- Page title --}}
44
@section('title')
5-
Update Settings ::
5+
@lang('admin/settings/general.update') ::
66
@parent
77
@stop
88

@@ -12,10 +12,11 @@
1212
<!-- header -->
1313

1414
<div class="pull-right">
15-
<a href="{{ URL::previous() }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
15+
<a href="{{ URL::previous() }}" class="btn-flat gray">
16+
<i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
1617
</div>
1718

18-
<h3 class="name">Update Settings</h3>
19+
<h3 class="name">@lang('admin/settings/general.update')</h3>
1920

2021

2122
<div class="row-fluid profile">
@@ -47,29 +48,32 @@
4748
</div>
4849

4950
<div class="form-group {{ $errors->has('qr_code') ? 'error' : '' }}">
50-
<label class="control-label" for="qr_code">Display QR Codes</label>
51+
<label class="control-label" for="qr_code">
52+
@lang('admin/settings/general.display_qr')
53+
Display QR Codes</label>
5154
<div class="controls">
5255
@if ($is_gd_installed)
5356
<input class="col-md-1" type="checkbox" name="qr_code" id="qr_code" value="1" {{ $setting->qr_code === '1' ? 'checked' : '' }} />
5457
@else
5558
<span class="help-inline">
56-
PHP Image Processing and GD plugin is NOT installed.
59+
@lang('admin/settings/general.php_gd_warning')
5760
<br>
58-
You must install php-gd to display QR codes, see <a href="http://www.php.net/manual/en/image.installation.php">install instructions</a>.
61+
@lang('admin/settings/general.php_gd_info')
5962
</span>
6063
@endif
6164
{{ $errors->first('qr_code', '<span class="help-inline">:message</span>') }}
6265
</div>
6366
</div>
6467

6568
<div class="form-group {{ $errors->has('qr_text') ? 'error' : '' }}">
66-
<label class="control-label" for="qr_text">QR Code Text</label>
69+
<label class="control-label" for="qr_text"> @lang('admin/settings/general.qr_text')</label>
6770
<div class="controls">
6871
@if ($setting->qr_code === '1')
6972
<input class="col-md-9" type="text" name="qr_text" id="qr_text" value="{{ Input::old('qr_text', $setting->qr_text) }}" />
7073
@else
7174
<span class="help-inline">
72-
Enable QR Codes first to set this
75+
@lang('admin/settings/general.qr_help')
76+
7377
</span>
7478
@endif
7579
{{ $errors->first('qr_text', '<span class="help-inline">:message</span>') }}
@@ -95,7 +99,7 @@
9599
<!-- side address column -->
96100
<div class="col-md-3 address pull-right">
97101
<br /><br />
98-
<p>These settings let you customize certain aspects of your installation. </p>
102+
<p>@lang('admin/settings/general.info')</p>
99103

100104
</div>
101105

‎app/views/backend/settings/index.blade.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{-- Page title --}}
44
@section('title')
5-
Settings ::
5+
@lang('admin/settings/general.title') ::
66
@parent
77
@stop
88

@@ -16,7 +16,7 @@
1616
</div>
1717

1818

19-
<h3 class="name">Settings</h3>
19+
<h3 class="name">@lang('admin/settings/general.title')</h3>
2020

2121

2222
<div class="row-fluid profile">
@@ -29,30 +29,30 @@
2929
<table class="table table-hover">
3030
<thead>
3131
<tr>
32-
<th class="col-md-3">Setting</th>
33-
<th class="col-md-3"><span class="line"></span>Value</th>
32+
<th class="col-md-3">@lang('admin/settings/general.setting')</th>
33+
<th class="col-md-3"><span class="line"></span>@lang('admin/settings/general.value')</th>
3434
</tr>
3535
</thead>
3636
<tbody>
3737
@foreach ($settings as $setting)
3838
<tr>
39-
<td>Site Name</td>
39+
<td>@lang('general.site_name')</td>
4040
<td>{{ $setting->site_name }} </td>
4141
</tr>
4242
<tr>
43-
<td>Per Page</td>
43+
<td>@lang('general.per_page')</td>
4444
<td>{{ $setting->per_page }} </td>
4545
</tr>
4646
<tr>
47-
<td>Display QR Codes</td>
47+
<td>@lang('admin/settings/general.display_qr')</td>
4848
@if ($setting->qr_code === '1')
4949
<td>Yes</td>
5050
@else
5151
<td>No</td>
5252
@endif
5353
</tr>
5454
<tr>
55-
<td>QR Code Text</td>
55+
<td>@lang('admin/settings/general.qr_text')</td>
5656
<td>{{ $setting->qr_text }}</td>
5757
</tr>
5858
@endforeach
@@ -66,7 +66,7 @@
6666
<div class="col-md-3 address pull-right">
6767
<br /><br />
6868

69-
<p>These settings let you customize certain aspects of your installation. </p>
69+
<p>@lang('admin/settings/general.info')</p>
7070

7171
</div>
7272
@stop

‎app/views/backend/statuslabels/edit.blade.php‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
{{-- Page title --}}
44
@section('title')
55
@if ($statuslabel->id)
6-
Update Status Label ::
6+
@lang('admin/statuslabels/table.update') ::
77
@else
8-
Create New Status Label ::
8+
@lang('admin/statuslabels/table.create') ::
99
@endif
1010
@parent
1111
@stop
@@ -15,8 +15,15 @@
1515

1616
<div class="row header">
1717
<div class="col-md-12">
18-
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
19-
<h3>Status Labels</h3>
18+
<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right">
19+
<i class="icon-circle-arrow-left icon-white"></i> @lang('general.back')</a>
20+
<h3>
21+
@if ($statuslabel->id)
22+
@lang('admin/statuslabels/table.update')
23+
@else
24+
@lang('admin/statuslabels/table.create')
25+
@endif
26+
</h3>
2027
</div>
2128
</div>
2229

@@ -55,16 +62,13 @@
5562

5663
</div>
5764

58-
<!-- side address column -->
59-
<div class="col-md-3 address pull-right">
60-
<br /><br />
61-
<h6>About Status Labels</h6>
62-
<p>Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. </p>
65+
<!-- side address column -->
66+
<div class="col-md-3 address pull-right">
67+
<br /><br />
68+
<h6>@lang('admin/statuslabels/table.about')</h6>
69+
<p>@lang('admin/statuslabels/table.info')</p>
6370

64-
<p>It could be broken, out for diagnostics, out for
65-
repair, lost or stolen, etc. Status labels allow your team to show the progression.</p>
66-
67-
</div>
71+
</div>
6872

6973

7074
@stop

‎app/views/backend/statuslabels/index.blade.php‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{-- Page title --}}
44
@section('title')
5-
Status Labels
5+
@lang('admin/statuslabels/table.title') ::
66
@parent
77
@stop
88

@@ -13,7 +13,7 @@
1313
<div class="row header">
1414
<div class="col-md-12">
1515
<a href="{{ route('create/statuslabel') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i> @lang('general.create')</a>
16-
<h3>Status Labels</h3>
16+
<h3>@lang('admin/statuslabels/table.title')</h3>
1717
</div>
1818
</div>
1919

@@ -37,7 +37,9 @@
3737
<td>{{ $statuslabel->name }}</td>
3838
<td>
3939
<a href="{{ route('update/statuslabel', $statuslabel->id) }}" class="btn btn-warning"><i class="icon-pencil icon-white"></i></a>
40-
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/statuslabel', $statuslabel->id) }}" data-content="Are you sure you wish to delete this status label?" data-title="Delete {{ htmlspecialchars($statuslabel->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
40+
<a data-html="false" class="btn delete-asset btn-danger" data-toggle="modal" href="{{ route('delete/statuslabel', $statuslabel->id) }}" data-content="@lang('admin/statuslabels/message.delete.confirm')"
41+
data-title="@lang('general.delete')
42+
{{ htmlspecialchars($statuslabel->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
4143
</td>
4244
</tr>
4345
@endforeach
@@ -49,11 +51,8 @@
4951
<!-- side address column -->
5052
<div class="col-md-3 col-xs-12 address pull-right">
5153
<br /><br />
52-
<h6>About Status Labels</h6>
53-
<p>Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. </p>
54-
55-
<p>It could be broken, out for diagnostics, out for
56-
repair, lost or stolen, etc. Status labels allow your team to show the progression.</p>
54+
<h6>@lang('admin/statuslabels/table.about')</h6>
55+
<p>@lang('admin/statuslabels/table.info')</p>
5756

5857
</div>
5958

‎app/views/backend/users/index.blade.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
{{-- Page title --}}
44
@section('title')
5-
User Management ::
5+
@lang('admin/users/table.title') ::
66
@parent
77
@stop
88

@@ -38,9 +38,9 @@
3838
<tr role="row">
3939
<th class="col-md-3">@lang('admin/users/table.name')</th>
4040
<th class="col-md-2">@lang('admin/users/table.email')</th>
41-
<th class="col-md-2">Manager</th>
42-
<th class="col-md-1">Assets</th>
43-
<th class="col-md-1">Licenses</th>
41+
<th class="col-md-2">@lang('admin/users/table.manager')</th>
42+
<th class="col-md-1">@lang('general.assets')</th>
43+
<th class="col-md-1">@lang('general.licenses')</th>
4444
<th class="col-md-1">@lang('admin/users/table.activated')</th>
4545
<th class="col-md-2 actions">@lang('table.actions')</th>
4646
</tr>

0 commit comments

Comments
 (0)