nexus/vuefilemanager
2
0
Fork 0
mirror of https://github.com/VueFileManager/vuefilemanager.git synced 2026-05-21 20:44:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

cahng laravel translation, move route for languages from api to web, fix contact formular

Browse Source
This commit is contained in:
Milos Holba
2021-03-23 21:00:25 +01:00
parent df5d5cb75f
commit 4142f829be
17 changed files with 152 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/FileManagerFile.php
+2 -2
View File
@@ -102,7 +102,7 @@ class FileManagerFile extends Model
*/
public function getCreatedAtAttribute()
{
return format_date(set_time_by_user_timezone($this->attributes['created_at']), __('vuefilemanager.time'));
return format_date(set_time_by_user_timezone($this->attributes['created_at']), __t('time'));
}
/**
@@ -114,7 +114,7 @@ class FileManagerFile extends Model
{
if (!$this->attributes['deleted_at']) return null;
return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __('vuefilemanager.time'));
return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __t('time'));
}
/**
app/FileManagerFolder.php
+2 -2
View File
@@ -137,7 +137,7 @@ class FileManagerFolder extends Model
*/
public function getCreatedAtAttribute()
{
return format_date(set_time_by_user_timezone($this->attributes['created_at']), __('vuefilemanager.time'));
return format_date(set_time_by_user_timezone($this->attributes['created_at']), __t('time'));
}
/**
@@ -149,7 +149,7 @@ class FileManagerFolder extends Model
{
if (! $this->attributes['deleted_at']) return null;
return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __('vuefilemanager.time'));
return format_date(set_time_by_user_timezone($this->attributes['deleted_at']), __t('time'));
}
/**
app/Http/Controllers/AppFunctionsController.php
+1 -1
View File
@@ -13,7 +13,7 @@ use App\FileManagerFile;
use App\Http\Tools\Demo;
use App\FileManagerFolder;
use Illuminate\Http\Request;
use App\Mail\SendSupportForm;
use App\Http\Mail\SendSupportForm;
use App\Http\Resources\PageResource;
use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Cache;
app/Http/Controllers/Auth/AuthController.php
+1 -1
View File
@@ -33,7 +33,7 @@ class AuthController extends Controller
];
// Abort with 404, user not found
return abort('404', __('vuefilemanager.user_not_fount'));
return abort('404', __t('user_not_fount'));
}
/**
app/Http/Controllers/FileBrowser/BrowseController.php
+1 -1
View File
@@ -188,7 +188,7 @@ class BrowseController extends Controller
return [
[
'unique_id' => 0,
'name' => __('vuefilemanager.home'),
'name' => __t('home'),
'location' => 'base',
'folders' => $folders,
]
app/Http/Controllers/Sharing/FileSharingController.php
+3 -3
View File
@@ -117,7 +117,7 @@ class FileSharingController extends Controller
// Check password
if (!Hash::check($request->password, $shared->password)) {
abort(401, __('vuefilemanager.incorrect_password'));
abort(401, __t('incorrect_password'));
}
// Get owner of shared content
@@ -258,7 +258,7 @@ class FileSharingController extends Controller
return [
[
'unique_id' => $shared->item_id,
'name' => __('vuefilemanager.home'),
'name' => __t('home'),
'location' => 'public',
'folders' => $folders,
]
@@ -289,7 +289,7 @@ class FileSharingController extends Controller
return [
[
'unique_id' => $shared->item_id,
'name' => __('vuefilemanager.home'),
'name' => __t('home'),
'location' => 'public',
'folders' => $folders,
]
app/Http/Mail/SendSupportForm.php
+1 -1
View File
@@ -1,6 +1,6 @@
<?php
namespace App\Mail;
namespace App\Http\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
app/Notifications/ResetPassword.php
+6 -6
View File
@@ -44,12 +44,12 @@ class ResetPassword extends Notification
$app_name = get_setting('app_title') ?? 'VueFileManager';
return (new MailMessage)
->subject(__('vuefilemanager.reset_password_subject') . $app_name)
->greeting(__('vuefilemanager.reset_password_greeting'))
->line(__('vuefilemanager.reset_password_line_1'))
->action(__('vuefilemanager.reset_password_action'), $reset_url)
->line(__('vuefilemanager.reset_password_line_2'))
->salutation(__('vuefilemanager.salutation') . ', ' . $app_name);
->subject(__t('reset_password_subject') . $app_name)
->greeting(__t('reset_password_greeting'))
->line(__t('reset_password_line_1'))
->action(__t('reset_password_action'), $reset_url)
->line(__t('reset_password_line_2'))
->salutation(__t('salutation') . ', ' . $app_name);
}
/**
app/Notifications/SharedSendViaEmail.php
+5 -5
View File
@@ -43,11 +43,11 @@ class SharedSendViaEmail extends Notification
public function toMail($notifiable)
{
return (new MailMessage)
->subject(__('vuefilemanager.shared_link_email_subject' , ['user' => $this->user->name]))
->greeting(__('vuefilemanager.shared_link_email_greeting'))
->line(__('vuefilemanager.shared_link_email_user', ['user' => $this->user->name, 'email' => $this->user->email]))
->action(__('vuefilemanager.shared_link_email_link'), url('/shared', ['token' => $this->token]))
->salutation(__('vuefilemanager.shared_link_email_salutation', ['app_name' => get_setting('app_title') ?? 'VueFileManager']));
->subject(__t('shared_link_email_subject' , ['user' => $this->user->name]))
->greeting(__t('shared_link_email_greeting'))
->line(__t('shared_link_email_user', ['user' => $this->user->name, 'email' => $this->user->email]))
->action(__t('shared_link_email_link'), url('/shared', ['token' => $this->token]))
->salutation(__t('shared_link_email_salutation', ['app_name' => get_setting('app_title') ?? 'VueFileManager']));
}
/**