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

Language of mail doesn't show as intended by the settings. [ch87] (#6619)

Browse Source 
* Fixes #5554. Language of mail doesn't show as intended by the settings.
This commit is contained in:
Ivan Nieto
2019-01-22 16:02:08 -06:00
committed by snipe
parent 66f557d436
commit 3fa5976315
3 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/User.php
+6 -1
View File
@@ -15,11 +15,12 @@ use Illuminate\Database\Eloquent\SoftDeletes;
use App\Http\Traits\UniqueUndeletedTrait;
use Illuminate\Notifications\Notifiable;
use Laravel\Passport\HasApiTokens;
use Illuminate\Contracts\Translation\HasLocalePreference;
use DB;
class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract
class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, HasLocalePreference
{
protected $presenter = 'App\Presenters\UserPresenter';
use SoftDeletes, ValidatingTrait;
@@ -643,4 +644,8 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
{
return $query->leftJoin('departments as departments_users', 'users.department_id', '=', 'departments_users.id')->orderBy('departments_users.name', $order);
}
public function preferredLocale(){
return $this->locale;
}
}