More language strings, per #151

snipe · Jun 10, 2014 · c937796 · c937796
1 parent 74653d3
commit c937796
Show file tree

Hide file tree

Showing 10 changed files with 76 additions and 47 deletions.
diff --git a/app/lang/en/admin/settings/general.php b/app/lang/en/admin/settings/general.php
@@ -0,0 +1,14 @@
+<?php
+
+return array(
+	'display_qr'				=> 'Display QR Codes',
+	'info'  					=> 'These settings let you customize certain aspects of your installation.',
+	'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>.',
+	'php_gd_warning'			=> 'PHP Image Processing and GD plugin is NOT installed.',
+	'qr_help'					=> 'Enable QR Codes first to set this',
+	'qr_text'					=> 'QR Code Text',
+	'setting'					=> 'Setting',
+	'title'  					=> 'Settings',
+	'update'  					=> 'Update Settings',
+	'value'					=> 'Value',
+);
diff --git a/app/lang/en/admin/statuslabels/table.php b/app/lang/en/admin/statuslabels/table.php
@@ -1,5 +1,10 @@
 <?php
 
 return array(
-	'name'      => 'Status Name',
+	'name'      	=> 'Status Name',
+	'title'      	=> 'Status Labels',
+	'update'      	=> 'Update Status Label',
+	'create'      	=> 'Create Status Label',
+	'about'      	=> 'About Status Labels',
+	'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.',
 );
diff --git a/app/lang/en/admin/users/table.php b/app/lang/en/admin/users/table.php
@@ -11,6 +11,7 @@
 	'last_login'  	=> 'Last Login',
 	'last_name'  	=> 'Last Name',
 	'name' 			=> 'Name',
-
-
+	'manager' 		=> 'Manager',
+	'job' 			=> 'Job Title',
+	'title' 		=> 'User Manager',
 );
diff --git a/app/lang/en/general.php b/app/lang/en/general.php
@@ -50,12 +50,14 @@
 	'no'  					=> 'No',
 	'pending'				=> 'Pending',
 	'people'				=> 'People',
+	'per_page'				=> 'Results Per Page',
 	'profile'				=> 'Your profile',
 	'ready_to_deploy'		=> 'Ready to Deploy',
 	'reports'				=> 'Reports',
 	'save'  				=> 'Save',
 	'settings'				=> 'Settings',
 	'sign_in'				=> 'Sign in',
+	'site_name'				=> 'Site Name',
 	'state'  				=> 'State',
 	'status_labels'			=> 'Status Labels',
 	'status'    			=> 'Status',

diff --git a/app/views/backend/reports/index.blade.php b/app/views/backend/reports/index.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-Depreciation Report
+@lang('general.depreciation_report') ::
 @parent
 @stop
 

diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-		Update Settings ::
+		@lang('admin/settings/general.update') ::
 @parent
 @stop
 
@@ -12,10 +12,11 @@
                 <!-- header -->
 
                 <div class="pull-right">
-					<a href="{{ URL::previous() }}" class="btn-flat gray"><i class="icon-circle-arrow-left icon-white"></i>  @lang('general.back')</a>
+					<a href="{{ URL::previous() }}" class="btn-flat gray">
+					<i class="icon-circle-arrow-left icon-white"></i>  @lang('general.back')</a>
 				</div>
 
-				<h3 class="name">Update Settings</h3>
+				<h3 class="name">@lang('admin/settings/general.update')</h3>
 
 
                 <div class="row-fluid profile">
@@ -47,29 +48,32 @@
 									</div>
 
 									<div class="form-group {{ $errors->has('qr_code') ? 'error' : '' }}">
-										<label class="control-label" for="qr_code">Display QR Codes</label>
+										<label class="control-label" for="qr_code">
+										@lang('admin/settings/general.display_qr')
+										Display QR Codes</label>
 										<div class="controls">
 									@if ($is_gd_installed)
 											<input class="col-md-1" type="checkbox" name="qr_code" id="qr_code" value="1" {{ $setting->qr_code === '1' ? 'checked' : '' }} />
 									@else
 											<span class="help-inline">
-												PHP Image Processing and GD plugin is NOT installed.
+												@lang('admin/settings/general.php_gd_warning')
 												<br>
-												You must install php-gd to display QR codes, see <a href="http://www.php.net/manual/en/image.installation.php">install instructions</a>.
+												@lang('admin/settings/general.php_gd_info')
 											</span>
 									@endif
 											{{ $errors->first('qr_code', '<span class="help-inline">:message</span>') }}
 											</div>
 									</div>
 
 									<div class="form-group {{ $errors->has('qr_text') ? 'error' : '' }}">
-										<label class="control-label" for="qr_text">QR Code Text</label>
+										<label class="control-label" for="qr_text"> @lang('admin/settings/general.qr_text')</label>
 										<div class="controls">
 									@if ($setting->qr_code === '1')
 											<input class="col-md-9" type="text" name="qr_text" id="qr_text" value="{{ Input::old('qr_text', $setting->qr_text) }}" />
 									@else
 											<span class="help-inline">
-												Enable QR Codes first to set this
+												@lang('admin/settings/general.qr_help')
+
 											</span>
 									@endif
 											{{ $errors->first('qr_text', '<span class="help-inline">:message</span>') }}
@@ -95,7 +99,7 @@
                     <!-- side address column -->
                     <div class="col-md-3 address pull-right">
 					<br /><br />
-						<p>These settings let you customize certain aspects of your installation. </p>
+						<p>@lang('admin/settings/general.info')</p>
 
                     </div>
 

diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-Settings ::
+@lang('admin/settings/general.title') ::
 @parent
 @stop
 
@@ -16,7 +16,7 @@
 				</div>
 
 
-				<h3 class="name">Settings</h3>
+				<h3 class="name">@lang('admin/settings/general.title')</h3>
 
 
                 <div class="row-fluid profile">
@@ -29,30 +29,30 @@
                             <table class="table table-hover">
 							<thead>
 								<tr>
-									<th class="col-md-3">Setting</th>
-									<th class="col-md-3"><span class="line"></span>Value</th>
+									<th class="col-md-3">@lang('admin/settings/general.setting')</th>
+									<th class="col-md-3"><span class="line"></span>@lang('admin/settings/general.value')</th>
 								</tr>
 							</thead>
 							<tbody>
 								@foreach ($settings as $setting)
 								<tr>
-									<td>Site Name</td>
+									<td>@lang('general.site_name')</td>
 									<td>{{ $setting->site_name }}  </td>
 								</tr>
 								<tr>
-									<td>Per Page</td>
+									<td>@lang('general.per_page')</td>
 									<td>{{ $setting->per_page }}  </td>
 								</tr>
 								<tr>
-									<td>Display QR Codes</td>
+									<td>@lang('admin/settings/general.display_qr')</td>
 @if ($setting->qr_code === '1')
 								<td>Yes</td>
 @else
 								<td>No</td>
 @endif
 								</tr>
 <tr>
-									<td>QR Code Text</td>
+									<td>@lang('admin/settings/general.qr_text')</td>
 									<td>{{ $setting->qr_text }}</td>
 								</tr>
 								@endforeach
@@ -66,7 +66,7 @@
                     <div class="col-md-3 address pull-right">
 						<br /><br />
 
-						<p>These settings let you customize certain aspects of your installation. </p>
+						<p>@lang('admin/settings/general.info')</p>
 
                     </div>
 @stop
diff --git a/app/views/backend/statuslabels/edit.blade.php b/app/views/backend/statuslabels/edit.blade.php
@@ -3,9 +3,9 @@
 {{-- Page title --}}
 @section('title')
 	@if ($statuslabel->id)
-		Update Status Label ::
+		@lang('admin/statuslabels/table.update') ::
 	@else
-		Create New Status Label ::
+		@lang('admin/statuslabels/table.create') ::
 	@endif
 @parent
 @stop
@@ -15,8 +15,15 @@
 
 <div class="row header">
     <div class="col-md-12">
-    	<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right"><i class="icon-circle-arrow-left icon-white"></i>  @lang('general.back')</a>
-		<h3>Status Labels</h3>
+    	<a href="{{ URL::previous() }}" class="btn-flat gray pull-right right">
+    	<i class="icon-circle-arrow-left icon-white"></i>  @lang('general.back')</a>
+		<h3>
+		@if ($statuslabel->id)
+			@lang('admin/statuslabels/table.update')
+		@else
+			@lang('admin/statuslabels/table.create')
+		@endif
+		</h3>
 	</div>
 </div>
 
@@ -55,16 +62,13 @@
 
 </div>
 
-                    <!-- side address column -->
-                    <div class="col-md-3 address pull-right">
-					<br /><br />
-						<h6>About Status Labels</h6>
-						<p>Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. </p>
+			<!-- side address column -->
+			<div class="col-md-3 address pull-right">
+			<br /><br />
+				<h6>@lang('admin/statuslabels/table.about')</h6>
+				<p>@lang('admin/statuslabels/table.info')</p>
 
-						<p>It could be broken, out for diagnostics, out for
-						repair, lost or stolen, etc. Status labels allow your team to show the progression.</p>
-
-                    </div>
+			</div>
 
 
 @stop
diff --git a/app/views/backend/statuslabels/index.blade.php b/app/views/backend/statuslabels/index.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-Status Labels
+@lang('admin/statuslabels/table.title') ::
 @parent
 @stop
 
@@ -13,7 +13,7 @@
 <div class="row header">
     <div class="col-md-12">
     	<a href="{{ route('create/statuslabel') }}" class="btn btn-success pull-right"><i class="icon-plus-sign icon-white"></i>  @lang('general.create')</a>
-		<h3>Status Labels</h3>
+		<h3>@lang('admin/statuslabels/table.title')</h3>
 	</div>
 </div>
 
@@ -37,7 +37,9 @@
 					<td>{{ $statuslabel->name }}</td>
 					<td>
 						<a href="{{ route('update/statuslabel', $statuslabel->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/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>
+<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')"
+				data-title="@lang('general.delete')
+				 {{ htmlspecialchars($statuslabel->name) }}?" onClick="return false;"><i class="icon-trash icon-white"></i></a>
 					</td>
 				</tr>
 				@endforeach
@@ -49,11 +51,8 @@
 	<!-- side address column -->
    <div class="col-md-3 col-xs-12 address pull-right">
 		<br /><br />
-		<h6>About Status Labels</h6>
-		<p>Status labels are used to describe the various reasons why an asset <strong><em>cannot</em></strong> be deployed. </p>
-
-		<p>It could be broken, out for diagnostics, out for
-		repair, lost or stolen, etc. Status labels allow your team to show the progression.</p>
+		<h6>@lang('admin/statuslabels/table.about')</h6>
+		<p>@lang('admin/statuslabels/table.info')</p>
 
 	</div>
 

diff --git a/app/views/backend/users/index.blade.php b/app/views/backend/users/index.blade.php
@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-User Management ::
+@lang('admin/users/table.title') ::
 @parent
 @stop
 
@@ -38,9 +38,9 @@
 		<tr role="row">
 			<th class="col-md-3">@lang('admin/users/table.name')</th>
 			<th class="col-md-2">@lang('admin/users/table.email')</th>
-			<th class="col-md-2">Manager</th>
-			<th class="col-md-1">Assets</th>
-			<th class="col-md-1">Licenses</th>
+			<th class="col-md-2">@lang('admin/users/table.manager')</th>
+			<th class="col-md-1">@lang('general.assets')</th>
+			<th class="col-md-1">@lang('general.licenses')</th>
 			<th class="col-md-1">@lang('admin/users/table.activated')</th>
 			<th class="col-md-2 actions">@lang('table.actions')</th>
 		</tr>