mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-21 15:26:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix public room badge not translating correctly when switching languages

Browse source
This commit is contained in:
schlagmichdoch 2023-09-14 20:06:17 +02:00
parent a314b2c275
commit 3f1477f24a
6 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/index.html
View file

@ -134,7 +134,7 @@
<div class="row center">
<span class="badge badge-room-ip" data-i18n-key="footer.on-this-network" data-i18n-attrs="text title">on this network</span>
<span class="badge badge-room-secret pointer" data-i18n-key="footer.paired-devices" data-i18n-attrs="text title" hidden>paired devices</span>
<span class="badge badge-room-public-id pointer" data-i18n-key="footer.public-room-devices" data-i18n-attrs="text title" hidden>in room IAIAI</span>
<span class="badge badge-room-public-id pointer" data-i18n-key="footer.public-room-devices" data-i18n-attrs="title" hidden>in room IAIAI</span>
</div>
</div>
</div>

4
public/scripts/localization.js
View file

@ -16,7 +16,7 @@ class Localization {
Localization.setTranslation(Localization.initialLocale)
.then(_ => {
console.log("Initial translation successful.");
Events.fire("translation-loaded");
Events.fire("initial-translation-loaded");
});
}
@ -38,6 +38,8 @@ class Localization {
`System language: ${Localization.systemLocale}`,
`Selected language: ${locale}`
);
Events.fire("translation-loaded");
}
static async setLocale(newLocale) {

20
public/scripts/ui.js
View file

@ -1517,6 +1517,7 @@ class PublicRoomDialog extends Dialog {
this.evaluateUrlAttributes();
Events.on('ws-connected', _ => this._onWsConnected());
Events.on('translation-loaded', _ => this.setFooterBadge());
}
_onKeyDown(e) {
@ -1554,6 +1555,8 @@ class PublicRoomDialog extends Dialog {
}
setIdAndQrCode() {
if (!this.roomId) return;
this.$key.innerText = this.roomId.toUpperCase();
// Display the QR code for the url
@ -1569,10 +1572,17 @@ class PublicRoomDialog extends Dialog {
});
this.$qrCode.innerHTML = qr.svg();
this.setFooterBadge();
}
setFooterBadge() {
if (!this.roomId) return;
this.$footerInstructionsPublicRoomDevices.innerText = Localization.getTranslation("footer.public-room-devices", null, {
roomId: this.roomId.toUpperCase()
});
this.$footerInstructionsPublicRoomDevices.removeAttribute('hidden');
super.evaluateFooterBadges();
}
@ -1597,7 +1607,7 @@ class PublicRoomDialog extends Dialog {
if (!roomId) return;
this.roomId = roomId;
this.setIdAndQrCode(roomId);
this.setIdAndQrCode();
this._joinPublicRoom(roomId, true);
}
@ -1649,7 +1659,7 @@ class PublicRoomDialog extends Dialog {
if (isJoinedRoomId) {
this.roomId = roomId;
this.roomIdJoin = false;
this.setIdAndQrCode(roomId);
this.setIdAndQrCode();
}
}
@ -1700,7 +1710,7 @@ class SendTextDialog extends Dialog {
this.$submit = this.$el.querySelector('button[type="submit"]');
this.$form.addEventListener('submit', e => this._onSubmit(e));
this.$text.addEventListener('input', e => this._onChange(e));
Events.on("keydown", e => this._onKeyDown(e));
Events.on('keydown', e => this._onKeyDown(e));
}
async _onKeyDown(e) {
@ -1769,7 +1779,7 @@ class ReceiveTextDialog extends Dialog {
this.$copy.addEventListener('click', _ => this._onCopy());
this.$close.addEventListener('click', _ => this.hide());
Events.on("keydown", e => this._onKeyDown(e));
Events.on('keydown', e => this._onKeyDown(e));
this.$displayName = this.$el.querySelector('.display-name');
this._receiveTextQueue = [];
@ -2643,7 +2653,7 @@ class BrowserTabsConnector {
class PairDrop {
constructor() {
Events.on('translation-loaded', _ => {
Events.on('initial-translation-loaded', _ => {
const server = new ServerConnection();
const peers = new PeersManager(server);
const peersUI = new PeersUI();

2
public_included_ws_fallback/index.html
View file

@ -139,7 +139,7 @@
<div class="row center">
<span class="badge badge-room-ip" data-i18n-key="footer.on-this-network" data-i18n-attrs="text title">on this network</span>
<span class="badge badge-room-secret pointer" data-i18n-key="footer.paired-devices" data-i18n-attrs="text title" hidden>paired devices</span>
<span class="badge badge-room-public-id pointer" data-i18n-key="footer.public-room-devices" data-i18n-attrs="text title" hidden>in room IAIAI</span>
<span class="badge badge-room-public-id pointer" data-i18n-key="footer.public-room-devices" data-i18n-attrs="title" hidden>in room IAIAI</span>
</div>
</div>
</div>

4
public_included_ws_fallback/scripts/localization.js
View file

@ -16,7 +16,7 @@ class Localization {
Localization.setTranslation(Localization.initialLocale)
.then(_ => {
console.log("Initial translation successful.");
Events.fire("translation-loaded");
Events.fire("initial-translation-loaded");
});
}
@ -38,6 +38,8 @@ class Localization {
`System language: ${Localization.systemLocale}`,
`Selected language: ${locale}`
);
Events.fire("translation-loaded");
}
static async setLocale(newLocale) {

20
public_included_ws_fallback/scripts/ui.js
View file

@ -1519,6 +1519,7 @@ class PublicRoomDialog extends Dialog {
this.evaluateUrlAttributes();
Events.on('ws-connected', _ => this._onWsConnected());
Events.on('translation-loaded', _ => this.setFooterBadge());
}
_onKeyDown(e) {
@ -1556,6 +1557,8 @@ class PublicRoomDialog extends Dialog {
}
setIdAndQrCode() {
if (!this.roomId) return;
this.$key.innerText = this.roomId.toUpperCase();
// Display the QR code for the url
@ -1571,10 +1574,17 @@ class PublicRoomDialog extends Dialog {
});
this.$qrCode.innerHTML = qr.svg();
this.setFooterBadge();
}
setFooterBadge() {
if (!this.roomId) return;
this.$footerInstructionsPublicRoomDevices.innerText = Localization.getTranslation("footer.public-room-devices", null, {
roomId: this.roomId.toUpperCase()
});
this.$footerInstructionsPublicRoomDevices.removeAttribute('hidden');
super.evaluateFooterBadges();
}
@ -1599,7 +1609,7 @@ class PublicRoomDialog extends Dialog {
if (!roomId) return;
this.roomId = roomId;
this.setIdAndQrCode(roomId);
this.setIdAndQrCode();
this._joinPublicRoom(roomId, true);
}
@ -1651,7 +1661,7 @@ class PublicRoomDialog extends Dialog {
if (isJoinedRoomId) {
this.roomId = roomId;
this.roomIdJoin = false;
this.setIdAndQrCode(roomId);
this.setIdAndQrCode();
}
}
@ -1702,7 +1712,7 @@ class SendTextDialog extends Dialog {
this.$submit = this.$el.querySelector('button[type="submit"]');
this.$form.addEventListener('submit', e => this._onSubmit(e));
this.$text.addEventListener('input', e => this._onChange(e));
Events.on("keydown", e => this._onKeyDown(e));
Events.on('keydown', e => this._onKeyDown(e));
}
async _onKeyDown(e) {
@ -1771,7 +1781,7 @@ class ReceiveTextDialog extends Dialog {
this.$copy.addEventListener('click', _ => this._onCopy());
this.$close.addEventListener('click', _ => this.hide());
Events.on("keydown", e => this._onKeyDown(e));
Events.on('keydown', e => this._onKeyDown(e));
this.$displayName = this.$el.querySelector('.display-name');
this._receiveTextQueue = [];
@ -2645,7 +2655,7 @@ class BrowserTabsConnector {
class PairDrop {
constructor() {
Events.on('translation-loaded', _ => {
Events.on('initial-translation-loaded', _ => {
const server = new ServerConnection();
const peers = new PeersManager(server);
const peersUI = new PeersUI();