nexus/PairDrop
2
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2026-04-17 23:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix concatenation of translated strings in paste mode

Browse Source
This commit is contained in:
schlagmichdoch
2023-09-18 20:35:50 +02:00
parent 0bae7c84bd
commit dbe3381e7d
12 changed files with 84 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
public/scripts/ui.js
View File

@@ -259,27 +259,28 @@ class PeersUI {
_activatePasteMode(files, text) {
if (!window.pasteMode.activated && (files.length > 0 || text.length > 0)) {
let descriptor;
let noPeersMessage;
const openPairDrop = Localization.getTranslation("instructions.activate-paste-mode-base");
const andOtherFiles = Localization.getTranslation("instructions.activate-paste-mode-and-other-files", null, {count: files.length-1});
const sharedText = Localization.getTranslation("instructions.activate-paste-mode-shared-text");
const clickToSend = Localization.getTranslation("instructions.click-to-send")
const tapToSend = Localization.getTranslation("instructions.tap-to-send")
const openPairDrop = Localization.getTranslation("dialogs.activate-paste-mode-base");
const andOtherFiles = Localization.getTranslation("dialogs.activate-paste-mode-and-other-files", null, {count: files.length-1});
const sharedText = Localization.getTranslation("dialogs.activate-paste-mode-shared-text");
let descriptor;
if (files.length === 1) {
noPeersMessage = `${openPairDrop}<br><i>${files[0].name}</i>`;
descriptor = `<i>${files[0].name}</i>`;
} else if (files.length > 1) {
noPeersMessage = `${openPairDrop}<br><i>${files[0].name}</i> ${andOtherFiles}`;
descriptor = `<i>${files[0].name}</i><br>${andOtherFiles}`;
} else {
noPeersMessage = `${openPairDrop}<br>${sharedText}`;
descriptor = sharedText;
}
this.$xInstructions.querySelector('p').innerHTML = noPeersMessage;
this.$xInstructions.querySelector('p').innerHTML = `<i>${descriptor}</i>`;
this.$xInstructions.querySelector('p').style.display = 'block';
this.$xInstructions.setAttribute('desktop', Localization.getTranslation("instructions.click-to-send"));
this.$xInstructions.setAttribute('mobile', Localization.getTranslation("instructions.tap-to-send"));
this.$xInstructions.setAttribute('desktop', clickToSend);
this.$xInstructions.setAttribute('mobile', tapToSend);
this.$xNoPeers.querySelector('h2').innerHTML = noPeersMessage;
this.$xNoPeers.querySelector('h2').innerHTML = `${openPairDrop}<br>${descriptor}`;
const _callback = (e) => this._sendClipboardData(e, files, text);
Events.on('paste-pointerdown', _callback);