Skip to content

Commit 4e5a04f

Browse files
joni2backjoni2back
committed
Merge branch 'd4rkstar-master'
2 parents af11e3b + 8adce6f commit 4e5a04f

File tree

7 files changed

+132
-12
lines changed

7 files changed

+132
-12
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ This project is under free license. If you want to support the angular-filemanag
1313
![](https://raw.githubusercontent.com/joni2back/angular-filemanager/master/screenshot.gif)
1414

1515
### Features
16-
- Multilanguage (English, Chinese, Spanish, Russian, Portuguese, French, German, Slovak, Hebrew, Persian, Polish, Ukrainian, Turkish)
16+
- Multilanguage (English, Chinese, Spanish, Russian, Portuguese, French, German, Italian, Slovak, Hebrew, Persian, Polish, Ukrainian, Turkish)
1717
- Multiple templates (List / Icons)
1818
- Multiple file upload
1919
- Multiple file support

‎bridges/php-local/LocalBridge/FileManagerApi.php‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,13 +189,22 @@ public function getHandler($queries)
189189

190190
private function downloadAction($path)
191191
{
192+
$file_name = basename($path);
192193
$path = $this->basePath . $path;
193194

194195
if (! file_exists($path)) {
195196
return false;
196197
}
197198

198-
header('Cache-Control: must-revalidate');
199+
$finfo = finfo_open(FILEINFO_MIME_TYPE);
200+
$mime_type = finfo_file($finfo, $path);
201+
finfo_close($finfo);
202+
203+
if (ob_get_level()) ob_end_clean();
204+
205+
header("Content-Disposition: attachment; filename=\"$file_name\"");
206+
header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
207+
header("Content-Type: $mime_type");
199208
header('Pragma: public');
200209
header('Content-Length: ' . filesize($path));
201210
readfile($path);

‎dist/angular-filemanager.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gulpfile.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ gulp.task('cache-templates', function () {
2626
.pipe(templateCache(jsFile, {
2727
module: 'FileManagerApp',
2828
base: function(file) {
29-
return tplPath + '/' + path.basename(file.history);
29+
return tplPath + '/' + path.basename(file.history[0]);
3030
}
3131
}))
3232
.pipe(gulp.dest(dst));

‎package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
"homepage": "https://github.com/joni2back/angular-filemanager#readme",
2222
"devDependencies": {
2323
"bower": "^1.7.9",
24+
"del": "^2.2.0",
2425
"gulp": "^3.9.1",
25-
"gulp-angular-templatecache": "^1.8.0",
26+
"gulp-angular-templatecache": "^1.9.1",
27+
"gulp-clean-css": "^2.0.12",
2628
"gulp-concat": "^2.6.0",
27-
"gulp-clean-css": "^2.0.7",
28-
"gulp-uglify": "^1.5.3",
29-
"gulp-eslint": "^2.0.0",
30-
"del": "^2.2.0"
29+
"gulp-eslint": "^2.1.0",
30+
"gulp-uglify": "^1.5.4"
3131
}
3232
}

‎src/js/providers/translations.js‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
french: 'French',
1313
german: 'German',
1414
hebrew: 'Hebrew',
15+
italian: 'Italian',
1516
slovak: 'Slovak',
1617
chinese: 'Chinese',
1718
russian: 'Russian',
@@ -109,6 +110,7 @@
109110
french: 'צרפתית',
110111
german: 'גרמנית',
111112
hebrew: 'עברי',
113+
italian: 'איטלקי',
112114
slovak: 'סלובקי',
113115
chinese: 'סִינִית',
114116
russian: 'רוּסִי',
@@ -205,6 +207,7 @@
205207
french: 'Francês',
206208
german: 'Alemão',
207209
hebrew: 'Hebraico',
210+
italian: 'Italiano',
208211
slovak: 'Eslovaco',
209212
chinese: 'Chinês',
210213
russian: 'Russo',
@@ -302,6 +305,7 @@
302305
french: 'Francés',
303306
german: 'Alemán',
304307
hebrew: 'Hebreo',
308+
italian: 'Italiano',
305309
slovak: 'Eslovaco',
306310
chinese: 'Chino',
307311
russian: 'Ruso',
@@ -399,6 +403,7 @@
399403
french: 'Français',
400404
german: 'Allemand',
401405
hebrew: 'Hébreu',
406+
italian: 'Italien',
402407
slovak: 'Slovaque',
403408
chinese: 'Chinois',
404409
russian: 'Russe',
@@ -496,6 +501,7 @@
496501
french: 'Französisch',
497502
german: 'Deutsch',
498503
hebrew: 'Hebräisch',
504+
italian: 'Italienisch',
499505
slovak: 'Slowakisch',
500506
chinese: 'Chinesisch',
501507
russian: 'Russisch',
@@ -593,6 +599,7 @@
593599
french: 'Francúzština',
594600
german: 'Nemčina',
595601
hebrew: 'Hebrejčina',
602+
italian: 'Italština',
596603
slovak: 'Slovenčina',
597604
chinese: 'Čínština',
598605
russian: 'Ruský',
@@ -690,6 +697,7 @@
690697
french: '法语',
691698
german: '德语',
692699
hebrew: '希伯来语',
700+
italian: '意大利',
693701
slovak: '斯洛伐克语',
694702
chinese: '中文',
695703
russian: '俄語',
@@ -787,6 +795,7 @@
787795
french: 'Французкий',
788796
german: 'Немецкий',
789797
hebrew: 'Хинди',
798+
italian: 'итальянский',
790799
slovak: 'Словацкий',
791800
chinese: 'Китайский',
792801
russian: 'русский',
@@ -884,6 +893,7 @@
884893
french: 'Французька',
885894
german: 'Німецька',
886895
hebrew: 'Хінді',
896+
italian: 'італійський',
887897
slovak: 'Словацька',
888898
chinese: 'Китайська',
889899
russian: 'російський',
@@ -981,6 +991,7 @@
981991
french: 'Fransızca',
982992
german: 'Almanca',
983993
hebrew: 'İbranice',
994+
italian: 'İtalyan',
984995
slovak: 'Slovakça',
985996
chinese: 'Çince',
986997
russian: 'Rusça',
@@ -1078,6 +1089,7 @@
10781089
french: 'فرانسه',
10791090
german: 'آلمانی',
10801091
hebrew: 'عبری',
1092+
italian: 'ایتالیایی',
10811093
slovak: 'اسلواک',
10821094
chinese: 'چینی',
10831095
russian: 'روسی',
@@ -1175,6 +1187,7 @@
11751187
french: 'Francuski',
11761188
german: 'Niemiecki',
11771189
hebrew: 'Hebrajski',
1190+
italian: 'Włoski',
11781191
slovak: 'Słowacki',
11791192
chinese: 'Chiński',
11801193
russian: 'Rosyjski',
@@ -1263,5 +1276,102 @@
12631276
download_as_zip: 'Pobierz jako ZIP'
12641277
});
12651278

1279+
$translateProvider.translations('it', {
1280+
filemanager: 'Gestore File',
1281+
language: 'Lingua',
1282+
english: 'Inglese',
1283+
spanish: 'Spagnolo',
1284+
portuguese: 'Portoghese',
1285+
french: 'Francese',
1286+
german: 'Tedesco',
1287+
hebrew: 'Ebraico',
1288+
slovak: 'Slovacco',
1289+
chinese: 'Cinese',
1290+
russian: 'Russo',
1291+
ukrainian: 'Ucraino',
1292+
turkish: 'Turco',
1293+
persian: 'Persiano',
1294+
polish: 'Polacco',
1295+
confirm: 'Conferma',
1296+
cancel: 'Annulla',
1297+
close: 'Chiudi',
1298+
upload_files: 'Carica files',
1299+
files_will_uploaded_to: 'I files saranno caricati in',
1300+
select_files: 'Seleziona i files',
1301+
uploading: 'Trasferimento',
1302+
permissions: 'Permessi',
1303+
select_destination_folder: 'Select carterlla di destinazione',
1304+
source: 'Sorgente',
1305+
destination: 'Destinazione',
1306+
copy_file: 'Copia file',
1307+
sure_to_delete: 'Sicuro di voler eliminare',
1308+
change_name_move: 'Rinomina / sposta',
1309+
enter_new_name_for: 'Inserisci nuovo nome per',
1310+
extract_item: 'Estrai elemento',
1311+
extraction_started: 'Decompressione avviata da un processo in background',
1312+
compression_started: 'Compressione avviata da un processo in background',
1313+
enter_folder_name_for_extraction: 'Inserisci nome cartella per l\'estrazione di',
1314+
enter_file_name_for_compression: 'Inserisci nome file per la compressione di',
1315+
toggle_fullscreen: 'Passa a schermo intero',
1316+
edit_file: 'Modifica file',
1317+
file_content: 'Contenuto del file',
1318+
loading: 'Caricamento',
1319+
search: 'Cerca',
1320+
create_folder: 'Crea cartella',
1321+
create: 'Crea',
1322+
folder_name: 'Nome cartella',
1323+
upload: 'Upload',
1324+
change_permissions: 'Modifica permessi',
1325+
change: 'Modifica',
1326+
details: 'Dettagli',
1327+
icons: 'Icone',
1328+
list: 'Lista',
1329+
name: 'Nome',
1330+
size: 'Dimensione',
1331+
actions: 'Azioni',
1332+
date: 'Data',
1333+
selection: 'Selezione',
1334+
no_files_in_folder: 'Nessun file nella cartella',
1335+
no_folders_in_folder: 'Questa cartella non contiene altre cartelle',
1336+
select_this: 'Seleziona questo',
1337+
go_back: 'Indietro',
1338+
wait: 'Attendere',
1339+
move: 'Sposta',
1340+
download: 'Scarica',
1341+
view_item: 'Visualizza elemento',
1342+
remove: 'Elimina',
1343+
edit: 'Modifica',
1344+
copy: 'Copia',
1345+
rename: 'Rinomina',
1346+
extract: 'Estrai',
1347+
compress: 'Comprimi',
1348+
error_invalid_filename: 'Nome file non valido o già esistente, specificarne un\'altro',
1349+
error_modifying: 'Errore durante la modifica del file',
1350+
error_deleting: 'Errore durante l\'eliminazione del file o della cartella',
1351+
error_renaming: 'Errore durante la rinomina del file',
1352+
error_copying: 'Errore durante la copia del file',
1353+
error_compressing: 'Errore durante la compressione del file o della cartella',
1354+
error_extracting: 'Errore durante l\'estrazione del file',
1355+
error_creating_folder: 'Errore nella creazione della cartella',
1356+
error_getting_content: 'Errore nel recupero del contenuto del file',
1357+
error_changing_perms: 'Errore durante la modifica dei permessi del file',
1358+
error_uploading_files: 'Errore durante il trasferimento dei files',
1359+
sure_to_start_compression_with: 'Sicuro di voler comprimere',
1360+
owner: 'Proprietario',
1361+
group: 'Gruppo',
1362+
others: 'Altri',
1363+
read: 'Lettura',
1364+
write: 'Scrittura',
1365+
exec: 'Esecuzione',
1366+
original: 'Originario',
1367+
changes: 'Cambiamenti',
1368+
recursive: 'Ricorsivo',
1369+
preview: 'Anteprima',
1370+
open: 'Apri',
1371+
these_elements: 'questi {{total}} elementi',
1372+
new_folder: 'Nuova cartella',
1373+
download_as_zip: 'Scarica come file ZIP'
1374+
});
1375+
12661376
}]);
12671377
})(angular);

‎src/templates/navbar.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('fr')">{{"french" | translate}}</a></li>
4242
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('de')">{{"german" | translate}}</a></li>
4343
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('he')">{{"hebrew" | translate}}</a></li>
44+
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('it')">{{"italian" | translate}}</a></li>
4445
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('sk')">{{"slovak" | translate}}</a></li>
4546
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('ru')">{{"russian" | translate}}</a></li>
4647
<li role="presentation"><a role="menuitem" tabindex="-1" href="" ng-click="changeLanguage('ua')">{{"ukrainian" | translate}}</a></li>

0 commit comments

Comments
 (0)