Skip to content

Commit ccbfc96

Browse files
ajmeese7andersevenrud
authored andcommitted
Improved dialog messages
1 parent 5708b60 commit ccbfc96

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ const vfsActionFactory = (core, proc, win, dialog, state) => {
370370
.catch(error => dialog('error', error, __('MSG_UPLOAD_ERROR')));
371371
});
372372

373-
const paste = (move, currentPath) => ({item, callback}) => {
373+
const paste = (move, currentPath) => ({items, callback}) => {
374374
const promises = items.map(item => {
375375
const dest = {
376376
path: pathJoin(currentPath.path, item.filename)
@@ -468,7 +468,7 @@ const dialogFactory = (core, proc, win) => {
468468
})));
469469

470470
const deleteDialog = (action, files) => dialog('confirm', {
471-
message: __('DIALOG_DELETE_MESSAGE', file.filename),
471+
message: __('DIALOG_DELETE_MESSAGE', files.length),
472472
}, usingPositiveButton(() => {
473473
action(
474474
() => Promise.all(

locales.js

+13-13
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ export const en_EN = {
1313
LBL_LOADING: 'Loading {0}',
1414
DIALOG_MKDIR_MESSAGE: 'Create new directory',
1515
DIALOG_MKDIR_PLACEHOLDER: 'New directory',
16-
DIALOG_RENAME_MESSAGE: 'Rename {0} ?',
17-
DIALOG_DELETE_MESSAGE: 'Delete {0} ?',
16+
DIALOG_RENAME_MESSAGE: 'Rename {0}?',
17+
DIALOG_DELETE_MESSAGE: 'Delete {0} file(s)?',
1818
DIALOG_PROGRESS_MESSAGE: 'Uploading {0}...',
1919
MSG_ERROR: 'An error occurred',
2020
MSG_UPLOAD_ERROR: 'Failed to upload file(s)',
@@ -40,8 +40,8 @@ export const sv_SE = {
4040
LBL_LOADING: 'Laddar {0}',
4141
DIALOG_MKDIR_MESSAGE: 'Skapa ny katalog',
4242
DIALOG_MKDIR_PLACEHOLDER: 'Ny katalog',
43-
DIALOG_RENAME_MESSAGE: 'Döp om {0} ?',
44-
DIALOG_DELETE_MESSAGE: 'Radera {0} ?',
43+
DIALOG_RENAME_MESSAGE: 'Döp om {0}?',
44+
DIALOG_DELETE_MESSAGE: 'Radera {0} fil(er)?',
4545
MSG_ERROR: 'Ett fel uppstod',
4646
MSG_UPLOAD_ERROR: 'Det gick inte att ladda upp filer(na)',
4747
MSG_READDIR_ERROR: 'Ett fel uppstod när katalogen lästes: {0}',
@@ -66,8 +66,8 @@ export const nb_NO = {
6666
LBL_LOADING: 'Laster {0}',
6767
DIALOG_MKDIR_MESSAGE: 'Lag ny mappe',
6868
DIALOG_MKDIR_PLACEHOLDER: 'Ny mappe',
69-
DIALOG_RENAME_MESSAGE: 'Omdøpe {0} ?',
70-
DIALOG_DELETE_MESSAGE: 'Slette {0} ?',
69+
DIALOG_RENAME_MESSAGE: 'Omdøpe {0}?',
70+
DIALOG_DELETE_MESSAGE: 'Slette {0} fil(er)?',
7171
MSG_ERROR: 'En feil oppstod',
7272
MSG_UPLOAD_ERROR: 'Feil under opplasting av fil(er)',
7373
MSG_READDIR_ERROR: 'En feil oppstod under lesing av mappe: {0}',
@@ -92,8 +92,8 @@ export const vi_VN = {
9292
LBL_LOADING: 'Đang tải {0}',
9393
DIALOG_MKDIR_MESSAGE: 'Tạo thư mục mới',
9494
DIALOG_MKDIR_PLACEHOLDER: 'Thư mục mới',
95-
DIALOG_RENAME_MESSAGE: 'Đổi tên {0} ?',
96-
DIALOG_DELETE_MESSAGE: 'Xoá {0} ?',
95+
DIALOG_RENAME_MESSAGE: 'Đổi tên {0}?',
96+
DIALOG_DELETE_MESSAGE: 'Xoá {0} (các) tập tin?',
9797
MSG_ERROR: 'Đã xảy ra lỗi',
9898
MSG_UPLOAD_ERROR: 'Không thể tải lên tập tin',
9999
MSG_READDIR_ERROR: 'Đã xảy ra lỗi trong khi đọc thư mục: {0}',
@@ -118,8 +118,8 @@ export const pt_BR = {
118118
LBL_LOADING: 'Carregando {0}',
119119
DIALOG_MKDIR_MESSAGE: 'Criar novo diretório',
120120
DIALOG_MKDIR_PLACEHOLDER: 'Novo diretório',
121-
DIALOG_RENAME_MESSAGE: 'Renomear {0} ?',
122-
DIALOG_DELETE_MESSAGE: 'Deletar {0} ?',
121+
DIALOG_RENAME_MESSAGE: 'Renomear {0}?',
122+
DIALOG_DELETE_MESSAGE: 'Deletar {0} arquivo(s)?',
123123
MSG_ERROR: 'Um erro ocorreu',
124124
MSG_UPLOAD_ERROR: 'Falha ao fazer upload do(s) arquivo(s)',
125125
MSG_READDIR_ERROR: 'Um erro ocorreu ao ler o diretório: {0}',
@@ -144,8 +144,8 @@ export const fr_FR = {
144144
LBL_LOADING: 'Chargement en cours {0}',
145145
DIALOG_MKDIR_MESSAGE: 'Créer nouveau dossier',
146146
DIALOG_MKDIR_PLACEHOLDER: 'Nouveau dossier',
147-
DIALOG_RENAME_MESSAGE: 'Renommer {0} ?',
148-
DIALOG_DELETE_MESSAGE: 'Supprimer {0} ?',
147+
DIALOG_RENAME_MESSAGE: 'Renommer {0}?',
148+
DIALOG_DELETE_MESSAGE: 'Supprimer {0} (des) dossiers?',
149149
MSG_ERROR: 'Une erreur est survenue',
150150
MSG_UPLOAD_ERROR: 'Echec du chargement du(des) fichier(s)',
151151
MSG_READDIR_ERROR: 'Une erreur est survenue lors de la lecture du répertoire : {0}',
@@ -171,7 +171,7 @@ export const tr_TR = {
171171
DIALOG_MKDIR_MESSAGE: 'Yeni dizin oluştur',
172172
DIALOG_MKDIR_PLACEHOLDER: 'Yeni dizin',
173173
DIALOG_RENAME_MESSAGE: '{0} ismi değişsin mi?',
174-
DIALOG_DELETE_MESSAGE: '{0} silinsin mi?',
174+
DIALOG_DELETE_MESSAGE: '{0} dosya(lar) silinsin mi?',
175175
MSG_ERROR: 'Bir hata oldu',
176176
MSG_UPLOAD_ERROR: 'Dosya(lar)ın yüklenmesi işlemi başarısız',
177177
MSG_READDIR_ERROR: 'Belirtilen dizin okunurken bir hata oluştu: {0}',

0 commit comments

Comments
 (0)