OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branches 'develop' and 't3chguy/hide_tray_icon' of https://github.com/matrix-org/matrix-react-sdk into t3chguy/hide_tray_icon

pull/21833/head
Michael Telatynski 2019-10-30 14:15:09 +00:00
parent 646a498b37 e94a9a50e3
commit 46e7e1e81a
12 changed files with 66 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CallHandler.js
View File

@ -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;

13
src/components/views/elements/AppTile.js
View File

@ -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

6
src/components/views/rooms/EventTile.js
View File

@ -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");
},

2
src/components/views/rooms/RoomTile.js
View File

@ -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 <AccessibleButton tabIndex="0"

3
src/i18n/strings/en_EN.json
View File

@ -961,8 +961,11 @@
"Not now": "Not now",
"Don't ask me again": "Don't ask me again",
"%(count)s unread messages including mentions.|other": "%(count)s unread messages including mentions.",
"%(count)s unread messages including mentions.|one": "1 unread mention.",
"%(count)s unread messages.|other": "%(count)s unread messages.",
"%(count)s unread messages.|one": "1 unread message.",
"Unread mentions.": "Unread mentions.",
"Unread messages.": "Unread messages.",
"Add a topic": "Add a topic",
"Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.",
"This room has already been upgraded.": "This room has already been upgraded.",

15
src/i18n/strings/fi.json
View File

@ -2108,5 +2108,18 @@
"%(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",
"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"
}

3
src/i18n/strings/fr.json
View File

@ -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."
}

6
src/i18n/strings/hu.json
View File

@ -2259,5 +2259,9 @@
"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.",
"%(count)s unread messages including mentions.|one": "1 olvasatlan megemlítés.",
"%(count)s unread messages.|one": "1 olvasatlan üzenet.",
"Unread messages.": "Olvasatlan üzenetek."
}

6
src/i18n/strings/it.json
View File

@ -2219,5 +2219,9 @@
"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.",
"%(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."
}

6
src/i18n/strings/ko.json
View File

@ -2116,5 +2116,9 @@
"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 서버가 없어서 이후 비밀번호를 초기화하기 위한 이메일 주소를 추가할 수 없습니다.",
"%(count)s unread messages including mentions.|one": "1개의 읽지 않은 언급.",
"%(count)s unread messages.|one": "1개의 읽지 않은 메시지.",
"Unread messages.": "읽지 않은 메시지."
}

7
src/i18n/strings/ru.json
View File

@ -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.": "Перейти к первому приглашению."
}

6
src/i18n/strings/zh_Hant.json
View File

@ -2265,5 +2265,9 @@
"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.": "未設定身份識別伺服器，所以您無法新增電子郵件以在未來重設您的密碼。",
"%(count)s unread messages including mentions.|one": "1 則未讀的提及。",
"%(count)s unread messages.|one": "1 則未讀的訊息。",
"Unread messages.": "未讀的訊息。"
}