Skip to content

Commit f7ae36c

Browse files
youchenleeyouchenlee
committed
Merge branch 'master' of github.com:UniSharp/laravel-filemanager
2 parents f88b44a + c919a22 commit f7ae36c

12 files changed

+90
-19
lines changed

‎README.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ PR is welcome!
99
* The project was forked from [tsawler/laravel-filemanager](http://packalyst.com/packages/package/tsawler/laravel-filemanager)
1010
* Support public and private folders for multi users
1111
* Customizable views, routes and middlewares
12-
* Supported locales : en, fr, zh-TW, zh-CN, pt-BR
12+
* Supported locales : en, fr, pt-BR, tr, zh-CN, zh-TW
1313

1414

1515
## Requirements
@@ -216,8 +216,9 @@ In `config/lfm.php` :
216216
## Credits
217217
* All contibutors from GitHub. (issues / PR)
218218
* Special thanks to
219-
* [@taswler](https://github.com/tsawler) the author.
219+
* [@taswler](https://github.com/tsawler) the original author.
220220
* [@welcoMattic](https://github.com/welcoMattic) providing fr translations and lots of bugfixes.
221221
* [@fraterblack](https://github.com/fraterblack) TinyMCE 4 support and pt-BR translations.
222+
* [@1dot44mb](https://github.com/1dot44mb) tr translations.
222223
* [@olivervogel](https://github.com/olivervogel) for the awesome [image library](https://github.com/Intervention/image)
223224
* [All @UniSharp members](https://github.com/UniSharp)

‎src/controllers/Controller.php

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<?php namespace Unisharp\Laravelfilemanager\controllers;
2+
3+
use Illuminate\Foundation\Bus\DispatchesJobs;
4+
use Illuminate\Routing\Controller as BaseController;
5+
use Illuminate\Foundation\Validation\ValidatesRequests;
6+
7+
abstract class Controller extends BaseController
8+
{
9+
use DispatchesJobs, ValidatesRequests;
10+
}

‎src/controllers/CropController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\Input;
66
use Illuminate\Support\Facades\View;

‎src/controllers/DeleteController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;
@@ -49,5 +49,5 @@ public function getDelete()
4949

5050
return 'OK';
5151
}
52-
52+
5353
}

‎src/controllers/DownloadController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\Input;
66
use Illuminate\Support\Facades\Response;

‎src/controllers/FolderController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;

‎src/controllers/ItemsController.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;
@@ -36,7 +36,7 @@ public function getItems()
3636
return View::make($view)
3737
->with(compact('files', 'file_info', 'directories', 'thumb_url'));
3838
}
39-
39+
4040

4141
private function getFileInfos($files, $type = 'Images')
4242
{
@@ -46,7 +46,7 @@ private function getFileInfos($files, $type = 'Images')
4646
$file_name = parent::getFileName($file);
4747
$file_created = filemtime($file);
4848
$file_size = number_format((File::size($file) / 1024), 2, ".", "");
49-
49+
5050
if ($file_size > 1024) {
5151
$file_size = number_format(($file_size / 1024), 2, ".", "") . " Mb";
5252
} else {

‎src/controllers/LfmController.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;
@@ -19,17 +19,17 @@ class LfmController extends Controller {
1919
*/
2020
public $file_location;
2121
public $dir_location;
22-
22+
2323

2424
/**
2525
* Constructor
2626
*/
2727
public function __construct()
2828
{
2929
$this->setPathAndType();
30-
30+
3131
$this->checkMyFolderExists();
32-
32+
3333
$this->checkSharedFolderExists();
3434
}
3535

@@ -60,7 +60,7 @@ public function show()
6060
private function setPathAndType()
6161
{
6262
// dd('type:'.Input::get('type'));
63-
63+
6464
if (Input::has('type') && Input::get('type') === 'Files') {
6565
Session::put('lfm_type', 'Files');
6666
Session::put('lfm.file_location', Config::get('lfm.files_dir'));

‎src/controllers/RenameController.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;
@@ -42,7 +42,7 @@ public function getRename()
4242
File::move($old_file, $new_file);
4343
return 'OK';
4444
}
45-
45+
4646
File::move($old_file, $new_file);
4747

4848
if (Session::get('lfm_type') == 'Images') {

‎src/controllers/ResizeController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\Input;
66
use Illuminate\Support\Facades\View;

‎src/controllers/UploadController.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php namespace Unisharp\Laravelfilemanager\controllers;
22

3-
use App\Http\Controllers\Controller;
3+
use Unisharp\Laravelfilemanager\controllers\Controller;
44
use Illuminate\Support\Facades\Config;
55
use Illuminate\Support\Facades\File;
66
use Illuminate\Support\Facades\Input;

‎src/lang/tr/lfm.php

+60
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
<?php
2+
3+
return [
4+
'nav-upload' => 'Yükle',
5+
'nav-thumbnails' => 'Küçük Resim',
6+
'nav-list' => 'Liste',
7+
8+
'menu-new' => 'Yeni Klasör',
9+
'menu-rename' => 'Ad değiştir',
10+
'menu-delete' => 'Sil',
11+
'menu-view' => 'Görüntüle',
12+
'menu-download' => 'İndir',
13+
'menu-resize' => 'Boyutlandır',
14+
'menu-crop' => 'Kırp',
15+
16+
'title-page' => 'Dosya Kütüphanesi',
17+
'title-panel' => 'Laravel Dosya Kütüphanesi',
18+
'title-upload' => 'Dosya Yükle',
19+
'title-view' => 'Dosya Gör',
20+
'title-root' => 'Dosyalarım',
21+
'title-shares' => 'Paylaşılan Dosyalar',
22+
'title-item' => 'Dosya',
23+
'title-size' => 'Boyut',
24+
'title-type' => 'Tür',
25+
'title-modified' => 'Güncelleme',
26+
'title-action' => 'Komutlar',
27+
28+
'type-folder' => 'Klasör',
29+
30+
'message-empty' => 'Klasör boş.',
31+
'message-choose' => 'Dosya seç',
32+
'message-delete' => 'Bu dosyayı silmek istediğinizden emin misiniz?',
33+
'message-name' => 'Klasör adı:',
34+
'message-rename' => 'Yeni ad:',
35+
36+
'error-rename' => 'Dosya adı kullanımda!',
37+
'error-file-empty' => 'Bir dosya seçmelisiniz!',
38+
'error-file-exist' => 'Bu adda bir dosya zaten var!',
39+
'error-delete' => 'Klasör boş olmadığından, klasörü silemezsiniz!',
40+
'error-folder-name' => 'Klasör adı yazılmalıdır!',
41+
'error-folder-exist'=> 'Bu adda bir klasör zaten var!',
42+
43+
'btn-upload' => 'Yükle',
44+
'btn-close' => 'Kapat',
45+
'btn-uploading' => 'Yükleniyor...',
46+
'btn-crop' => 'Kırp',
47+
'btn-cancel' => 'İptal',
48+
'btn-resize' => 'Boyutlandır',
49+
50+
'resize-ratio' => 'Oran:',
51+
'resize-scaled' => 'Boyutlandırıldı mı:',
52+
'resize-true' => 'Evet',
53+
'resize-old-height' => 'Orijinal Yükseklik:',
54+
'resize-old-width' => 'Orijinal Genişlik:',
55+
'resize-new-height' => 'Yükseklik:',
56+
'resize-new-width' => 'Genişlik:',
57+
58+
'locale-bootbox' => 'tr',
59+
60+
];

0 commit comments

Comments
 (0)