diff --git a/app/Console/Commands/SendExpirationAlerts.php b/app/Console/Commands/SendExpirationAlerts.php
index 5c9f14644f..d25a3cb799 100644
--- a/app/Console/Commands/SendExpirationAlerts.php
+++ b/app/Console/Commands/SendExpirationAlerts.php
@@ -66,7 +66,7 @@ class SendExpirationAlerts extends Command
$asset_data['email_content'] .= '| ';
$asset_data['email_content'] .= $asset->showAssetName().' | '.e($asset->asset_tag).' | ';
$asset_data['email_content'] .= ''.e($asset->warrantee_expires()).' | ';
- $asset_data['email_content'] .= ''.$difference.' days | ';
+ $asset_data['email_content'] .= ''.$difference.' '.trans('mail.days').' | ';
$asset_data['email_content'] .= ''.($asset->supplier ? e($asset->supplier->name) : '').' | ';
$asset_data['email_content'] .= ''.($asset->assigneduser ? e($asset->assigneduser->fullName()) : '').' | ';
$asset_data['email_content'] .= '';
@@ -104,7 +104,7 @@ class SendExpirationAlerts extends Command
\Mail::send('emails.expiring-assets-report', $asset_data, function ($m) {
$m->to(explode(',', Setting::getSettings()->alert_email), Setting::getSettings()->site_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Expiring Assets Report');
+ $m->subject(trans('mail.Expiring_Assets_Report'));
});
}
@@ -114,7 +114,7 @@ class SendExpirationAlerts extends Command
\Mail::send('emails.expiring-licenses-report', $license_data, function ($m) {
$m->to(explode(',', Setting::getSettings()->alert_email), Setting::getSettings()->site_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Expiring Licenses Report');
+ $m->subject(trans('mail.Expiring_Licenses_Report'));
});
}
diff --git a/app/Console/Commands/SendInventoryAlerts.php b/app/Console/Commands/SendInventoryAlerts.php
index 346222c430..1822733b22 100644
--- a/app/Console/Commands/SendInventoryAlerts.php
+++ b/app/Console/Commands/SendInventoryAlerts.php
@@ -51,7 +51,7 @@ class SendInventoryAlerts extends Command
\Mail::send('emails.low-inventory', $data, function ($m) {
$m->to(explode(',', Setting::getSettings()->alert_email), Setting::getSettings()->site_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Low Inventory Report');
+ $m->subject(trans('mail.Low_Inventory_Report'));
});
}
diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php
index 9a594ccc4a..4cba6699a6 100755
--- a/app/Http/Controllers/AccessoriesController.php
+++ b/app/Http/Controllers/AccessoriesController.php
@@ -366,7 +366,7 @@ class AccessoriesController extends Controller
Mail::send('emails.accept-accessory', $data, function ($m) use ($user) {
$m->to($user->email, $user->first_name . ' ' . $user->last_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Confirm accessory delivery');
+ $m->subject(trans('mail.Confirm_accessory_delivery'));
});
}
@@ -485,7 +485,7 @@ class AccessoriesController extends Controller
Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
$m->to($user->email, $user->first_name . ' ' . $user->last_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Confirm Accessory Checkin');
+ $m->subject(trans('mail.Confirm_Accessory_Checkin'));
});
}
diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php
index c8debd5a4e..5fd2c9e44d 100755
--- a/app/Http/Controllers/AssetsController.php
+++ b/app/Http/Controllers/AssetsController.php
@@ -687,7 +687,7 @@ class AssetsController extends Controller
Mail::send('emails.checkin-asset', $data, function ($m) use ($user) {
$m->to($user->email, $user->first_name . ' ' . $user->last_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Confirm Asset Checkin');
+ $m->subject(trans('mail.Confirm_Asset_Checkin'));
});
}
diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php
index 6f3636d0b5..e39a114cd7 100644
--- a/app/Http/Controllers/Auth/PasswordController.php
+++ b/app/Http/Controllers/Auth/PasswordController.php
@@ -37,4 +37,13 @@ class PasswordController extends Controller
{
$this->middleware('guest');
}
+
+ /**
+ * Get the e-mail subject line to be used for the reset link email.
+ * Overriding method "getEmailSubject()" from trait "use ResetsPasswords"
+ * @return string
+ */
+ public function getEmailSubject(){
+ return property_exists($this, 'subject') ? $this->subject : \Lang::get('mail.reset_link');
+ }
}
diff --git a/app/Http/Controllers/ConsumablesController.php b/app/Http/Controllers/ConsumablesController.php
index b6d57282b4..3812004c00 100644
--- a/app/Http/Controllers/ConsumablesController.php
+++ b/app/Http/Controllers/ConsumablesController.php
@@ -366,7 +366,7 @@ class ConsumablesController extends Controller
Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
$m->to($user->email, $user->first_name . ' ' . $user->last_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Confirm consumable delivery');
+ $m->subject(trans('mail.Confirm_consumable_delivery'));
});
}
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index fc45eb8898..d3e8188225 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -148,7 +148,7 @@ class SettingsController extends Controller
Mail::send('emails.test', [], function ($m) {
$m->to(config('mail.from.address'), config('mail.from.name'));
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Test Email from Snipe-IT');
+ $m->subject(trans('mail.test_email'));
});
return 'success';
} catch (Exception $e) {
@@ -201,7 +201,7 @@ class SettingsController extends Controller
Mail::send(['text' => 'emails.firstadmin'], $data, function ($m) use ($data) {
$m->to($data['email'], $data['first_name']);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Your Snipe-IT credentials');
+ $m->subject(trans('mail.your_credentials'));
});
}
diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php
index 34797d3fa2..ac6032cc72 100755
--- a/app/Http/Controllers/UsersController.php
+++ b/app/Http/Controllers/UsersController.php
@@ -158,7 +158,7 @@ class UsersController extends Controller
Mail::send('emails.send-login', $data, function ($m) use ($user) {
$m->to($user->email, $user->first_name . ' ' . $user->last_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Welcome ' . $user->first_name);
+ $m->subject(trans('mail.welcome', ['name' => $user->first_name]));
});
}
return redirect::route('users')->with('success', trans('admin/users/message.success.create'));
@@ -211,7 +211,7 @@ class UsersController extends Controller
Mail::send('emails.send-login', $data, function ($m) use ($user) {
$m->to($user->email, $user->first_name . ' ' . $user->last_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Welcome ' . $user->first_name);
+ $m->subject(trans('mail.welcome', ['name' => $user->first_name]));
});
}
@@ -835,7 +835,7 @@ class UsersController extends Controller
Mail::send('emails.send-login', $data, function ($m) use ($newuser) {
$m->to($newuser['email'], $newuser['first_name'] . ' ' . $newuser['last_name']);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Welcome ' . $newuser['first_name']);
+ $m->subject(trans('mail.welcome', ['name' => $newuser['first_name']]));
});
}
}
diff --git a/app/Http/Controllers/ViewAssetsController.php b/app/Http/Controllers/ViewAssetsController.php
index c2d2c4cf6d..8447ec56ce 100755
--- a/app/Http/Controllers/ViewAssetsController.php
+++ b/app/Http/Controllers/ViewAssetsController.php
@@ -127,7 +127,7 @@ class ViewAssetsController extends Controller
Mail::send('emails.asset-canceled', $data, function ($m) use ($user, $settings) {
$m->to(explode(',', $settings->alert_email), $settings->site_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Item Request Canceled');
+ $m->subject(trans('mail.Item_Request_Canceled'));
});
}
@@ -161,7 +161,7 @@ class ViewAssetsController extends Controller
Mail::send('emails.asset-requested', $data, function ($m) use ($user, $settings) {
$m->to(explode(',', $settings->alert_email), $settings->site_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Item Requested');
+ $m->subject(trans('mail.Item_Requested'));
});
}
@@ -225,7 +225,7 @@ class ViewAssetsController extends Controller
Mail::send('emails.asset-requested', $data, function ($m) use ($user, $settings) {
$m->to(explode(',', $settings->alert_email), $settings->site_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Asset Requested');
+ $m->subject(trans('mail.asset_requested'));
});
}
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 6447abb2cc..5b11b71bd7 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -153,7 +153,7 @@ class Asset extends Depreciable
\Mail::send('emails.accept-asset', $data, function ($m) use ($user) {
$m->to($user->email, $user->first_name . ' ' . $user->last_name);
$m->replyTo(config('mail.reply_to.address'), config('mail.reply_to.name'));
- $m->subject('Confirm asset delivery');
+ $m->subject(trans('mail.Confirm_asset_delivery'));
});
}
diff --git a/config/app.php b/config/app.php
old mode 100644
new mode 100755
diff --git a/config/database.php b/config/database.php
old mode 100644
new mode 100755
diff --git a/config/mail.php b/config/mail.php
old mode 100644
new mode 100755
diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php
new file mode 100644
index 0000000000..c9a4fe182d
--- /dev/null
+++ b/resources/lang/en/mail.php
@@ -0,0 +1,74 @@
+ 'A user has canceled an item request on the website',
+ 'a_user_requested' => 'A user has requested an item on the website',
+ 'accessory_name' => 'Accessory Name:',
+ 'additional_notes' => 'Additional Notes:',
+ 'admin_has_created' => 'An administrator has created an account for you on the :web website.',
+ 'asset' => 'Asset:',
+ 'asset_name' => 'Asset Name:',
+ 'asset_requested' => 'Asset requested',
+ 'asset_tag' => 'Asset Tag:',
+ 'assets_warrantee_expiring' => '{1} asset with warrantee expiring in the next 60 days.|[2,Inf] assets with warrantees
+ expiring in the next 60 days.',
+ 'assigned_to' => 'Assigned To',
+ 'best_regards' => 'Best regards,',
+ 'canceled' => 'Canceled:',
+ 'checkin_date' => 'Checkin Date:',
+ 'checkout_date' => 'Checkout Date:',
+ 'click_to_confirm' => 'Please click on the following link to confirm your :web account:',
+ 'click_on_the_link_accessory' => 'Please click on the link at the bottom to confirm that you have received the accessory.',
+ 'click_on_the_link_asset' => 'Please click on the link at the bottom to confirm that you have received the asset.',
+ 'Confirm_Asset_Checkin' => 'Confirm Asset Checkin.',
+ 'Confirm_Accessory_Checkin' => 'Confirm Accessory Checkin.',
+ 'Confirm_accessory_delivery' => 'Confirm accessory delivery.',
+ 'Confirm_asset_delivery' => 'Confirm asset delivery.',
+ 'Confirm_consumable_delivery' => 'Confirm consumable delivery.',
+ 'current_QTY' => 'Current QTY',
+ 'Days' => 'Days',
+ 'days' => 'Days',
+ 'expecting_checkin_date' => 'Expected Checkin Date:',
+ 'expires' => 'Expires',
+ 'Expiring_Assets_Report' => 'Expiring Assets Report.',
+ 'Expiring_Licenses_Report' => 'Expiring Licenses Report.',
+ 'hello' => 'Hello',
+ 'hi' => 'Hi',
+ 'i_have_read' => 'I have read and agree to the terms of use, and have received this item.',
+ 'item' => 'Item:',
+ 'items_below_minimum' => '{1} item that is below minimum inventory or will soon be low.|[2,Inf] items that are below minimum
+ inventory or will soon be low.',
+ 'Item_Request_Canceled' => 'Item Request Canceled',
+ 'Item_Requested' => 'Item Requested',
+ 'licenses_expiring' => '{1} license expiring next 60 days.|[2,Inf] licenses expiring next 60 days.',
+ 'link_to_update_password' => 'Please click on the following link to update your :web password:',
+ 'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
+ 'login' => 'Login:',
+ 'Low_Inventory_Report' => 'Low Inventory Report',
+ 'min_QTY' => 'Min QTY',
+ 'name' => 'Name',
+ 'new_item_checked' => 'A new item has been checked out under your name, details are below.',
+ 'password' => 'Password:',
+ 'password_reset' => 'Password Reset',
+
+ 'read_the_terms' => 'Please read the terms of use below.',
+ 'read_the_terms_and_click' => 'Please read the terms of use below, and click on the link at the bottom to confirm that you read
+ and agree to the terms of use, and have received the asset.',
+ 'requested' => 'Requested:',
+ 'reset_link' => 'Your Password Reset Link',
+ 'reset_password' => 'Click here to reset your password:',
+ 'serial' => 'Serial:',
+ 'supplier' => 'Supplier',
+ 'tag' => 'Tag',
+ 'test_email' => 'Test Email from Snipe-IT',
+ 'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
+ 'the_following_item' => 'The following item has been checked in: ',
+ 'There_are' => '{1} There is|[2,Inf] There are',
+ 'to_reset' => 'To reset your :web password, complete this form:',
+ 'type' => 'Type',
+ 'user' => 'User:',
+ 'username' => 'Username:',
+ 'welcome' => 'Welcome :name',
+ 'welcome_to' => 'Welcome to :web!',
+ 'your_credentials' => 'Your Snipe-IT credentials',
+);
diff --git a/resources/views/auth/emails/password.blade.php b/resources/views/auth/emails/password.blade.php
index 1b53830a80..590806157d 100644
--- a/resources/views/auth/emails/password.blade.php
+++ b/resources/views/auth/emails/password.blade.php
@@ -1 +1 @@
-Click here to reset your password: {{ $link }}
+{{ trans('mail.reset_password') }} {{ $link }}
diff --git a/resources/views/emails/accept-accessory.blade.php b/resources/views/emails/accept-accessory.blade.php
index bf5d486587..371909a5ee 100644
--- a/resources/views/emails/accept-accessory.blade.php
+++ b/resources/views/emails/accept-accessory.blade.php
@@ -1,15 +1,15 @@
@extends('emails/layouts/default')
@section('content')
-Hello {{ $first_name }},
+{{ trans('mail.hello') }} {{ $first_name }},
-A new item has been checked out under your name, details are below.
+{{ trans('mail.new_item_checked') }}
|
- Accessory Name:
+ {{ trans('mail.accessory_name') }}
|
{{ $item_name }}
@@ -17,7 +17,7 @@
|
|
- Checkout Date:
+ {{ trans('mail.checkout_date') }}
|
{{ $checkout_date }}
@@ -26,7 +26,7 @@
@if ($note)
|
|
- Additional Notes:
+ {{ trans('mail.additional_notes') }}
|
{{ $note }}
@@ -34,18 +34,18 @@
|
@endif
-
+
@if (($require_acceptance==1) && ($eula!=''))
- Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.
+ {{ trans('mail.read_the_terms_and_click') }}
@elseif (($require_acceptance==1) && ($eula==''))
- Please click on the link at the bottom to confirm that you have received the accessory.
+ {{ trans('mail.click_on_the_link_accessory') }}
@elseif (($require_acceptance==0) && ($eula!=''))
- Please read the terms of use below.
+ {{ trans('mail.read_the_terms') }}
@endif
@@ -54,7 +54,7 @@
{!! $eula !!}
@if ($require_acceptance==1)
-I have read and agree to the terms of use, and have received this item.
+{{ trans('mail.i_have_read') }}
@endif
{{ \App\Models\Setting::getSettings()->site_name }}
diff --git a/resources/views/emails/accept-asset.blade.php b/resources/views/emails/accept-asset.blade.php
index 859f12a4da..a6b78b4da7 100755
--- a/resources/views/emails/accept-asset.blade.php
+++ b/resources/views/emails/accept-asset.blade.php
@@ -1,15 +1,15 @@
@extends('emails/layouts/default')
@section('content')
- Hello {{ $first_name }},
+ {{ trans('mail.hello') }} {{ $first_name }},
- A new item has been checked out under your name, details are below.
+ {{ trans('mail.new_item_checked') }}
|
- Asset Name:
+ {{ trans('mail.asset_name') }}
|
{{ $item_name }}
@@ -18,7 +18,7 @@
@if (isset($item_tag))
|
|
- Asset Tag:
+ {{ trans('mail.asset_tag') }}
|
{{ $item_tag }}
@@ -28,7 +28,7 @@
@if (isset($item_serial))
|
|
- Serial:
+ {{ trans('mail.serial') }}
|
{{ $item_serial }}
@@ -37,7 +37,7 @@
@endif
|
|
- Checkout Date:
+ {{ trans('mail.checkout_date') }}
|
{{ $checkout_date }}
@@ -46,7 +46,7 @@
@if (isset($expected_checkin))
|
|
- Expected Checkin Date:
+ {{ trans('mail.expecting_checkin_date') }}
|
{{ $expected_checkin }}
@@ -56,7 +56,7 @@
@if (isset($note))
|
|
- Additional Notes:
+ {{ trans('mail.additional_notes') }}
|
{{ $note }}
@@ -64,27 +64,27 @@
|
@endif
-
+
@if (($require_acceptance==1) && ($eula!=''))
- Please read the terms of use below, and click on the link at the bottom to confirm that you read and agree to the terms of use, and have received the asset.
+ {{ trans('mail.read_the_terms_and_click') }}
@elseif (($require_acceptance==1) && ($eula==''))
- Please click on the link at the bottom to confirm that you have received the asset.
+ {{ trans('mail.click_on_the_link_asset') }}
@elseif (($require_acceptance==0) && ($eula!=''))
- Please read the terms of use below.
+ {{ trans('mail.read_the_terms') }}
- @endif
+ @endif
{!! $eula !!}
@if ($require_acceptance==1)
- I have read and agree to the terms of use, and have received this item.
+ {{ trans('mail.i_have_read') }}
@endif
{{ \App\Models\Setting::getSettings()->site_name }}
diff --git a/resources/views/emails/asset-canceled.blade.php b/resources/views/emails/asset-canceled.blade.php
index fd1baf3b70..3cba49dd6e 100644
--- a/resources/views/emails/asset-canceled.blade.php
+++ b/resources/views/emails/asset-canceled.blade.php
@@ -2,11 +2,11 @@
@section('content')
-A user has canceled an item request on the {{ \App\Models\Setting::getSettings()->site_name }} website.
+{{ trans('mail.a_user_canceled') }} {{ \App\Models\Setting::getSettings()->site_name }}.
-User: {{ $requested_by }}
-Item: {{ $item_name }} ({{ $item_type }})
-Canceled: {{ $requested_date }}
+
{{ trans('mail.user') }} {{ $requested_by }}
+ {{ trans('mail.item') }} {{ $item_name }} ({{ $item_type }})
+ {{ trans('mail.canceled') }} {{ $requested_date }}
@stop
diff --git a/resources/views/emails/asset-requested.blade.php b/resources/views/emails/asset-requested.blade.php
index 9b7d03a23c..5fd51b5ed6 100644
--- a/resources/views/emails/asset-requested.blade.php
+++ b/resources/views/emails/asset-requested.blade.php
@@ -2,14 +2,13 @@
@section('content')
-A user has requested an item on the {{ \App\Models\Setting::getSettings()->site_name }} website.
+{{ trans('mail.a_user_requested') }} {{ \App\Models\Setting::getSettings()->site_name }}.
-User: {{ $requested_by }}
-Item: {{ $item_name }} ({{ $item_type }})
-Requested: {{ $requested_date }}
+
{{ trans('mail.user') }} {{ $requested_by }}
+ {{ trans('mail.item') }} {{ $item_name }} ({{ $item_type }})
+ {{ trans('mail.requested') }} {{ $requested_date }}
@if ($item_quantity > 1)
-Quantity: {{ $item_quantity}}
+{{ trans('mail.quantity') }} {{ $item_quantity}}
@endif
-
@stop
diff --git a/resources/views/emails/auth/reminder.blade.php b/resources/views/emails/auth/reminder.blade.php
index 5f738e972b..4af4e44b5b 100755
--- a/resources/views/emails/auth/reminder.blade.php
+++ b/resources/views/emails/auth/reminder.blade.php
@@ -4,10 +4,10 @@
- Password Reset
+ {{ trans('mail.password_reset') }}
- To reset your {{ \App\Models\Setting::getSettings()->site_name }} password, complete this form: {{ URL::to('password/reset', array($token)) }}.
+ {{ trans('mail.to_reset', ['web' => \App\Models\Setting::getSettings()->site_name]) }} {{ URL::to('password/reset', array($token)) }}.