Skip to content

Commit f07c13a

Browse files
committed
feat: Show "Deleting /foo" in progress window when deleting files
Previously we showed "Moving /foo" which was confusing. Also, make use of i18n replacements instead of gluing strings together, because other languages might put the words in a different order. For now, I've modified all the translations so that the "Moving foo" text will appear as it did before, but these will require someone who actually knows the different languages to check and correct them.
1 parent c12312c commit f07c13a

29 files changed

+34
-29
lines changed

src/helpers.js

+5-1
Original file line numberDiff line numberDiff line change
@@ -2199,6 +2199,8 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
21992199
// indicates whether this is a recycling operation
22002200
let recycling = false;
22012201

2202+
let status_i18n_string = 'moving_file';
2203+
22022204
// --------------------------------------------------------
22032205
// Trashing
22042206
// --------------------------------------------------------
@@ -2210,6 +2212,8 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
22102212
trashed_ts: Math.round(Date.now() / 1000),
22112213
};
22122214

2215+
status_i18n_string = 'deleting_file';
2216+
22132217
// update other clients
22142218
if(window.socket)
22152219
window.socket.emit('trash.is_empty', {is_empty: false});
@@ -2241,7 +2245,7 @@ window.move_items = async function(el_items, dest_path, is_undo = false){
22412245
// --------------------------------------------------------
22422246
// update progress window with current item being moved
22432247
// --------------------------------------------------------
2244-
progwin?.set_status(i18n('moving') + ' ' + html_encode(path_to_show_on_progwin));
2248+
progwin?.set_status(i18n(status_i18n_string, path_to_show_on_progwin));
22452249

22462250
// execute move
22472251
let resp = await puter.fs.move({

src/i18n/translations/ar.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const ar = {
8383
log_in: "تسجيل الدخول",
8484
log_out: 'تسجيل خروج',
8585
move: 'يتحرك',
86-
moving: "متحرك ",
86+
moving_file: "متحرك %%",
8787
my_websites: "مواقعي الإلكترونية ",
8888
name: 'اسم',
8989
name_cannot_be_empty: 'لا يمكن أن يكون الاسم فارغًا',

src/i18n/translations/bn.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const bn = {
8282
log_in: "প্রবেশ করুন",
8383
log_out: 'প্রস্থান',
8484
move: 'সরান',
85-
moving: "চলন্ত",
85+
moving_file: "চলন্ত %%",
8686
my_websites: "আমার ওয়েবসাইট",
8787
name: 'নাম',
8888
name_cannot_be_empty: 'নাম খালি রাখা যাবে না।',

src/i18n/translations/br.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ const br = {
102102
log_into_another_account_anyway: 'Entrar com outra conta de qualquer maneira',
103103
log_out: 'Sair',
104104
move: 'Mover',
105-
moving: "Movendo",
105+
moving_file: "Movendo %%",
106106
my_websites: "Meus Sites",
107107
name: 'Nome',
108108
name_cannot_be_empty: 'Nome não pode ser vazio.',

src/i18n/translations/da.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const da = {
8383
log_in: "Log ind",
8484
log_out: "Log ud",
8585
move: "Flyt",
86-
moving: "Flytter",
86+
moving_file: "Flytter %%",
8787
my_websites: "Mine websteder",
8888
name: "Navn",
8989
name_cannot_be_empty: "Navn kan ikke være tomt.",

src/i18n/translations/de.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const de = {
8383
log_in: "Einloggen",
8484
log_out: 'Ausloggen',
8585
move: 'Verschieben',
86-
moving: "Verschiebe",
86+
moving_file: "Verschiebe %%",
8787
my_websites: "Meine Webseiten",
8888
name: 'Name',
8989
name_cannot_be_empty: 'Name kann nicht leer sein.',

src/i18n/translations/emoji.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const emoji = {
9292
log_into_another_account_anyway: '👤🔄',
9393
log_out: '🔚',
9494
move: '➡️',
95-
moving: "➡️...",
95+
moving_file: "➡️ %%...",
9696
my_websites: "🌐👤",
9797
name: '📛',
9898
name_cannot_be_empty: '📛❌',

src/i18n/translations/en.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ const en = {
8686
delete: 'Delete',
8787
delete_account: "Delete Account",
8888
delete_permanently: "Delete Permanently",
89+
deleting_file: "Deleting %%",
8990
deploy_as_app: 'Deploy as app',
9091
descending: 'Descending',
9192
desktop_background_fit: "Fit",
@@ -142,7 +143,7 @@ const en = {
142143
looks_good: "Looks good!",
143144
manage_sessions: "Manage Sessions",
144145
move: 'Move',
145-
moving: "Moving",
146+
moving_file: "Moving %%",
146147
my_websites: "My Websites",
147148
name: 'Name',
148149
name_cannot_be_empty: 'Name cannot be empty.',

src/i18n/translations/es.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const es = {
8383
log_in: "Iniciar sesión",
8484
log_out: 'Cerrar sesión',
8585
move: 'Mover',
86-
moving: "Moviendo",
86+
moving_file: "Moviendo %%",
8787
my_websites: "Mis páginas web",
8888
name: 'Nombre',
8989
name_cannot_be_empty: 'El nombre no puede estar vacío.',

src/i18n/translations/fa.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const fa = {
8484
log_in: "ورود",
8585
log_out: 'خروج',
8686
move: 'انتقال',
87-
moving: "انتقال",
87+
moving_file: "انتقال %%",
8888
my_websites: "وبسایت های من",
8989
name: 'نام',
9090
name_cannot_be_empty: 'نام نمی تواند خالی باشد.',

src/i18n/translations/fi.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ const fi = {
116116
log_in: "Kirjaudu Sisään",
117117
log_out: 'Kirjaudu Ulos',
118118
move: 'Siirrä',
119-
moving: "Siirretään",
119+
moving_file: "Siirretään %%",
120120
my_websites: "Verkkosivustoni",
121121
name: 'Nimi',
122122
name_cannot_be_empty: 'Nimi ei voi olla tyhjä.',

src/i18n/translations/fr.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const fr = {
8282
log_in: "Se connecter",
8383
log_out: "Se déconnecter",
8484
move: "Déplacer",
85-
moving: "Déplacement en cours",
85+
moving_file: "Déplacement en cours %%",
8686
my_websites: "Mes sites web",
8787
name: "Nom",
8888
name_cannot_be_empty: "Le nom ne peut pas être vide.",

src/i18n/translations/hy.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const hy = {
8383
log_in: "Մուտք գործել",
8484
log_out: "Դուրս գալ",
8585
move: "Տեղափոխել",
86-
moving: "Տեղափոխվում է",
86+
moving_file: "Տեղափոխվում է %%",
8787
my_websites: "Իմ կայքերը",
8888
name: "Անուն",
8989
name_cannot_be_empty: "Անվան դաշտը չի կառող լինել դատարկ։",

src/i18n/translations/ig.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const ig = {
126126
log_out: 'pụọ',
127127
manage_sessions: "Jikwaa Oge",
128128
move: 'Bugharịa',
129-
moving: "Na Bugharịa",
129+
moving_file: "Na Bugharịa %%",
130130
my_websites: "Weebụsaịtị m",
131131
name: 'Aha',
132132
name_cannot_be_empty: 'Aha enweghị ike ịbụ ihe efu.',

src/i18n/translations/it.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const it = {
8383
log_in: "Accedi",
8484
log_out: 'Disconnettiti',
8585
move: 'Sposta',
86-
moving: "Spostamento in corso",
86+
moving_file: "Spostamento in corso %%",
8787
my_websites: "I miei siti web",
8888
name: 'Nome',
8989
name_cannot_be_empty: 'Il nome non può essere vuoto.',

src/i18n/translations/ko.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ const ko = {
9191
log_in: "로그인",
9292
log_out: '로그아웃',
9393
move: '이동',
94-
moving: "이동 중",
94+
moving_file: "이동 중 %%",
9595
my_websites: "내 웹사이트",
9696
name: '이름',
9797
name_cannot_be_empty: '이름은 비워둘 수 없습니다.',

src/i18n/translations/nb.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const nb = {
9292
log_into_another_account_anyway: 'Logg inn på en annen bruker uansett',
9393
log_out: "Logg ut",
9494
move: "Flytt",
95-
moving: "Flytter",
95+
moving_file: "Flytter %%",
9696
my_websites: "Mine nettsteder",
9797
name: "Navn",
9898
name_cannot_be_empty: "Navn kan ikke være tomt.",

src/i18n/translations/nl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ const nl = {
102102
log_into_another_account_anyway: 'Alsnog met ander account inloggen',
103103
log_out: 'Uitloggen',
104104
move: 'Verplaatsen',
105-
moving: "Aan het verplaatsen",
105+
moving_file: "Aan het verplaatsen %%",
106106
my_websites: "Mijn Websites",
107107
name: 'Naam',
108108
name_cannot_be_empty: 'Naam kan niet leeg zijn.',

src/i18n/translations/nn.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const nn = {
8383
log_in: "Logg inn",
8484
log_out: "Logg ut",
8585
move: "Flytt",
86-
moving: "Flyttar",
86+
moving_file: "Flyttar %%",
8787
my_websites: "Mine nettstader",
8888
name: "Namn",
8989
name_cannot_be_empty: "Namn kan ikkje vere tomt.",

src/i18n/translations/pl.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const pl = {
9292
log_into_another_account_anyway: 'Zaloguj się do innego konta mimo wszystko',
9393
log_out: 'Wyloguj się',
9494
move: 'Przenieś',
95-
moving: "Przenoszenie",
95+
moving_file: "Przenoszenie %%",
9696
my_websites: "Moje strony",
9797
name: 'Nazwa',
9898
name_cannot_be_empty: 'Nazwa nie może być pusta.',

src/i18n/translations/pt.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ const pt = {
106106
log_into_another_account_anyway: 'Entrar com outra conta na mesma',
107107
log_out: 'Sair',
108108
move: 'Mover',
109-
moving: "Movendo",
109+
moving_file: "Movendo %%",
110110
my_websites: "Meus Sites",
111111
name: 'Nome',
112112
name_cannot_be_empty: 'Nome não pode ser vazio.',

src/i18n/translations/ro.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ const ro = {
8282
log_in: "Loghează-te",
8383
log_out: 'Deconectează-te',
8484
move: 'Mută',
85-
moving: "Se mută",
85+
moving_file: "Se mută %%",
8686
my_websites: "Site-urile mele",
8787
name: 'Nume',
8888
name_cannot_be_empty: 'Numele nu poate fi necompletat.',

src/i18n/translations/ru.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ const ru = {
126126
log_out: 'Выйти',
127127
manage_sessions: "Управление Сеансами",
128128
move: 'Переместить',
129-
moving: "Перемещается",
129+
moving_file: "Перемещается %%",
130130
my_websites: "Мои Сайты",
131131
name: 'Имя',
132132
name_cannot_be_empty: 'Имя не может быть пустым.',

src/i18n/translations/sv.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const sv = {
8383
log_in: "Logga in",
8484
log_out: "Logga ut",
8585
move: "Flytta",
86-
moving: "Flyttar",
86+
moving_file: "Flyttar %%",
8787
my_websites: "Mina webbplatser",
8888
name: "Namn",
8989
name_cannot_be_empty: "Namn kan inte vara tomt.",

src/i18n/translations/th.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ const th = {
9191
log_into_another_account_anyway: "ต้องการเข้าสู่บัญชีอื่น",
9292
log_out: "ออกจากระบบ",
9393
move: "ย้าย",
94-
moving: "กำลังย้าย",
94+
moving_file: "กำลังย้าย %%",
9595
my_websites: "เว็บไซต์ของฉัน",
9696
name: "ชื่อ",
9797
name_cannot_be_empty: "ไม่สามารถปล่อยช่องชื่อให้ว่างได้",

src/i18n/translations/tr.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ const tr = {
116116
log_out: "Çıkış Yap",
117117
manage_sessions: "Oturumları Yönet",
118118
move: "Taşı",
119-
moving: "Taşınıyor",
119+
moving_file: "Taşınıyor %%",
120120
my_websites: "Web Sitelerim",
121121
name: "Ad",
122122
name_cannot_be_empty: "Ad boş olamaz.",

src/i18n/translations/ur.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ const ur = {
8383
log_in: "لاگ ان",
8484
log_out: 'لاگ آؤٹ',
8585
move: 'منتقل کریں',
86-
moving: "منتقل ہو رہا ہے ",
86+
moving_file: "منتقل ہو رہا ہے %%",
8787
my_websites: "میری ویب سائٹیں ",
8888
name: 'نام',
8989
name_cannot_be_empty: 'نام خالی نہیں ہو سکتا',

src/i18n/translations/zh.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ const zh = {
8787
log_in: "登录",
8888
log_out: '登出',
8989
move: '移动',
90-
moving: "移动",
90+
moving_file: "移动 %%",
9191
my_websites: "我的网站",
9292
name: '名称',
9393
name_cannot_be_empty: '名称不能为空。',

src/i18n/translations/zhtw.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ const zhtw = {
113113
log_into_another_account_anyway: '無論如何都要登入另一個帳號',
114114
log_out: '登出',
115115
move: '移動',
116-
moving: "正在移動",
116+
moving_file: "正在移動 %%",
117117
my_websites: "我的網站",
118118
name: '名稱',
119119
name_cannot_be_empty: '名稱不能為空。',

0 commit comments

Comments
 (0)