Skip to content

Commit 9678337

Browse files
Emmanuel BigChallengeEmmanuel BigChallenge
authored andcommitted
Merge remote-tracking branch 'UniSharp/master'
2 parents 13bd207 + fe3fafd commit 9678337

File tree

12 files changed

+82
-4
lines changed

12 files changed

+82
-4
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PR is welcome!
1010

1111
* The project was forked from [tsawler/laravel-filemanager](http://packalyst.com/packages/package/tsawler/laravel-filemanager)
1212
* Customizable routes and middlewares
13-
* Supported locales : en, fr, pt-BR, tr, zh-CN, zh-TW
13+
* Supported locales : en, fr, bg, tr, fa, es, pt-BR, tr, zh-CN, zh-TW
1414
* Supports public and private folders for multi users
1515
* Supports multi-level folders
1616
* Supports using independently(see integration doc)
@@ -87,4 +87,5 @@ List of events:
8787
* [@Nikita240](https://github.com/Nikita240) fixing controller extending errors.
8888
* [@amin101](https://github.com/amin101) guide for independent use and fixes for url/directory error on Windows
8989
* [@nasirkhan](https://github.com/nasirkhan) bug fixes and alphanumeric filename check
90+
* [@petyots](https://github.com/petyots) Bulgarian translation
9091
* All [@UniSharp](https://github.com/UniSharp) members

src/controllers/LfmController.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,12 @@ public function show()
5151
$working_dir = '/';
5252
$working_dir .= (Config::get('lfm.allow_multi_user')) ? $this->getUserSlug() : Config::get('lfm.shared_folder_name');
5353

54+
$extension_not_found = ! extension_loaded('gd') && ! extension_loaded('imagick');
55+
5456
return view('laravel-filemanager::index')
5557
->with('working_dir', $working_dir)
56-
->with('file_type', $this->file_type);
58+
->with('file_type', $this->file_type)
59+
->with('extension_not_found', $extension_not_found);
5760
}
5861

5962

src/lang/bg/lfm.php

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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+
'message-extension_not_found' => '(translation wanted)',
37+
38+
'error-rename' => 'Името е заето!',
39+
'error-file-empty' => 'Трябва да изберете файл !',
40+
'error-file-exist' => 'Файл с това име вече съществува!',
41+
'error-delete' => 'Не можете да изтриете тази папка, защото не е празна!',
42+
'error-folder-name' => 'Моля изберете име на папката',
43+
'error-folder-exist'=> 'Папка с това име вече съществува!',
44+
'error-mime' => 'Грешен тип на файла: ',
45+
'error-instance' => 'The uploaded file should be an instance of UploadedFile ( Грешка )',
46+
'error-invalid' => 'Невалидна заявка за качване',
47+
48+
'btn-upload' => 'Качи файл',
49+
'btn-uploading' => 'Качване...',
50+
'btn-close' => 'Затвори',
51+
'btn-crop' => 'Отрежи',
52+
'btn-cancel' => 'Откажи',
53+
'btn-resize' => 'Оразмери',
54+
55+
'resize-ratio' => 'Аспект:',
56+
'resize-scaled' => 'Image scaled:',
57+
'resize-true' => 'Да',
58+
'resize-old-height' => 'Оригинална височина:',
59+
'resize-old-width' => 'Оригинална широчина:',
60+
'resize-new-height' => 'Височина:',
61+
'resize-new-width' => 'Широчина:',
62+
63+
'locale-bootbox' => 'bg',
64+
];

src/lang/en/lfm.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
'message-delete' => 'Are you sure you want to delete this item?',
3434
'message-name' => 'Folder name:',
3535
'message-rename' => 'Rename to:',
36+
'message-extension_not_found' => 'Please install gd or imagick extension to crop, resize, and make thumbnails of images.',
3637

3738
'error-rename' => 'File name already in use!',
3839
'error-file-empty' => 'You must choose a file!',

src/lang/es/lfm.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
'nav-thumbnails' => 'Miniaturas',
88
'nav-list' => 'Listado',
99

10-
'menu-new' => 'Nueva Carpeta',
1110
'menu-rename' => 'Cambiar Nombre',
1211
'menu-delete' => 'Eliminar',
1312
'menu-view' => 'Ver',
@@ -34,6 +33,7 @@
3433
'message-delete' => '¿Está seguro que desea eliminar este item?',
3534
'message-name' => 'Nombre de Carpeta:',
3635
'message-rename' => 'Renombrar a:',
36+
'message-extension_not_found' => '(translation wanted)',
3737

3838
'error-rename' => '¡Nombre de Archivo ya existe!',
3939
'error-file-empty' => '¡Debes escoger un archivo!',

src/lang/fa/lfm.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
'message-delete' => 'آیا برای حذف این آیتم مطمئن هستید؟',
3434
'message-name' => 'نام پوشه:',
3535
'message-rename' => 'تغییر نام به:',
36+
'message-extension_not_found' => '(translation wanted)',
3637

3738
'error-rename' => 'این نام قبلا استفاده شده!',
3839
'error-file-empty' => 'شما باید یک فایل را انتخاب کنید!',

src/lang/fr/lfm.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
'nav-upload' => 'Charger',
77
'nav-thumbnails' => 'Vignettes',
88
'nav-list' => 'Liste',
9-
9+
1010
'menu-rename' => 'Renommez',
1111
'menu-delete' => 'Effacer',
1212
'menu-view' => 'Voir le',
@@ -33,6 +33,7 @@
3333
'message-delete' => 'Êtes-vous sûr de vouloir supprimer ce fichier ?',
3434
'message-name' => 'Nom du dossier:',
3535
'message-rename' => 'Renommer le dossier:',
36+
'message-extension_not_found' => '(translation wanted)',
3637

3738
'error-rename' => 'Ce nom est déjà pris !',
3839
'error-file-empty' => 'Veuillez choisir un fichier',

src/lang/pt-BR/lfm.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
'message-delete' => 'Você está certo que quer deletar este arquivo?',
3434
'message-name' => 'Nome da pasta:',
3535
'message-rename' => 'Renomear para:',
36+
'message-extension_not_found' => '(translation wanted)',
3637

3738
'error-rename' => 'Nome de arquivo já está em uso!',
3839
'error-file-empty' => 'Você deve escolher um arquivo!',

src/lang/tr/lfm.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
'message-delete' => 'Bu dosyayı silmek istediğinizden emin misiniz?',
3434
'message-name' => 'Klasör adı:',
3535
'message-rename' => 'Yeni ad:',
36+
'message-extension_not_found' => '(translation wanted)',
3637

3738
'error-rename' => 'Dosya adı kullanımda!',
3839
'error-file-empty' => 'Bir dosya seçmelisiniz!',

src/lang/zh-CN/lfm.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
'message-delete' => '确定要删除此项目吗?',
3434
'message-name' => '文件夹名称:',
3535
'message-rename' => '重命名为:',
36+
'message-extension_not_found' => '请安装 gd 或 imagick 以使用缩放、裁剪、及缩图功能',
3637

3738
'error-rename' => '名称重复,请重新输入!',
3839
'error-file-empty' => '请选择档案!',

0 commit comments

Comments
 (0)