From 085a309f5e83dbfc72fdc5c1bac68745cb58a798 Mon Sep 17 00:00:00 2001 From: Tuomas Hietala Date: Mon, 28 Oct 2019 14:26:34 +0000 Subject: [PATCH 01/16] Translated using Weblate (Finnish) Currently translated at 97.9% (1810 of 1849 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/ --- src/i18n/strings/fi.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index 757f9a0337..406ddf1b47 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -2108,5 +2108,10 @@ "%(creator)s created and configured the room.": "%(creator)s loi ja määritti huoneen.", "Jump to first unread room.": "Siirry ensimmäiseen lukemattomaan huoneeseen.", "Jump to first invite.": "Siirry ensimmäiseen kutsuun.", - "DuckDuckGo Results": "DuckDuckGo-tulokset" + "DuckDuckGo Results": "DuckDuckGo-tulokset", + "A text message has been sent to +%(msisdn)s. Please enter the verification code it contains.": "Tekstiviesti on lähetetty numeroon +%(msisdn)s. Syötä siinä oleva varmistuskoodi.", + "Failed to deactivate user": "Käyttäjän deaktivointi epäonnistui", + "Hide advanced": "Piilota edistyneet", + "Show advanced": "Näytä edistyneet", + "Document": "Asiakirja" } From 566efc236ec2ff0cc43f6d18528c565698ae5e01 Mon Sep 17 00:00:00 2001 From: Tuomas Hietala Date: Mon, 28 Oct 2019 14:38:01 +0000 Subject: [PATCH 02/16] Translated using Weblate (Finnish) Currently translated at 98.3% (1816 of 1848 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fi/ --- src/i18n/strings/fi.json | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json index 406ddf1b47..5331bdb5c8 100644 --- a/src/i18n/strings/fi.json +++ b/src/i18n/strings/fi.json @@ -2113,5 +2113,13 @@ "Failed to deactivate user": "Käyttäjän deaktivointi epäonnistui", "Hide advanced": "Piilota edistyneet", "Show advanced": "Näytä edistyneet", - "Document": "Asiakirja" + "Document": "Asiakirja", + "Missing captcha public key in homeserver configuration. Please report this to your homeserver administrator.": "Captchan julkinen avain puuttuu kotipalvelimen asetuksista. Ilmoita tämä kotipalvelimesi ylläpitäjälle.", + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Identiteettipalvelinta ei ole määritetty, joten et voi lisätä sähköpostiosoitetta palauttaaksesi salasanasi vastaisuudessa.", + "Command Autocomplete": "Komentojen automaattinen täydennys", + "Community Autocomplete": "Yhteisöjen automaattinen täydennys", + "Emoji Autocomplete": "Emojien automaattinen täydennys", + "Notification Autocomplete": "Ilmoitusten automaattinen täydennys", + "Room Autocomplete": "Huoneiden automaattinen täydennys", + "User Autocomplete": "Käyttäjien automaattinen täydennys" } From bf93635267f00f83a6e396753df3fd98f67885c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=ED=83=9C=EC=84=AD?= Date: Mon, 28 Oct 2019 16:19:52 +0000 Subject: [PATCH 03/16] Translated using Weblate (Korean) Currently translated at 100.0% (1848 of 1848 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/ --- src/i18n/strings/ko.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index 7aa907708a..c988760e1e 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -2116,5 +2116,6 @@ "Jump to first unread room.": "읽지 않은 첫 방으로 건너뜁니다.", "Jump to first invite.": "첫 초대로 건너뜁니다.", "Room %(name)s": "%(name)s 방", - "Recent rooms": "최근 방" + "Recent rooms": "최근 방", + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "설정된 ID 서버가 없어서 이후 비밀번호를 초기화하기 위한 이메일 주소를 추가할 수 없습니다." } From 98096d206b197002136e3bfeb3986b9185a7a7ae Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 29 Oct 2019 16:34:56 +0000 Subject: [PATCH 04/16] Fix missing i18n for RoomTile ARIA labels and +a case for notif-off bold --- src/components/views/rooms/RoomTile.js | 2 ++ src/i18n/strings/en_EN.json | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js index 1398e03b10..dc893f0049 100644 --- a/src/components/views/rooms/RoomTile.js +++ b/src/components/views/rooms/RoomTile.js @@ -389,6 +389,8 @@ module.exports = createReactClass({ ariaLabel += " " + _t("%(count)s unread messages.", { count: notificationCount }); } else if (mentionBadges && !isInvite) { ariaLabel += " " + _t("Unread mentions."); + } else if (this.props.unread) { + ariaLabel += " " + _t("Unread messages."); } return Date: Tue, 29 Oct 2019 09:14:04 +0000 Subject: [PATCH 05/16] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (1847 of 1847 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index 7f80904b9f..a5c60ec5e1 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -2265,5 +2265,6 @@ "Jump to first unread room.": "跳到第一個未讀的聊天室。", "Jump to first invite.": "跳到第一個邀請。", "Room %(name)s": "聊天室 %(name)s", - "Recent rooms": "最近的聊天室" + "Recent rooms": "最近的聊天室", + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "未設定身份識別伺服器，所以您無法新增電子郵件以在未來重設您的密碼。" } From 20d726fc59eac949b1319aeda25c36fe7cefd372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20C?= Date: Tue, 29 Oct 2019 09:51:16 +0000 Subject: [PATCH 06/16] Translated using Weblate (French) Currently translated at 100.0% (1847 of 1847 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/fr/ --- src/i18n/strings/fr.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index 12f1590bb1..af6634992f 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -2272,5 +2272,6 @@ "Jump to first unread room.": "Sauter au premier salon non lu.", "Jump to first invite.": "Sauter à la première invitation.", "Room %(name)s": "Salon %(name)s", - "Recent rooms": "Salons récents" + "Recent rooms": "Salons récents", + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Aucun serveur d’identité n’est configuré donc vous ne pouvez pas ajouter une adresse e-mail afin de réinitialiser votre mot de passe dans l’avenir." } From f8d09874f87a726a3aa2dcb4afc4be36ea279c59 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Mon, 28 Oct 2019 20:11:07 +0000 Subject: [PATCH 07/16] Translated using Weblate (Hungarian) Currently translated at 100.0% (1847 of 1847 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index b84ed2d7aa..12fb26a822 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -2259,5 +2259,6 @@ "Jump to first unread room.": "Az első olvasatlan szobába ugrás.", "Jump to first invite.": "Az első meghívóra ugrás.", "Room %(name)s": "Szoba: %(name)s", - "Recent rooms": "Legutóbbi szobák" + "Recent rooms": "Legutóbbi szobák", + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Azonosítási szerver nincs beállítva, így nem tudsz hozzáadni e-mail címet amivel vissza lehetne állítani a jelszót a későbbiekben." } From 8fd2330c68b134f3b7f39da1e8a4f0cb6abf88e3 Mon Sep 17 00:00:00 2001 From: random Date: Tue, 29 Oct 2019 13:15:24 +0000 Subject: [PATCH 08/16] Translated using Weblate (Italian) Currently translated at 100.0% (1847 of 1847 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index fcbb21e841..be385a7c4a 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -2219,5 +2219,6 @@ "Command Autocomplete": "Autocompletamento comando", "DuckDuckGo Results": "Risultati DuckDuckGo", "Room %(name)s": "Stanza %(name)s", - "Recent rooms": "Stanze recenti" + "Recent rooms": "Stanze recenti", + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Nessun server di identità configurato, perciò non puoi aggiungere un indirizzo email per ripristinare la tua password in futuro." } From 4eacafc6c76c756672fe83b63fc0bf1003a56d25 Mon Sep 17 00:00:00 2001 From: Walter Date: Tue, 29 Oct 2019 14:43:44 +0000 Subject: [PATCH 09/16] Translated using Weblate (Russian) Currently translated at 99.8% (1844 of 1847 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ru/ --- src/i18n/strings/ru.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index d2bec741ec..b22c627213 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -2155,5 +2155,10 @@ "Symbols": "Символы", "Flags": "Флаги", "React": "Реакция", - "Cancel search": "Отмена поиска" + "Cancel search": "Отмена поиска", + "Room %(name)s": "Комната %(name)s", + "Recent rooms": "Недавние комнаты", + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Сервер идентификации не настроен, поэтому вы не можете добавить адрес электронной почты, чтобы в будущем сбросить пароль.", + "Jump to first unread room.": "Перейти в первую непрочитанную комнату.", + "Jump to first invite.": "Перейти к первому приглашению." } From 3775dc09436b7af11ad0e754af59daf90e6331bb Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 29 Oct 2019 17:32:22 +0000 Subject: [PATCH 10/16] Add diagnostic log to catch events without an ID This adds some temporary logging to investigate https://github.com/vector-im/riot-web/issues/11120. --- src/components/views/rooms/EventTile.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 6af2860399..ca83dd1814 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -495,6 +495,12 @@ module.exports = createReactClass({ return null; } const eventId = this.props.mxEvent.getId(); + if (!eventId) { + // XXX: Temporary diagnostic logging for https://github.com/vector-im/riot-web/issues/11120 + console.error("EventTile attempted to get relations for an event without an ID"); + // Use event's special `toJSON` method to log key data. + console.log(JSON.stringify(this.props.mxEvent, null, 4)); + } return this.props.getRelationsForEvent(eventId, "m.annotation", "m.reaction"); }, From e46976be724586bfd3ac3d78b184eaa7e939d7ee Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Tue, 29 Oct 2019 11:49:15 -0600 Subject: [PATCH 11/16] Match widgets up with their integration manager --- src/components/views/elements/AppTile.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/components/views/elements/AppTile.js b/src/components/views/elements/AppTile.js index cfb75f9a48..260b63dfd4 100644 --- a/src/components/views/elements/AppTile.js +++ b/src/components/views/elements/AppTile.js @@ -190,9 +190,20 @@ export default class AppTile extends React.Component { // TODO: Pick the right manager for the widget + const defaultManager = managers.getPrimaryManager(); + if (!WidgetUtils.isScalarUrl(defaultManager.apiUrl)) { + console.warn('Non-scalar manager, not setting scalar token!', url); + this.setState({ + error: null, + widgetUrl: this._addWurlParams(this.props.url), + initialising: false, + }); + return; + } + // Fetch the token before loading the iframe as we need it to mangle the URL if (!this._scalarClient) { - this._scalarClient = managers.getPrimaryManager().getScalarClient(); + this._scalarClient = defaultManager.getScalarClient(); } this._scalarClient.getScalarToken().done((token) => { // Append scalar_token as a query param if not already present From 342e7856cde34e474339caf9bca5db43416ee601 Mon Sep 17 00:00:00 2001 From: David Baker Date: Wed, 30 Oct 2019 10:38:34 +0000 Subject: [PATCH 12/16] Fix call state logging console.log does not work that way --- src/CallHandler.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CallHandler.js b/src/CallHandler.js index 3efd800499..bcdf7853fd 100644 --- a/src/CallHandler.js +++ b/src/CallHandler.js @@ -205,7 +205,7 @@ function _setCallListeners(call) { function _setCallState(call, roomId, status) { console.log( - "Call state in %s changed to %s (%s)", roomId, status, (call ? call.call_state : "-"), + `Call state in ${roomId} changed to ${status} (${call ? call.call_state : "-"})`, ); calls[roomId] = call; From 9a2547800d4dd963a0a13842d9ee1de129372ac5 Mon Sep 17 00:00:00 2001 From: Jeff Huang Date: Wed, 30 Oct 2019 03:23:15 +0000 Subject: [PATCH 13/16] Translated using Weblate (Chinese (Traditional)) Currently translated at 100.0% (1850 of 1850 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/zh_Hant/ --- src/i18n/strings/zh_Hant.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index a5c60ec5e1..bb383c7f5a 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -2266,5 +2266,8 @@ "Jump to first invite.": "跳到第一個邀請。", "Room %(name)s": "聊天室 %(name)s", "Recent rooms": "最近的聊天室", - "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "未設定身份識別伺服器，所以您無法新增電子郵件以在未來重設您的密碼。" + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "未設定身份識別伺服器，所以您無法新增電子郵件以在未來重設您的密碼。", + "%(count)s unread messages including mentions.|one": "1 則未讀的提及。", + "%(count)s unread messages.|one": "1 則未讀的訊息。", + "Unread messages.": "未讀的訊息。" } From 96d99c350c5fd624f8fa5cc04ef42b17f82eec11 Mon Sep 17 00:00:00 2001 From: Szimszon Date: Tue, 29 Oct 2019 18:47:57 +0000 Subject: [PATCH 14/16] Translated using Weblate (Hungarian) Currently translated at 100.0% (1850 of 1850 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/hu/ --- src/i18n/strings/hu.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index 12fb26a822..dc8c42b109 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -2260,5 +2260,8 @@ "Jump to first invite.": "Az első meghívóra ugrás.", "Room %(name)s": "Szoba: %(name)s", "Recent rooms": "Legutóbbi szobák", - "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Azonosítási szerver nincs beállítva, így nem tudsz hozzáadni e-mail címet amivel vissza lehetne állítani a jelszót a későbbiekben." + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Azonosítási szerver nincs beállítva, így nem tudsz hozzáadni e-mail címet amivel vissza lehetne állítani a jelszót a későbbiekben.", + "%(count)s unread messages including mentions.|one": "1 olvasatlan megemlítés.", + "%(count)s unread messages.|one": "1 olvasatlan üzenet.", + "Unread messages.": "Olvasatlan üzenetek." } From 287d03adc3ee102e7e26501edb6f3a12b38fee88 Mon Sep 17 00:00:00 2001 From: random Date: Wed, 30 Oct 2019 10:11:44 +0000 Subject: [PATCH 15/16] Translated using Weblate (Italian) Currently translated at 100.0% (1850 of 1850 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/it/ --- src/i18n/strings/it.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index be385a7c4a..f1f66b44d2 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -2220,5 +2220,8 @@ "DuckDuckGo Results": "Risultati DuckDuckGo", "Room %(name)s": "Stanza %(name)s", "Recent rooms": "Stanze recenti", - "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Nessun server di identità configurato, perciò non puoi aggiungere un indirizzo email per ripristinare la tua password in futuro." + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "Nessun server di identità configurato, perciò non puoi aggiungere un indirizzo email per ripristinare la tua password in futuro.", + "%(count)s unread messages including mentions.|one": "1 citazione non letta.", + "%(count)s unread messages.|one": "1 messaggio non letto.", + "Unread messages.": "Messaggi non letti." } From c4c14fa1893057bf5c13fa6e5d1ad97ca4c5bce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=ED=83=9C=EC=84=AD?= Date: Wed, 30 Oct 2019 01:27:04 +0000 Subject: [PATCH 16/16] Translated using Weblate (Korean) Currently translated at 100.0% (1850 of 1850 strings) Translation: Riot Web/matrix-react-sdk Translate-URL: https://translate.riot.im/projects/riot-web/matrix-react-sdk/ko/ --- src/i18n/strings/ko.json | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/i18n/strings/ko.json b/src/i18n/strings/ko.json index c988760e1e..4e94a06dc3 100644 --- a/src/i18n/strings/ko.json +++ b/src/i18n/strings/ko.json @@ -2117,5 +2117,8 @@ "Jump to first invite.": "첫 초대로 건너뜁니다.", "Room %(name)s": "%(name)s 방", "Recent rooms": "최근 방", - "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "설정된 ID 서버가 없어서 이후 비밀번호를 초기화하기 위한 이메일 주소를 추가할 수 없습니다." + "No identity server is configured so you cannot add an email address in order to reset your password in the future.": "설정된 ID 서버가 없어서 이후 비밀번호를 초기화하기 위한 이메일 주소를 추가할 수 없습니다.", + "%(count)s unread messages including mentions.|one": "1개의 읽지 않은 언급.", + "%(count)s unread messages.|one": "1개의 읽지 않은 메시지.", + "Unread messages.": "읽지 않은 메시지." }