Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions src/blocks/DropArea/DropArea.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,17 @@ export class DropArea extends LitUploaderBlock {
@state()
private _isVisible = true;

private get _localizedText() {
@state()
private _dropTextKey = 'drop-files-here';
Comment thread
egordidenko marked this conversation as resolved.

private _isMultiple = false;
private _updateDropText(): void {
const customText = this.text;
if (typeof customText === 'string' && customText.length > 0) {
return this.l10n(customText) || customText;
this._dropTextKey = this.l10n(customText) || customText;
return;
}
return this.l10n('drop-files-here');
this._dropTextKey = this._isMultiple ? this.l10n('drop-files-here') : this.l10n('drop-file-here');
}

private _destroyDropzone: (() => void) | null = null;
Expand Down Expand Up @@ -144,15 +149,24 @@ export class DropArea extends LitUploaderBlock {
this._updateIsEnabled();
this._updateVisibility();
});

this.subConfigValue('multiple', (val) => {
this._isMultiple = Boolean(val);
this._updateDropText();
});
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}

protected override willUpdate(changedProperties: PropertyValues<this>): void {
protected override willUpdate(changedProperties: PropertyValues<this & { localeId: string }>): void {
super.willUpdate(changedProperties);

if (changedProperties.has('disabled')) {
this._updateIsEnabled();
this._updateVisibility();
}

if (changedProperties.has('text') || changedProperties.has('localeId')) {
this._updateDropText();
}
}

protected override updated(changedProperties: PropertyValues<this>): void {
Expand Down Expand Up @@ -278,7 +292,7 @@ export class DropArea extends LitUploaderBlock {
<uc-icon name="default"></uc-icon>
<uc-icon name="arrow-down"></uc-icon>
</div>
<span class="uc-text">${this._localizedText}</span>
<span class="uc-text">${this._dropTextKey}</span>
</div>`,
)}
`;
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/ar.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'اختر ملف',
'choose-files': 'اختر ملفات',
'drop-files-here': 'أسقط الملفات هنا',
'drop-file-here': 'أسقط الملف هنا',
'select-file-source': 'اختر مصدر الملف',
selected: 'مختار',
upload: 'رفع',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/az.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Fayl seç',
'choose-files': 'Faylları seç',
'drop-files-here': 'Faylları buraya atın',
'drop-file-here': 'Faylı buraya atın',
'select-file-source': 'Fayl mənbəyi seç',
selected: 'Seçildi',
upload: 'Yüklə',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Tria fitxer',
'choose-files': 'Tria fitxers',
'drop-files-here': 'Deixa caure els fitxers aquí',
'drop-file-here': 'Deixa caure el fitxer aquí',
'select-file-source': "Selecciona l'origen del fitxer",
selected: 'Seleccionat',
upload: 'Pujar',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Vybrat soubor',
'choose-files': 'Vybrat soubory',
'drop-files-here': 'Přetáhněte soubory sem',
'drop-file-here': 'Přetáhněte soubor sem',
'select-file-source': 'Vyberte zdroj souboru',
selected: 'Vybráno',
upload: 'Nahrát',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/da.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Vælg fil',
'choose-files': 'Vælg filer',
'drop-files-here': 'Slip filer her',
'drop-file-here': 'Slip filen her',
'select-file-source': 'Vælg filkilde',
selected: 'Valgt',
upload: 'Upload',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Datei wählen',
'choose-files': 'Dateien wählen',
'drop-files-here': 'Dateien hier ablegen',
'drop-file-here': 'Datei hier ablegen',
'select-file-source': 'Dateiquelle auswählen',
selected: 'Ausgewählt',
upload: 'Hochladen',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/el.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Επιλογή αρχείου',
'choose-files': 'Επιλογή αρχείων',
'drop-files-here': 'Αφήστε τα αρχεία εδώ',
'drop-file-here': 'Αφήστε το αρχείο εδώ',
'select-file-source': 'Επιλέξτε πηγή αρχείου',
selected: 'Επιλεγμένο',
upload: 'Μεταφόρτωση',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/en.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Choose file',
'choose-files': 'Choose files',
'drop-files-here': 'Drop files here',
'drop-file-here': 'Drop file here',
'select-file-source': 'Select file source',
selected: 'Selected',
upload: 'Upload',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Elegir archivo',
'choose-files': 'Elegir archivos',
'drop-files-here': 'Suelta los archivos aquí',
'drop-file-here': 'Suelta el archivo aquí',
'select-file-source': 'Seleccionar fuente del archivo',
selected: 'Seleccionado',
upload: 'Subir',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/et.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Vali fail',
'choose-files': 'Vali failid',
'drop-files-here': 'Lohista failid siia',
'drop-file-here': 'Lohista fail siia',
'select-file-source': 'Vali faili allikas',
selected: 'Valitud',
upload: 'Lae üles',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/fi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Valitse tiedosto',
'choose-files': 'Valitse tiedostoja',
'drop-files-here': 'Raahaa tiedostot tänne',
'drop-file-here': 'Raahaa tiedosto tänne',
'select-file-source': 'Valitse tiedoston lähde',
selected: 'Valittu',
upload: 'Lataa',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Choisir un fichier',
'choose-files': 'Choisir des fichiers',
'drop-files-here': 'Déposez les fichiers ici',
'drop-file-here': 'Déposez le fichier ici',
'select-file-source': 'Sélectionnez la source du fichier',
selected: 'Sélectionné',
upload: 'Télécharger',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/he.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'בחר קובץ',
'choose-files': 'בחר קבצים',
'drop-files-here': 'שחרר קבצים כאן',
'drop-file-here': 'שחרר קובץ כאן',
'select-file-source': 'בחר מקור קבצים',
selected: 'נבחר',
upload: 'העלה',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/hy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Ընտրեք ֆայլը',
'choose-files': 'Ընտրեք ֆայլերը',
'drop-files-here': 'Թողարկեք ֆայլերը այստեղ',
'drop-file-here': 'Թողարկեք ֆայլը այստեղ',
'select-file-source': 'Ընտրեք ֆայլի աղբյուրը',
selected: 'Ընտրված է',
upload: 'Բեռնել',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/is.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Veldu skrá',
'choose-files': 'Veldu skrár',
'drop-files-here': 'Slepptu skrám hér',
'drop-file-here': 'Slepptu skrá hér',
'select-file-source': 'Veldu uppruna skrár',
selected: 'Valið',
upload: 'Hlaða upp',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/it.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Scegli file',
'choose-files': 'Scegli files',
'drop-files-here': 'Trascina i file qui',
'drop-file-here': 'Trascina il file qui',
'select-file-source': 'Seleziona sorgente file',
selected: 'Selezionato',
upload: 'Carica',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'ファイルを選択',
'choose-files': 'ファイルを選択する',
'drop-files-here': 'ここにファイルをドロップしてください',
'drop-file-here': 'ここにファイルをドロップしてください',
'select-file-source': 'ファイルソースを選択',
selected: '選択された',
upload: 'アップロード',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/ka.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'აირჩიეთ ფაილი',
'choose-files': 'აირჩიეთ ფაილები',
'drop-files-here': 'ჩააგდეთ ფაილები აქ',
'drop-file-here': 'ჩააგდეთ ფაილი აქ',
'select-file-source': 'აირჩიეთ ფაილის წყარო',
selected: 'არჩეულია',
upload: 'ატვირთვა',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/kk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Файл таңдаңыз',
'choose-files': 'Файлдарды таңдаңыз',
'drop-files-here': 'Файлдарды мұнда тастаңыз',
'drop-file-here': 'Файлды мұнда тастаңыз',
'select-file-source': 'Файл көзін таңдаңыз',
selected: 'Таңдалған',
upload: 'Жүктеу',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/ko.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': '파일 선택',
'choose-files': '파일 선택',
'drop-files-here': '여기에 파일을 놓으세요',
'drop-file-here': '여기에 파일을 놓으세요',
'select-file-source': '파일 소스 선택',
selected: '선택됨',
upload: '업로드',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/lv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Izvēlēties failu',
'choose-files': 'Izvēlēties failus',
'drop-files-here': 'Nomest failus šeit',
'drop-file-here': 'Nomest failu šeit',
'select-file-source': 'Izvēlēties faila avotu',
selected: 'Izvēlēts',
upload: 'Augšupielādēt',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/nb.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Velg fil',
'choose-files': 'Velg filer',
'drop-files-here': 'Slipp filer her',
'drop-file-here': 'Slipp filen her',
'select-file-source': 'Velg filkilde',
selected: 'Valgt',
upload: 'Last opp',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Kies bestand',
'choose-files': 'Kies bestanden',
'drop-files-here': 'Bestanden hier neerzetten',
'drop-file-here': 'Bestand hier neerzetten',
'select-file-source': 'Selecteer bestandsbron',
selected: 'Geselecteerd',
upload: 'Uploaden',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/pl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Wybierz plik',
'choose-files': 'Wybierz pliki',
'drop-files-here': 'Upuść pliki tutaj',
'drop-file-here': 'Upuść plik tutaj',
'select-file-source': 'Wybierz źródło pliku',
selected: 'Wybrane',
upload: 'Prześlij',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/pt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Escolher arquivo',
'choose-files': 'Escolher arquivos',
'drop-files-here': 'Solte os arquivos aqui',
'drop-file-here': 'Solte o arquivo aqui',
'select-file-source': 'Selecionar origem do arquivo',
selected: 'Selecionado',
upload: 'Carregar',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/ro.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Alegeți fișierul',
'choose-files': 'Alegeți fișierele',
'drop-files-here': 'Depuneți fișierele aici',
'drop-file-here': 'Depuneți fișierul aici',
'select-file-source': 'Selectați sursa fișierului',
selected: 'Selectat',
upload: 'Încărcați',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/ru.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Выбрать файл',
'choose-files': 'Выбрать файлы',
'drop-files-here': 'Перетащите файлы сюда',
'drop-file-here': 'Перетащите файл сюда',
'select-file-source': 'Выбрать источник файла',
selected: 'Выбрано',
upload: 'Загрузить',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/sk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Vybrať súbor',
'choose-files': 'Vybrať súbory',
'drop-files-here': 'Pretiahnite súbory sem',
'drop-file-here': 'Pretiahnite súbor sem',
'select-file-source': 'Vyberte zdroj súboru',
selected: 'Vybrané',
upload: 'Nahrať',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/sr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Изабери датотеку',
'choose-files': 'Изабери датотеке',
'drop-files-here': 'Повуци датотеке овде',
'drop-file-here': 'Повуци датотеку овде',
'select-file-source': 'Изабери извор датотеке',
selected: 'Изабрано',
upload: 'Отпреми',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/sv.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Välj fil',
'choose-files': 'Välj filer',
'drop-files-here': 'Släpp filer här',
'drop-file-here': 'Släpp filen här',
'select-file-source': 'Välj filkälla',
selected: 'Vald',
upload: 'Ladda upp',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/tr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Dosya seç',
'choose-files': 'Dosyaları seç',
'drop-files-here': 'Dosyaları buraya bırak',
'drop-file-here': 'Dosyayı buraya bırak',
'select-file-source': 'Dosya kaynağı seç',
selected: 'Seçildi',
upload: 'Yükle',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/uk.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Обрати файл',
'choose-files': 'Обрати файли',
'drop-files-here': 'Перетягніть файли сюди',
'drop-file-here': 'Перетягніть файл сюди',
'select-file-source': 'Виберіть джерело файлу',
selected: 'Вибрано',
upload: 'Завантажити',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/vi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': 'Chọn tệp',
'choose-files': 'Chọn các tệp',
'drop-files-here': 'Thả các tệp vào đây',
'drop-file-here': 'Thả tệp vào đây',
'select-file-source': 'Chọn nguồn tệp',
selected: 'Đã chọn',
upload: 'Tải lên',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/zh-TW.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': '選擇檔案',
'choose-files': '選擇多個檔案',
'drop-files-here': '將檔案拖曳至此',
'drop-file-here': '將檔案拖曳至此',
'select-file-source': '選擇檔案來源',
selected: '已選擇',
upload: '上傳',
Expand Down
1 change: 1 addition & 0 deletions src/locales/file-uploader/zh.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export default {
'choose-file': '选择文件',
'choose-files': '选择多个文件',
'drop-files-here': '将文件拖到此处',
'drop-file-here': '将文件拖到此处',
'select-file-source': '选择文件源',
selected: '已选择',
upload: '上传',
Expand Down
9 changes: 8 additions & 1 deletion src/solutions/file-uploader/minimal/FileUploaderMinimal.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ export class FileUploaderMinimal extends LitSolutionBlock {
@state()
private _classStartFrom = EMPTY_CLASS;

@state()
private _buttonTextKey = 'choose-file';

private _getInitActivity(): string {
return (this.getCssData('--cfg-init-activity') as string | undefined) || LitActivityBlock.activities.START_FROM;
}
Expand Down Expand Up @@ -136,6 +139,10 @@ export class FileUploaderMinimal extends LitSolutionBlock {
});
});

this.subConfigValue('multiple', (val) => {
this._buttonTextKey = val ? 'choose-files' : 'choose-file';
});
Comment thread
egordidenko marked this conversation as resolved.

this.modalManager?.subscribe(ModalEvents.OPEN, this._handleModalOpen);
this.modalManager?.subscribe(ModalEvents.CLOSE, this._handleModalClose);
}
Expand All @@ -155,7 +162,7 @@ export class FileUploaderMinimal extends LitSolutionBlock {
initflow
clickable
tabindex="0"
><span>${this.l10n('choose-file')}</span></uc-drop-area>
><span>${this.l10n(this._buttonTextKey)}</span></uc-drop-area>
<uc-copyright></uc-copyright>
</uc-start-from>
<uc-upload-list class=${this._classUploadList}></uc-upload-list>
Expand Down
2 changes: 1 addition & 1 deletion tests/bundles.e2e.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ describe('Bundles', () => {
</>,
);

await expect.element(page.getByText('Choose file', { exact: true })).toBeVisible();
await expect.element(page.getByText('Choose files', { exact: true })).toBeVisible();
});

test('web/uc-file-uploader-regular.min.js', async () => {
Expand Down
6 changes: 3 additions & 3 deletions tests/file-uploader-minimal.e2e.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ beforeEach(() => {
describe('File uploader minimal', () => {
describe('Upload button', () => {
it('should be rendered', async () => {
await expect.element(page.getByText('Choose file', { exact: true })).toBeVisible();
await expect.element(page.getByText('Choose files', { exact: true })).toBeVisible();
});

it('should open file dialog on click', async () => {
await page.getByText('Choose file', { exact: true }).click();
await page.getByText('Choose files', { exact: true }).click();
const startFrom = page.getByTestId('uc-start-from');
await expect(startFrom).toBeDefined();
});
Expand All @@ -46,7 +46,7 @@ describe('File uploader minimal', () => {
});

it('should open cloud image editor modal on edit button click', async () => {
await page.getByText('Choose file', { exact: true }).click();
await page.getByText('Choose files', { exact: true }).click();
const startFrom = page.getByTestId('uc-start-from');
const uploadList = page.getByTestId('uc-upload-list');

Expand Down
Loading