Merge remote-tracking branch 'upstream/main'

zjjhot · zjjhot · commit bf611b146d83 · 2022-06-29T10:23:54.000+08:00
* upstream/main: [skip ci] Updated translations via Crowdin Enable spellcheck for EasyMDE, use contenteditable mode (go-gitea#19776)
diff --git a/options/locale/locale_cs-CZ.ini b/options/locale/locale_cs-CZ.ini
@@ -46,7 +46,6 @@ webauthn_error_unable_to_process=Server nemohl zpracovat váš požadavek.
 webauthn_error_duplicated=Zabezpečovací klíč není pro tento požadavek povolen. Prosím ujistěte se, zda klíč není již registrován.
 webauthn_error_empty=Musíte nastavit název tohoto klíče.
 webauthn_error_timeout=Požadavek vypršel dříve, než se podařilo přečíst váš klíč. Znovu načtěte tuto stránku a akci opakujte.
-webauthn_u2f_deprecated=Klíč: „%s“ autentifikuje pomocí zastaralého procesu U2F. Měli byste znovu zaregistrovat tento klíč a zrušit starou registraci.
 webauthn_reload=Znovu načíst
 
 repository=Repozitář
diff --git a/options/locale/locale_de-DE.ini b/options/locale/locale_de-DE.ini
@@ -47,7 +47,6 @@ webauthn_error_unable_to_process=Der Server konnte deine Anfrage nicht bearbeite
 webauthn_error_duplicated=Für diese Anfrage ist der Sicherheitsschlüssel nicht erlaubt. Bitte stell sicher, dass er nicht bereits registriert ist.
 webauthn_error_empty=Du musst einen Namen für diesen Schlüssel festlegen.
 webauthn_error_timeout=Das Zeitlimit wurde erreicht, bevor dein Schlüssel gelesen werden konnte. Bitte lade die Seite erneut.
-webauthn_u2f_deprecated=Der Schlüssel: '%s' authentifiziert sich über den veralteten U2F-Prozess. Bitte registriere den Schlüssel neu und lösche die alte Registrierung.
 webauthn_reload=Neu laden
 
 repository=Repository
@@ -1516,7 +1515,7 @@ pulls.tab_conversation=Diskussion
 pulls.tab_commits=Commits
 pulls.tab_files=Geänderte Dateien
 pulls.reopen_to_merge=Bitte diesen Pull-Request wieder öffnen, um zu mergen.
-pulls.cant_reopen_deleted_branch=Dieser Pull-Request kann nicht wieder geöffnet werden, da die Branche bereits gelöscht wurde.
+pulls.cant_reopen_deleted_branch=Dieser Pull-Request kann nicht wieder geöffnet werden, da die Branch bereits gelöscht wurde.
 pulls.merged=Zusammengeführt
 pulls.merged_as=Der Pull Request wurde als <a rel="nofollow" class="ui sha" href="%[1]s"><code>%[2]s</code></a> gemergt.
 pulls.manually_merged=Manuell gemergt
diff --git a/options/locale/locale_el-GR.ini b/options/locale/locale_el-GR.ini
@@ -47,7 +47,6 @@ webauthn_error_unable_to_process=Ο διακομιστής δεν μπόρεσε
 webauthn_error_duplicated=Το κλειδί ασφαλείας δεν επιτρέπεται για αυτό το αίτημα. Βεβαιωθείτε ότι το κλειδί δεν έχει ήδη καταχωρηθεί.
 webauthn_error_empty=Πρέπει να ορίσετε ένα όνομα για αυτό το κλειδί.
 webauthn_error_timeout=Το χρονικό όριο έφτασε πριν το κλειδί να διαβαστεί. Παρακαλώ ανανεώστε τη σελίδα και προσπαθήστε ξανά.
-webauthn_u2f_deprecated=Το κλειδί: '%s' πιστοποιεί χρησιμοποιώντας το παρωχημένο πρωτόκολλο U2F. Θα πρέπει να καταχωρήσετε ξανά αυτό το κλειδί και να καταργήσετε την παλιά εγγραφή.
 webauthn_reload=Ανανέωση
 
 repository=Αποθετήριο
@@ -1276,7 +1275,7 @@ issues.filter_sort=Ταξινόμηση
 issues.filter_sort.latest=Νεότερα
 issues.filter_sort.oldest=Παλαιότερα
 issues.filter_sort.recentupdate=Ενημερώθηκαν πρόσφατα
-issues.filter_sort.leastupdate=Λιγότερο πρόσφατα ανανεωμένο
+issues.filter_sort.leastupdate=Ενημερώθηκαν παλαιότερα
 issues.filter_sort.mostcomment=Περισσότερο σχολιασμένα
 issues.filter_sort.leastcomment=Λιγότερο σχολιασμένα
 issues.filter_sort.nearduedate=Πλησιέστερη παράδοση
diff --git a/options/locale/locale_es-ES.ini b/options/locale/locale_es-ES.ini
@@ -47,7 +47,6 @@ webauthn_error_unable_to_process=El servidor no pudo procesar su solicitud.
 webauthn_error_duplicated=La clave de seguridad no está permitida para esta solicitud. Por favor, asegúrese de que la clave no está ya registrada.
 webauthn_error_empty=Debe establecer un nombre para esta clave.
 webauthn_error_timeout=Tiempo de espera máximo alcanzado antes de que su clave pudiese ser leída. Por favor, cargue la página y vuelva a intentarlo.
-webauthn_u2f_deprecated=La clave: '%s' se autentifica usando el proceso U2F obsoleto. Debe volver a registrar esta clave y eliminar el registro antiguo.
 webauthn_reload=Recargar
 
 repository=Repositorio
@@ -1610,6 +1609,8 @@ pulls.auto_merge_canceled_schedule=Fusión automaticá estaba cancellada para es
 pulls.auto_merge_newly_scheduled_comment=`programó este Pull Request para fusionar automática cuando todas las comprobaciones tengan éxito %[1]s`
 pulls.auto_merge_canceled_schedule_comment=`canceló la fusión automática de este Pull Request %[1]s`
 
+pulls.delete.title=¿Borrar este pull request?
+pulls.delete.text=¿Realmente quieres eliminar esta pull request? (Esto eliminará permanentemente todo el contenido. Considera cerrarlo si simplemente deseas archivarlo)
 
 milestones.new=Nuevo hito
 milestones.closed=Cerrada %s
diff --git a/options/locale/locale_is-IS.ini b/options/locale/locale_is-IS.ini
@@ -46,7 +46,6 @@ webauthn_error_unable_to_process=Netþjónninn gat ekki ráðið við beiðni þ
 webauthn_error_duplicated=Öryggislykillinn er ekki leyfður fyrir þessa beiðni. Gakktu úr skugga um að lykillinn sé ekki þegar skráður.
 webauthn_error_empty=Þú verður að setja nafn fyrir þennan lykil.
 webauthn_error_timeout=Tímamörk náð áður en hægt var að lesa lykilinn þinn. Vinsamlegast endurhlaðið þessa síðu og reyndu aftur.
-webauthn_u2f_deprecated=Lykillinn: „%s“ auðkennir með því að nota úrelta U2F aðferð. Þú ættir að endurskrá þennan lykil og fjarlægja gömlu skráninguna.
 webauthn_reload=Endurhlaða
 
 repository=Hugbúnaðarsafn
diff --git a/options/locale/locale_ja-JP.ini b/options/locale/locale_ja-JP.ini
@@ -47,7 +47,6 @@ webauthn_error_unable_to_process=サーバーがリクエストを処理でき
 webauthn_error_duplicated=このリクエストに対しては、許可されていないセキュリティキーです。 キーが未登録であることを確認してください。
 webauthn_error_empty=このキーに名前を設定する必要があります。
 webauthn_error_timeout=キーを読み取る前にタイムアウトになりました。 このページをリロードしてもう一度やり直してください。
-webauthn_u2f_deprecated=キー: '%s' は非推奨のU2Fプロセスを使用して認証しています。このキーを再登録して古い登録を削除したほうが良いでしょう。
 webauthn_reload=リロード
 
 repository=リポジトリ
diff --git a/options/locale/locale_lv-LV.ini b/options/locale/locale_lv-LV.ini
@@ -47,7 +47,6 @@ webauthn_error_unable_to_process=Serveris nevar apstrādāt Jūsu pieprasījumu.
 webauthn_error_duplicated=Drošības atslēga nav atļauta šim pieprasījumam. Pārliecinieties, ka šī atslēga jau nav reģistrēta.
 webauthn_error_empty=Norādiet atslēgas nosaukumu.
 webauthn_error_timeout=Iestājusies noildze, mēģinot, nolasīt atslēgu. Pārlādējiet lapu un mēģiniet vēlreiz.
-webauthn_u2f_deprecated=Atslēga '%s' izmanto novecojušu U2F procesu. Noņemiet iepriekšējo reģistrāciju un veiciet reģistrācijas procesu no jauna.
 webauthn_reload=Pārlādēt
 
 repository=Repozitorijs
diff --git a/options/locale/locale_pl-PL.ini b/options/locale/locale_pl-PL.ini
@@ -46,7 +46,6 @@ webauthn_error_unable_to_process=Serwer nie mógł obsłużyć Twojego żądania
 webauthn_error_duplicated=Klucz bezpieczeństwa nie jest dozwolony dla tego żądania. Upewnij się, że klucz nie jest już zarejestrowany.
 webauthn_error_empty=Musisz ustawić nazwę dla tego klucza.
 webauthn_error_timeout=Osiągnięto limit czasu zanim Twój klucz może zostać odczytany. Odśwież stronę i spróbuj ponownie.
-webauthn_u2f_deprecated=Klucz '%s' uwierzytelnia przy użyciu przestarzałego procesu U2F. Powinieneś ponownie zarejestrować ten klucz i usunąć starą rejestrację.
 webauthn_reload=Odśwież
 
 repository=Repozytorium
diff --git a/options/locale/locale_pt-BR.ini b/options/locale/locale_pt-BR.ini
@@ -46,7 +46,6 @@ webauthn_error_unable_to_process=O servidor não pôde processar sua solicitaç
 webauthn_error_duplicated=A chave de segurança não é permitida para esta solicitação. Por favor, certifique-se que a chave já não está registrada.
 webauthn_error_empty=Você deve definir um nome para esta chave.
 webauthn_error_timeout=Tempo limite atingido antes de sua chave poder ser lida. Por favor, recarregue esta página e tente novamente.
-webauthn_u2f_deprecated=A chave: '%s' autentica utilizando o processo U2F descontinuado. Você deve registrar novamente esta chave e remover o registro antigo.
 webauthn_reload=Recarregar
 
 repository=Repositório
diff --git a/options/locale/locale_pt-PT.ini b/options/locale/locale_pt-PT.ini
@@ -47,7 +47,6 @@ webauthn_error_unable_to_process=O servidor não conseguiu processar o seu pedid
 webauthn_error_duplicated=A chave de segurança não é permitida neste pedido. Certifique-se de que a chave não está já registada.
 webauthn_error_empty=Você tem que definir um nome para esta chave.
 webauthn_error_timeout=O tempo limite foi atingido antes que a sua chave pudesse ser lida. Recarregue esta página e tente novamente.
-webauthn_u2f_deprecated=A chave: '%s' autentica usando o processo U2F, mas este foi descontinuado. Você deveria registar novamente esta chave e remover o registo antigo.
 webauthn_reload=Recarregar
 
 repository=Repositório
diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini
@@ -47,7 +47,6 @@ webauthn_error_unable_to_process=服务器无法处理您的请求。
 webauthn_error_duplicated=此安全密钥未被许可用于这个请求。请确保该密钥尚未注册。
 webauthn_error_empty=您必须为此密钥设置一个名称。
 webauthn_error_timeout=未能在允许的时限内读取密钥。请重新加载此页面并重试。
-webauthn_u2f_deprecated=密钥 '%s' 使用的是已经废弃的 U2F 进行身份验证。您应该重新注册此密钥并删除旧的注册。
 webauthn_reload=重新加载
 
 repository=仓库
diff --git a/options/locale/locale_zh-TW.ini b/options/locale/locale_zh-TW.ini
@@ -47,7 +47,6 @@ webauthn_error_unable_to_process=伺服器無法執行您的請求。
 webauthn_error_duplicated=此請求不允許使用這個安全金鑰。請確保該金鑰尚未註冊。
 webauthn_error_empty=您必須命名此金鑰。
 webauthn_error_timeout=在成功讀取金鑰之前已逾時，請重新載入此頁面並重試。
-webauthn_u2f_deprecated=「%s」金鑰使用已廢棄的 U2F 流程進行驗證。您應該重新註冊此金鑰並將先前註冊的移除。
 webauthn_reload=重新載入
 
 repository=儲存庫
diff --git a/web_src/js/features/comp/EasyMDE.js b/web_src/js/features/comp/EasyMDE.js
@@ -38,6 +38,8 @@ export async function createCommentEasyMDE(textarea, easyMDEOptions = {}) {
     indentWithTabs: false,
     tabSize: 4,
     spellChecker: false,
+    inputStyle: 'contenteditable', // nativeSpellcheck requires contenteditable
+    nativeSpellcheck: true,
     toolbar: ['bold', 'italic', 'strikethrough', '|',
       'heading-1', 'heading-2', 'heading-3', 'heading-bigger', 'heading-smaller', '|',
       'code', 'quote', '|', {
diff --git a/web_src/js/features/comp/ImagePaste.js b/web_src/js/features/comp/ImagePaste.js
@@ -1,4 +1,5 @@
 import $ from 'jquery';
+
 const {csrfToken} = window.config;
 
 async function uploadFile(file, uploadUrl) {
@@ -21,72 +22,104 @@ function clipboardPastedImages(e) {
     if (!item.type || !item.type.startsWith('image/')) continue;
     files.push(item.getAsFile());
   }
-
-  if (files.length) {
-    e.preventDefault();
-    e.stopPropagation();
-  }
   return files;
 }
 
+class TextareaEditor {
+  constructor(editor) {
+    this.editor = editor;
+  }
 
-function insertAtCursor(field, value) {
-  if (field.selectionStart || field.selectionStart === 0) {
-    const startPos = field.selectionStart;
-    const endPos = field.selectionEnd;
-    field.value = field.value.substring(0, startPos) + value + field.value.substring(endPos, field.value.length);
-    field.selectionStart = startPos + value.length;
-    field.selectionEnd = startPos + value.length;
-  } else {
-    field.value += value;
+  insertPlaceholder(value) {
+    const editor = this.editor;
+    const startPos = editor.selectionStart;
+    const endPos = editor.selectionEnd;
+    editor.value = editor.value.substring(0, startPos) + value + editor.value.substring(endPos);
+    editor.selectionStart = startPos;
+    editor.selectionEnd = startPos + value.length;
+    editor.focus();
+  }
+
+  replacePlaceholder(oldVal, newVal) {
+    const editor = this.editor;
+    const startPos = editor.selectionStart;
+    const endPos = editor.selectionEnd;
+    if (editor.value.substring(startPos, endPos) === oldVal) {
+      editor.value = editor.value.substring(0, startPos) + newVal + editor.value.substring(endPos);
+      editor.selectionEnd = startPos + newVal.length;
+    } else {
+      editor.value = editor.value.replace(oldVal, newVal);
+      editor.selectionEnd -= oldVal.length;
+      editor.selectionEnd += newVal.length;
+    }
+    editor.selectionStart = editor.selectionEnd;
+    editor.focus();
   }
 }
 
-function replaceAndKeepCursor(field, oldval, newval) {
-  if (field.selectionStart || field.selectionStart === 0) {
-    const startPos = field.selectionStart;
-    const endPos = field.selectionEnd;
-    field.value = field.value.replace(oldval, newval);
-    field.selectionStart = startPos + newval.length - oldval.length;
-    field.selectionEnd = endPos + newval.length - oldval.length;
-  } else {
-    field.value = field.value.replace(oldval, newval);
+class CodeMirrorEditor {
+  constructor(editor) {
+    this.editor = editor;
+  }
+
+  insertPlaceholder(value) {
+    const editor = this.editor;
+    const startPoint = editor.getCursor('start');
+    const endPoint = editor.getCursor('end');
+    editor.replaceSelection(value);
+    endPoint.ch = startPoint.ch + value.length;
+    editor.setSelection(startPoint, endPoint);
+    editor.focus();
+  }
+
+  replacePlaceholder(oldVal, newVal) {
+    const editor = this.editor;
+    const endPoint = editor.getCursor('end');
+    if (editor.getSelection() === oldVal) {
+      editor.replaceSelection(newVal);
+    } else {
+      editor.setValue(editor.getValue().replace(oldVal, newVal));
+    }
+    endPoint.ch -= oldVal.length;
+    endPoint.ch += newVal.length;
+    editor.setSelection(endPoint, endPoint);
+    editor.focus();
   }
 }
 
-export function initCompImagePaste($target) {
-  $target.each(function () {
-    const dropzone = this.querySelector('.dropzone');
-    if (!dropzone) {
+
+export function initEasyMDEImagePaste(easyMDE, $dropzone) {
+  const uploadUrl = $dropzone.attr('data-upload-url');
+  const $files = $dropzone.find('.files');
+
+  if (!uploadUrl || !$files.length) return;
+
+  const uploadClipboardImage = async (editor, e) => {
+    const pastedImages = clipboardPastedImages(e);
+    if (!pastedImages || pastedImages.length === 0) {
       return;
     }
-    const uploadUrl = dropzone.getAttribute('data-upload-url');
-    const dropzoneFiles = dropzone.querySelector('.files');
-    for (const textarea of this.querySelectorAll('textarea')) {
-      textarea.addEventListener('paste', async (e) => {
-        for (const img of clipboardPastedImages(e)) {
-          const name = img.name.slice(0, img.name.lastIndexOf('.'));
-          insertAtCursor(textarea, `![${name}]()`);
-          const data = await uploadFile(img, uploadUrl);
-          replaceAndKeepCursor(textarea, `![${name}]()`, `![${name}](/attachments/${data.uuid})`);
-          const input = $(`<input id="${data.uuid}" name="files" type="hidden">`).val(data.uuid);
-          dropzoneFiles.appendChild(input[0]);
-        }
-      }, false);
-    }
-  });
-}
+    e.preventDefault();
+    e.stopPropagation();
 
-export function initEasyMDEImagePaste(easyMDE, dropzone, files) {
-  const uploadUrl = dropzone.getAttribute('data-upload-url');
-  easyMDE.codemirror.on('paste', async (_, e) => {
-    for (const img of clipboardPastedImages(e)) {
+    for (const img of pastedImages) {
       const name = img.name.slice(0, img.name.lastIndexOf('.'));
+
+      const placeholder = `![${name}](uploading ...)`;
+      editor.insertPlaceholder(placeholder);
       const data = await uploadFile(img, uploadUrl);
-      const pos = easyMDE.codemirror.getCursor();
-      easyMDE.codemirror.replaceRange(`![${name}](/attachments/${data.uuid})`, pos);
-      const input = $(`<input id="${data.uuid}" name="files" type="hidden">`).val(data.uuid);
-      files.append(input);
+      editor.replacePlaceholder(placeholder, `![${name}](/attachments/${data.uuid})`);
+
+      const $input = $(`<input name="files" type="hidden">`).attr('id', data.uuid).val(data.uuid);
+      $files.append($input);
     }
+  };
+
+  easyMDE.codemirror.on('paste', async (_, e) => {
+    return uploadClipboardImage(new CodeMirrorEditor(easyMDE.codemirror), e);
+  });
+
+  $(easyMDE.element).on('paste', async (e) => {
+    return uploadClipboardImage(new TextareaEditor(easyMDE.element), e.originalEvent);
   });
 }
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
@@ -2,7 +2,7 @@ import $ from 'jquery';
 import {htmlEscape} from 'escape-goat';
 import attachTribute from './tribute.js';
 import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js';
-import {initCompImagePaste} from './comp/ImagePaste.js';
+import {initEasyMDEImagePaste} from './comp/ImagePaste.js';
 import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
 
 const {appSubUrl, csrfToken} = window.config;
@@ -480,8 +480,9 @@ export function initRepoPullRequestReview() {
       // the editor's height is too large in some cases, and the panel cannot be scrolled with page now because there is `.repository .diff-detail-box.sticky { position: sticky; }`
       // the temporary solution is to make the editor's height smaller (about 4 lines). GitHub also only show 4 lines for default. We can improve the UI (including Dropzone area) in future
       // EasyMDE's options can not handle minHeight & maxHeight together correctly, we have to set max-height for .CodeMirror-scroll in CSS.
-      await createCommentEasyMDE($reviewBox.find('textarea'), {minHeight: '80px'});
-      initCompImagePaste($reviewBox);
+      const $reviewTextarea = $reviewBox.find('textarea');
+      const easyMDE = await createCommentEasyMDE($reviewTextarea, {minHeight: '80px'});
+      initEasyMDEImagePaste(easyMDE, $reviewBox.find('.dropzone'));
     })();
   }
 
diff --git a/web_src/js/features/repo-legacy.js b/web_src/js/features/repo-legacy.js
@@ -1,7 +1,7 @@
 import $ from 'jquery';
 import {createCommentEasyMDE, getAttachedEasyMDE} from './comp/EasyMDE.js';
 import {initCompMarkupContentPreviewTab} from './comp/MarkupContentPreview.js';
-import {initCompImagePaste, initEasyMDEImagePaste} from './comp/ImagePaste.js';
+import {initEasyMDEImagePaste} from './comp/ImagePaste.js';
 import {
   initRepoIssueBranchSelect, initRepoIssueCodeCommentCancel,
   initRepoIssueCommentDelete,
@@ -33,7 +33,8 @@ import initRepoPullRequestMergeForm from './repo-issue-pr-form.js';
 const {csrfToken} = window.config;
 
 export function initRepoCommentForm() {
-  if ($('.comment.form').length === 0) {
+  const $commentForm = $('.comment.form');
+  if ($commentForm.length === 0) {
     return;
   }
 
@@ -67,12 +68,13 @@ export function initRepoCommentForm() {
   }
 
   (async () => {
-    await createCommentEasyMDE($('.comment.form textarea:not(.review-textarea)'));
-    initCompImagePaste($('.comment.form'));
+    const $textarea = $commentForm.find('textarea:not(.review-textarea)');
+    const easyMDE = await createCommentEasyMDE($textarea);
+    initEasyMDEImagePaste(easyMDE, $commentForm.find('.dropzone'));
   })();
 
   initBranchSelector();
-  initCompMarkupContentPreviewTab($('.comment.form'));
+  initCompMarkupContentPreviewTab($commentForm);
 
   // List submits
   function initListSubmits(selector, outerSelector) {
@@ -352,9 +354,7 @@ async function onEditContent(event) {
     easyMDE = await createCommentEasyMDE($textarea);
 
     initCompMarkupContentPreviewTab($editContentForm);
-    if ($dropzone.length === 1) {
-      initEasyMDEImagePaste(easyMDE, $dropzone[0], $dropzone.find('.files'));
-    }
+    initEasyMDEImagePaste(easyMDE, $dropzone);
 
     const $saveButton = $editContentZone.find('.save.button');
     $textarea.on('ce-quick-submit', () => {
diff --git a/web_src/js/features/repo-release.js b/web_src/js/features/repo-release.js
@@ -23,10 +23,9 @@ export function initRepoReleaseEditor() {
   (async () => {
     const $textarea = $editor.find('textarea');
     await attachTribute($textarea.get(), {mentions: false, emoji: true});
-    const $files = $editor.parent().find('.files');
     const easyMDE = await createCommentEasyMDE($textarea);
     initCompMarkupContentPreviewTab($editor);
-    const dropzone = $editor.parent().find('.dropzone')[0];
-    initEasyMDEImagePaste(easyMDE, dropzone, $files);
+    const $dropzone = $editor.parent().find('.dropzone');
+    initEasyMDEImagePaste(easyMDE, $dropzone);
   })();
 }
diff --git a/web_src/js/features/repo-wiki.js b/web_src/js/features/repo-wiki.js
