Skip to content

Commit e760e87

Browse files
youchenleeyouchenlee
authored
Merge pull request #86 from Rohos/master
Add Russian lang
2 parents e5acc65 + 48a496e commit e760e87

File tree

7 files changed

+133
-29
lines changed

7 files changed

+133
-29
lines changed

‎src/config/lfm.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// For laravel 5.2, please set to ['web', 'auth']
1313
'middlewares' => ['auth'],
1414

15+
// Add prefix for routes
16+
'prefix' => 'laravel-filemanager',
17+
1518
// Allow multi_user mode or not.
1619
// If true, laravel-filemanager create private folders for each signed-in user.
1720
'allow_multi_user' => true,

‎src/lang/ru/lfm.php‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
<?php
2+
3+
return [
4+
'nav-back' => 'Назад',
5+
'nav-new' => 'Новая папка',
6+
'nav-upload' => 'Загрузить',
7+
'nav-thumbnails' => 'Миниатюры',
8+
'nav-list' => 'Список',
9+
10+
'menu-rename' => 'Переименовать',
11+
'menu-delete' => 'Удалить',
12+
'menu-view' => 'Просмотр',
13+
'menu-download' => 'Загрузить',
14+
'menu-resize' => 'Изменить размер',
15+
'menu-crop' => 'Обрезать',
16+
17+
'title-page' => 'Менеджер файлов',
18+
'title-panel' => 'Laravel FileManager',
19+
'title-upload' => 'Загрузка файла',
20+
'title-view' => 'Просмотр файла',
21+
'title-root' => 'Файлы',
22+
'title-shares' => 'Общие файлы',
23+
'title-item' => 'Номер',
24+
'title-size' => 'Размер',
25+
'title-type' => 'Тип',
26+
'title-modified' => 'Изменен',
27+
'title-action' => 'Действие',
28+
29+
'type-folder' => 'Папка',
30+
31+
'message-empty' => 'Папка пуста.',
32+
'message-choose' => 'Выберите файл',
33+
'message-delete' => 'Вы уверен что хотите данный пункт?',
34+
'message-name' => 'Название папки:',
35+
'message-rename' => 'Переименовать в:',
36+
37+
'error-rename' => 'Имя файла уже используется!',
38+
'error-file-empty' => 'Вы должны выбрать файл!',
39+
'error-file-exist' => 'Файл с этим именем уже существует!',
40+
'error-delete' => 'Вы не можете удалить эту папку, потому что она не пустая!',
41+
'error-folder-name' => 'Имя папки не может быть пустым!',
42+
'error-folder-exist'=> 'Папка с таким названием уже существует!',
43+
'error-mime' => 'Неподдерживаемый MimeType: ',
44+
'error-instance' => 'Загруженный файл должен быть экземпляром UploadedFile',
45+
'error-invalid' => 'Неверный запрос загрузки',
46+
47+
'btn-upload' => 'Загрузить файл',
48+
'btn-uploading' => 'Загрузка...',
49+
'btn-close' => 'Закрыть',
50+
'btn-crop' => 'Обрезать',
51+
'btn-cancel' => 'Отмена',
52+
'btn-resize' => 'Изменить размер',
53+
54+
'resize-ratio' => 'Соотношение:',
55+
'resize-scaled' => 'Масштабировать зображение:',
56+
'resize-true' => 'Да',
57+
'resize-old-height' => 'Оригинальная высота:',
58+
'resize-old-width' => 'Оригинальная ширина:',
59+
'resize-new-height' => 'Высота:',
60+
'resize-new-width' => 'Ширина:',
61+
62+
'locale-bootbox' => 'ru',
63+
];

‎src/routes.php‎

Lines changed: 54 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,78 @@
11
<?php
22
$middlewares = \Config::get('lfm.middlewares');
3+
$prefix = \Config::get('lfm.prefix', 'laravel-filemanager');
34
array_push($middlewares, '\Unisharp\Laravelfilemanager\middleware\MultiUser');
45

56
// make sure authenticated
6-
Route::group(array('middleware' => $middlewares, 'prefix' => 'laravel-filemanager'), function ()
7+
Route::group(array('middleware' => $middlewares, 'prefix' => $prefix, 'as' => 'unisharp.lfm.'), function ()
78
{
89
// Show LFM
9-
Route::get('/', 'Unisharp\Laravelfilemanager\controllers\LfmController@show');
10+
Route::get('/', [
11+
'uses' => 'Unisharp\Laravelfilemanager\controllers\LfmController@show',
12+
'as' => 'show'
13+
]);
1014

1115
// upload
12-
Route::any('/upload', 'Unisharp\Laravelfilemanager\controllers\UploadController@upload');
16+
Route::any('/upload', [
17+
'uses' => 'Unisharp\Laravelfilemanager\controllers\UploadController@upload',
18+
'as' => 'upload'
19+
]);
1320

1421
// list images & files
15-
Route::get('/jsonitems', 'Unisharp\Laravelfilemanager\controllers\ItemsController@getItems');
22+
Route::get('/jsonitems', [
23+
'uses' => 'Unisharp\Laravelfilemanager\controllers\ItemsController@getItems',
24+
'as' => 'getItems'
25+
]);
1626

1727
// folders
18-
Route::get('/newfolder', 'Unisharp\Laravelfilemanager\controllers\FolderController@getAddfolder');
19-
Route::get('/deletefolder', 'Unisharp\Laravelfilemanager\controllers\FolderController@getDeletefolder');
20-
Route::get('/folders', 'Unisharp\Laravelfilemanager\controllers\FolderController@getFolders');
28+
Route::get('/newfolder',[
29+
'uses' => 'Unisharp\Laravelfilemanager\controllers\FolderController@getAddfolder',
30+
'as' => 'getAddfolder'
31+
]);
32+
Route::get('/deletefolder', [
33+
'uses' => 'Unisharp\Laravelfilemanager\controllers\FolderController@getDeletefolder',
34+
'as' => 'getDeletefolder'
35+
]);
36+
Route::get('/folders', [
37+
'uses' => 'Unisharp\Laravelfilemanager\controllers\FolderController@getFolders',
38+
'as' => 'getFolders'
39+
]);
2140

2241
// crop
23-
Route::get('/crop', 'Unisharp\Laravelfilemanager\controllers\CropController@getCrop');
24-
Route::get('/cropimage', 'Unisharp\Laravelfilemanager\controllers\CropController@getCropimage');
42+
Route::get('/crop', [
43+
'uses' => 'Unisharp\Laravelfilemanager\controllers\CropController@getCrop',
44+
'as' => 'getCrop'
45+
]);
46+
Route::get('/cropimage', [
47+
'uses' => 'Unisharp\Laravelfilemanager\controllers\CropController@getCropimage',
48+
'as' => 'getCropimage'
49+
]);
2550

2651
// rename
27-
Route::get('/rename', 'Unisharp\Laravelfilemanager\controllers\RenameController@getRename');
52+
Route::get('/rename', [
53+
'uses' => 'Unisharp\Laravelfilemanager\controllers\RenameController@getRename',
54+
'as' => 'getRename'
55+
]);
2856

2957
// scale/resize
30-
Route::get('/resize', 'Unisharp\Laravelfilemanager\controllers\ResizeController@getResize');
31-
Route::get('/doresize', 'Unisharp\Laravelfilemanager\controllers\ResizeController@performResize');
58+
Route::get('/resize', [
59+
'uses' => 'Unisharp\Laravelfilemanager\controllers\ResizeController@getResize',
60+
'as' => 'getResize'
61+
]);
62+
Route::get('/doresize', [
63+
'uses' => 'Unisharp\Laravelfilemanager\controllers\ResizeController@performResize',
64+
'as' => 'performResize'
65+
]);
3266

3367
// download
34-
Route::get('/download', 'Unisharp\Laravelfilemanager\controllers\DownloadController@getDownload');
68+
Route::get('/download', [
69+
'uses' => 'Unisharp\Laravelfilemanager\controllers\DownloadController@getDownload',
70+
'as' => 'getDownload'
71+
]);
3572

3673
// delete
37-
Route::get('/delete', 'Unisharp\Laravelfilemanager\controllers\DeleteController@getDelete');
74+
Route::get('/delete', [
75+
'uses' => 'Unisharp\Laravelfilemanager\controllers\DeleteController@getDelete',
76+
'as' => 'getDelete'
77+
]);
3878
});

‎src/views/crop.blade.php‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<br>
1212
<button class="btn btn-primary" onclick="performCrop()">{{ Lang::get('laravel-filemanager::lfm.btn-crop') }}</button>
1313
<button class="btn btn-info" onclick="loadItems()">{{ Lang::get('laravel-filemanager::lfm.btn-cancel') }}</button>
14-
<form action="{{url('/laravel-filemanager/crop')}}" role='form' name='cropForm' id='cropForm' mathod='post'>
14+
<form action="{{ route('unisharp.lfm.getCrop') }}" role='form' name='cropForm' id='cropForm' mathod='post'>
1515
<input type="hidden" id="img" name="img" value="{{ $img }}">
1616
<input type="hidden" id="working_dir" name="working_dir" value="{{ $working_dir }}">
1717
<input type="hidden" id="dataX" name="dataX">
@@ -31,7 +31,6 @@
3131
$dataY = $('#dataY'),
3232
$dataHeight = $('#dataHeight'),
3333
$dataWidth = $('#dataWidth');
34-
3534
$('.crop-container > img').cropper({
3635
//aspectRatio: 16 / 9,
3736
preview: ".img-preview",
@@ -45,12 +44,11 @@
4544
}
4645
});
4746
});
48-
4947
function performCrop() {
5048
$.ajax({
5149
type: "GET",
5250
dataType: "text",
53-
url: "laravel-filemanager/cropimage",
51+
url: "{{ route('unisharp.lfm.getCropimage') }}",
5452
data: {
5553
img: '{{ $img }}',
5654
working_dir: $("#working_dir").val(),
@@ -65,4 +63,4 @@ function performCrop() {
6563
loadItems();
6664
});
6765
}
68-
</script>
66+
</script>

‎src/views/index.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
<h4 class="modal-title" id="myModalLabel">{{ Lang::get('laravel-filemanager::lfm.title-upload') }}</h4>
110110
</div>
111111
<div class="modal-body">
112-
<form action="{{url('/laravel-filemanager/upload')}}" role='form' id='uploadForm' name='uploadForm' method='post' enctype='multipart/form-data'>
112+
<form action="{{ route('unisharp.lfm.upload') }}" role='form' id='uploadForm' name='uploadForm' method='post' enctype='multipart/form-data'>
113113
<div class="form-group" id="attachment">
114114
<label for='upload' class='control-label'>{{ Lang::get('laravel-filemanager::lfm.message-choose') }}</label>
115115
<div class="controls">

‎src/views/resize.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ function doResize() {
7474
$.ajax({
7575
type: "GET",
7676
dataType: "text",
77-
url: "laravel-filemanager/doresize",
77+
url: "{{ route('unisharp.lfm.performResize') }}",
7878
data: {
7979
img: '{{ $img }}',
8080
working_dir: $("#working_dir").val(),

‎src/views/script.blade.php‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ function loadFolders() {
124124
$.ajax({
125125
type: 'GET',
126126
dataType: 'html',
127-
url: 'laravel-filemanager/folders',
127+
url: '{{ route("unisharp.lfm.getFolders") }}',
128128
data: {
129129
working_dir: $('#working_dir').val(),
130130
show_list: $('#show_list').val(),
@@ -143,7 +143,7 @@ function loadItems() {
143143
$.ajax({
144144
type: 'GET',
145145
dataType: 'html',
146-
url: 'laravel-filemanager/jsonitems',
146+
url: '{{ route("unisharp.lfm.getItems") }}',
147147
data: {
148148
working_dir: working_dir,
149149
show_list: $('#show_list').val(),
@@ -162,7 +162,7 @@ function createFolder(folder_name) {
162162
$.ajax({
163163
type: 'GET',
164164
dataType: 'text',
165-
url: 'laravel-filemanager/newfolder',
165+
url: '{{ route("unisharp.lfm.getAddfolder") }}',
166166
data: {
167167
name: folder_name,
168168
working_dir: $('#working_dir').val(),
@@ -189,7 +189,7 @@ function rename(item_name) {
189189
$.ajax({
190190
type: 'GET',
191191
dataType: 'text',
192-
url: 'laravel-filemanager/rename',
192+
url: '{{ route("unisharp.lfm.getRename") }}',
193193
data: {
194194
file: item_name,
195195
working_dir: $('#working_dir').val(),
@@ -216,7 +216,7 @@ function trash(item_name) {
216216
$.ajax({
217217
type: 'GET',
218218
dataType: 'text',
219-
url: 'laravel-filemanager/delete',
219+
url: '{{ route("unisharp.lfm.getDelete") }}',
220220
data: {
221221
working_dir: $('#working_dir').val(),
222222
items: item_name,
@@ -241,7 +241,7 @@ function cropImage(image_name) {
241241
$.ajax({
242242
type: 'GET',
243243
dataType: 'text',
244-
url: 'laravel-filemanager/crop',
244+
url: '{{ route("unisharp.lfm.getCrop") }}',
245245
data: {
246246
img: image_name,
247247
working_dir: $('#working_dir').val(),
@@ -258,7 +258,7 @@ function resizeImage(image_name) {
258258
$.ajax({
259259
type: 'GET',
260260
dataType: 'text',
261-
url: 'laravel-filemanager/resize',
261+
url: '{{ route("unisharp.lfm.getResize") }}',
262262
data: {
263263
img: image_name,
264264
working_dir: $('#working_dir').val(),
@@ -272,7 +272,7 @@ function resizeImage(image_name) {
272272
}
273273
274274
function download(file_name) {
275-
location.href = 'laravel-filemanager/download?'
275+
location.href = '{{ route("unisharp.lfm.getDownload") }}?'
276276
+ 'working_dir='
277277
+ $('#working_dir').val()
278278
+ '&type='

0 commit comments

Comments
 (0)