ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Translate emails (#2652)

Browse Source 
* commit temporal

* final translation commit -- added email translations

* final translation commit -- removed file for spanish translations

* final translation commit -- removed file for spanish translations

* added missing translations

* method overrided and config files back to default

* config files back to default

* config files back to default
This commit is contained in:
Andrés Núñez
2016-09-26 23:13:07 +02:00
committed by snipe
parent 03ee6b8f91
commit 40f00665b3
29 changed files with 191 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/AccessoriesController.php
+2 -2
View File
@@ -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'));
});
}
app/Http/Controllers/AssetsController.php
+1 -1
View File
@@ -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'));
});
}
app/Http/Controllers/Auth/PasswordController.php
+9
View File
@@ -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');
}
}
app/Http/Controllers/ConsumablesController.php
+1 -1
View File
@@ -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'));
});
}
app/Http/Controllers/SettingsController.php
+2 -2
View File
@@ -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'));
});
}
app/Http/Controllers/UsersController.php
+3 -3
View File
@@ -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']]));
});
}
}
app/Http/Controllers/ViewAssetsController.php
+3 -3
View File
@@ -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'));
});
}