Sophivorus has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404157 )
Change subject: Fix UX when uploading a file with same name but different extension ...................................................................... Fix UX when uploading a file with same name but different extension Replace "msu-confirm-replace" message for a more generic "msu-continue" message to avoid confusing the user. Change-Id: Ic6f7831aa79338285b25d7837f8207807ba52b7e --- M MsUpload.js M extension.json M i18n/bn.json M i18n/de.json M i18n/en.json M i18n/es.json M i18n/fr.json M i18n/gl.json M i18n/ja.json M i18n/ko.json M i18n/lb.json M i18n/mk.json M i18n/nl.json M i18n/pl.json M i18n/pt-br.json M i18n/pt.json M i18n/qqq.json M i18n/ru.json M i18n/sv.json M i18n/uk.json M i18n/zh-hans.json M i18n/zh-hant.json 22 files changed, 10 insertions(+), 23 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsUpload refs/changes/57/404157/1 diff --git a/MsUpload.js b/MsUpload.js index c0aca22..8da7a87 100644 --- a/MsUpload.js +++ b/MsUpload.js @@ -69,7 +69,11 @@ $( fileItem.warning ).find( 'div.thumb' ).hide(); } ); - // If a file with the same name already exists, add a checkbox to confirm the replacement + /** + * If a file with the same name already exists, add a checkbox to confirm the replacement + * This checkbox will also appear when the file name differs only in the file extension + * so the confirmation message must be kept generic enough + */ if ( msuVars.confirmReplace ) { MsUpload.unconfirmedReplacements++; @@ -86,7 +90,7 @@ } uploader.trigger( 'CheckFiles' ); } ); - $( '<label>' ).append( checkbox ).append( mw.msg( 'msu-replace-file' ) ).appendTo( fileItem.warning ); + $( '<label>' ).append( checkbox ).append( mw.msg( 'msu-continue' ) ).appendTo( fileItem.warning ); } break; } diff --git a/extension.json b/extension.json index 5c9fe63..6bae05b 100644 --- a/extension.json +++ b/extension.json @@ -35,7 +35,7 @@ "msu-insert-image", "msu-insert-video", "msu-cancel-upload", - "msu-replace-file", + "msu-continue", "msu-clean-all", "msu-ext-not-allowed", "msu-upload-this", diff --git a/i18n/bn.json b/i18n/bn.json index 4a908ce..ecca2bb 100644 --- a/i18n/bn.json +++ b/i18n/bn.json @@ -13,7 +13,6 @@ "msu-insert-image": "চিত্র হিসেবে সন্নিবেশ করুন", "msu-insert-video": "ভিডিও সন্নিবেশ করুন", "msu-cancel-upload": "আপলোড বাতিল করুন", - "msu-replace-file": "ফাইল প্রতিস্থাপন করবেন?", "msu-clean-all": "তালিকা পরিষ্কার করুন", "msu-ext-not-allowed": "কেবলমাত্র নিচের ফাইলের {{PLURAL:$1|ধরন|ধরনসমূহ}} অনুমোদিত:", "msu-upload-this": "এই ফাইল ডাউনলোড করুন", diff --git a/i18n/de.json b/i18n/de.json index e85d7f4..df0fabf 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -14,7 +14,6 @@ "msu-insert-image": "als Bild einfügen", "msu-insert-video": "Video einfügen", "msu-cancel-upload": "Upload abbrechen", - "msu-replace-file": "Datei ersetzen?", "msu-clean-all": "Liste leeren", "msu-ext-not-allowed": "Es {{PLURAL:$1|ist nur folgender Dateityp|sind nur folgende Dateitypen}} erlaubt:", "msu-upload-this": "Diese Datei hochladen", diff --git a/i18n/en.json b/i18n/en.json index 4daa2d7..0c2d2cc 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -15,7 +15,7 @@ "msu-insert-image": "Insert as image", "msu-insert-video": "Insert video", "msu-cancel-upload": "Cancel upload", - "msu-replace-file": "Replace file?", + "msu-continue": "¿Continue anyway?", "msu-clean-all": "Clear list", "msu-ext-not-allowed": "Only the following file {{PLURAL:$1|type is|types are}} allowed:", "msu-upload-this": "Upload this file", diff --git a/i18n/es.json b/i18n/es.json index 76e16ad..7f9a4ed 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -14,7 +14,7 @@ "msu-insert-image": "Insertar como imagen", "msu-insert-video": "Insertar vídeo", "msu-cancel-upload": "Cancelar la subida", - "msu-replace-file": "¿Reemplazar archivo?", + "msu-continue": "¿Continuar de todos modos?", "msu-clean-all": "Vaciar la lista", "msu-ext-not-allowed": "Sólo se {{PLURAL:$1|permite el siguiente tipo|permiten los siguientes tipos}} de archivos:", "msu-upload-this": "Subir este archivo", diff --git a/i18n/fr.json b/i18n/fr.json index 6b14298..22553eb 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -20,7 +20,6 @@ "msu-insert-image": "Insérer en tant qu’image", "msu-insert-video": "Insérer une vidéo", "msu-cancel-upload": "Annuler le téléversement", - "msu-replace-file": "Remplacer le fichier ?", "msu-clean-all": "Effacer la liste", "msu-ext-not-allowed": "Seulement {{PLURAL:$1|le type de fichier suivant est autorisé|les types de fichiers suivants sont autorisés}} :", "msu-upload-this": "Téléverser ce fichier", diff --git a/i18n/gl.json b/i18n/gl.json index 686e337..5779c92 100644 --- a/i18n/gl.json +++ b/i18n/gl.json @@ -13,7 +13,6 @@ "msu-insert-image": "Inserir como imaxe", "msu-insert-video": "Inserir vídeo", "msu-cancel-upload": "Cancelar a carga", - "msu-replace-file": "Reemprazar ficheiro?", "msu-clean-all": "Baleirar a lista", "msu-ext-not-allowed": "Só se {{PLURAL:$1|permite o seguinte tipo|permiten os seguintes tipos}} de ficheiros:", "msu-upload-this": "Subir este ficheiro", diff --git a/i18n/ja.json b/i18n/ja.json index cf3da1c..ec33c2c 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -15,7 +15,6 @@ "msu-insert-image": "画像として挿入", "msu-insert-video": "動画を挿入", "msu-cancel-upload": "アップロードをキャンセル", - "msu-replace-file": "ファイルを置き換えますか?", "msu-clean-all": "クリア", "msu-ext-not-allowed": "次の{{PLURAL:$1|形式|形式}}のファイルのみアップロードできます:", "msu-upload-this": "このファイルをアップロード", diff --git a/i18n/ko.json b/i18n/ko.json index c90ad24..0d49f0f 100644 --- a/i18n/ko.json +++ b/i18n/ko.json @@ -14,7 +14,6 @@ "msu-insert-image": "그림 넣기", "msu-insert-video": "동영상 넣기", "msu-cancel-upload": "올리기 취소", - "msu-replace-file": "파일을 대체할까요?", "msu-clean-all": "목록 비우기", "msu-ext-not-allowed": "다음 {{PLURAL:$1|형식의|형식의}} 파일만 허용됩니다:", "msu-upload-this": "이 파일 올리기", diff --git a/i18n/lb.json b/i18n/lb.json index 93363c7..7567ce0 100644 --- a/i18n/lb.json +++ b/i18n/lb.json @@ -13,7 +13,6 @@ "msu-insert-image": "Als Bild drasetzen", "msu-insert-video": "Video drasetzen", "msu-cancel-upload": "Eroplueden ofbriechen", - "msu-replace-file": "Fichier ersetzen!", "msu-clean-all": "Lëscht eidelmaachen", "msu-ext-not-allowed": "Nëmmen {{PLURAL:$1|dësen Typ vu Fichier ass|dës Type vu Fichiere sinn}} erlaabt:", "msu-upload-this": "Dëse Fichier eroplueden", diff --git a/i18n/mk.json b/i18n/mk.json index bd2f8c1..11f3222 100644 --- a/i18n/mk.json +++ b/i18n/mk.json @@ -13,7 +13,6 @@ "msu-insert-image": "Вметни како слика", "msu-insert-video": "Вметни видео", "msu-cancel-upload": "Откажи подигање", - "msu-replace-file": "Да ја заменам податотеката?", "msu-clean-all": "Исчисти список", "msu-ext-not-allowed": "{{PLURAL:$1|Допуштен е само следниов подтотечен тип|Допуштени се само следниве подтотечни типови}}:", "msu-upload-this": "Подигни ја податотекава", diff --git a/i18n/nl.json b/i18n/nl.json index 29ed628..ee4f19a 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -15,7 +15,6 @@ "msu-insert-image": "Voeg in als afbeelding", "msu-insert-video": "Video invoegen", "msu-cancel-upload": "Uploaden annuleren", - "msu-replace-file": "Bestand vervangen?", "msu-clean-all": "Lijst wissen", "msu-ext-not-allowed": "Alleen {{PLURAL:$1|het volgende bestandstype is|de volgende bestandstypen zijn}} toegestaan:", "msu-upload-this": "Dit bestand uploaden", diff --git a/i18n/pl.json b/i18n/pl.json index 68df984..89d14f9 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -13,7 +13,6 @@ "msu-insert-image": "Wstaw jako obrazek", "msu-insert-video": "Wstaw film", "msu-cancel-upload": "Anuluj przesyłanie", - "msu-replace-file": "Zamienić plik?", "msu-clean-all": "Wyczyść listę", "msu-ext-not-allowed": "{{PLURAL:$1|Dozwolony jest następujący typ pliku|Dozwolone są następujące typy plików}}:", "msu-upload-this": "Prześlij ten plik", diff --git a/i18n/pt-br.json b/i18n/pt-br.json index 0959ca4..7a098de 100644 --- a/i18n/pt-br.json +++ b/i18n/pt-br.json @@ -14,7 +14,6 @@ "msu-insert-image": "Inserir como imagem", "msu-insert-video": "Inserir vídeo", "msu-cancel-upload": "Cancelar upload", - "msu-replace-file": "Substituir arquivo?", "msu-clean-all": "Clear list", "msu-ext-not-allowed": "Somente {{PLURAL:$1|o seguinte tipo de arquivo é permitido|os seguintes tipos de arquivos são permitidos}}:", "msu-upload-this": "Enviar este arquivo", diff --git a/i18n/pt.json b/i18n/pt.json index 52a20cf..ae719ce 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -16,7 +16,6 @@ "msu-insert-image": "Inserir como imagem", "msu-insert-video": "Inserir vídeo", "msu-cancel-upload": "Cancelar carregamento", - "msu-replace-file": "Substituir ficheiro?", "msu-clean-all": "Limpar lista", "msu-ext-not-allowed": "Só {{PLURAL:$1|é permitido o seguinte tipo de ficheiro|são permitidos os seguintes tipos de ficheiro}}:", "msu-upload-this": "Carregar este ficheiro", diff --git a/i18n/qqq.json b/i18n/qqq.json index a0d9361..ca6d698 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -16,7 +16,7 @@ "msu-insert-image": "Button for inserting an image into the wikitext", "msu-insert-video": "Button for inserting a video", "msu-cancel-upload": "Button for canceling an upload", - "msu-replace-file": "Button for replacing a file", + "msu-continue": "Confirmation message before replacing a file or uploading a file with a similar name to an existing one", "msu-clean-all": "Button for clearing the list of uploaded files", "msu-ext-not-allowed": "Message that alerts the user that one or more of the selected files are of a forbidden type.\n$1 is the number of file types listed after this message. It is to used for PLURAL.", "msu-upload-this": "Button for uploading the selected file.", diff --git a/i18n/ru.json b/i18n/ru.json index 5a5ed1e..638a2d5 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -15,7 +15,6 @@ "msu-insert-image": "Вставить как изображение", "msu-insert-video": "Вставить видео", "msu-cancel-upload": "Отменить загрузку", - "msu-replace-file": "Заменить файл?", "msu-clean-all": "Clear list", "msu-ext-not-allowed": "Разрешен{{PLURAL:$1||ы}} только {{PLURAL:$1|следующий тип|следующие типы}} файлов:", "msu-upload-this": "Загрузить этот файл", diff --git a/i18n/sv.json b/i18n/sv.json index faad592..f862527 100644 --- a/i18n/sv.json +++ b/i18n/sv.json @@ -13,7 +13,6 @@ "msu-insert-image": "Infoga som bild", "msu-insert-video": "Infoga video", "msu-cancel-upload": "Avbryt uppladdning", - "msu-replace-file": "Ersätt fil?", "msu-clean-all": "Rensa lista", "msu-ext-not-allowed": "Endast följande {{PLURAL:$1|filtyp|filtyper}} tillåts:", "msu-upload-this": "Ladda upp denna fil", diff --git a/i18n/uk.json b/i18n/uk.json index d220848..c086848 100644 --- a/i18n/uk.json +++ b/i18n/uk.json @@ -14,7 +14,6 @@ "msu-insert-image": "Вставити як зображення", "msu-insert-video": "Вставити відео", "msu-cancel-upload": "Скасування завантаження", - "msu-replace-file": "Замінити файл?", "msu-clean-all": "Очистити список", "msu-ext-not-allowed": "Дозволено лише {{PLURAL:$1|такий тип|такі типи}} файлів:", "msu-upload-this": "Завантажити цей файл", diff --git a/i18n/zh-hans.json b/i18n/zh-hans.json index bb3d123..a9d363b 100644 --- a/i18n/zh-hans.json +++ b/i18n/zh-hans.json @@ -14,7 +14,6 @@ "msu-insert-image": "插入为图片", "msu-insert-video": "插入视频", "msu-cancel-upload": "取消上传", - "msu-replace-file": "替代文件?", "msu-clean-all": "清空列表", "msu-ext-not-allowed": "只允许以下文件{{PLURAL:$1|类型}}:", "msu-upload-this": "上传此文件", diff --git a/i18n/zh-hant.json b/i18n/zh-hant.json index 14e3c59..31ebab9 100644 --- a/i18n/zh-hant.json +++ b/i18n/zh-hant.json @@ -16,7 +16,6 @@ "msu-insert-image": "插入為圖片", "msu-insert-video": "插入影片", "msu-cancel-upload": "取消上傳", - "msu-replace-file": "取代檔案?", "msu-clean-all": "清空清單", "msu-ext-not-allowed": "只允許上傳下列{{PLURAL:$1|類型|類型}}檔案:", "msu-upload-this": "上傳此檔案", -- To view, visit https://gerrit.wikimedia.org/r/404157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6f7831aa79338285b25d7837f8207807ba52b7e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MsUpload Gerrit-Branch: master Gerrit-Owner: Sophivorus <scheno...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits