{_t( + "Your new account (%(newAccountId)s) is registered, but you're already " + + "logged into a different account (%(loggedInUserId)s).", { + newAccountId: this.state.registeredUsername, + loggedInUserId: this.state.differentLoggedInUserId, + }, + )}
+{_t( "Log in to your new account.", {}, { a: (sub) => {sub}, }, - ); + )}
; } else { // We're not the original client: the user probably got to us by clicking the // email validation link. We can't offer a 'go straight to your account' link // as we don't have the original creds. - regDoneText = _t( + regDoneText ={_t( "You can now close this window or log in to your new account.", {}, { a: (sub) => {sub}, }, - ); + )}
; } body ={_t("Registration Successful")}
-{ regDoneText }
+ { regDoneText }
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.js b/src/components/views/auth/InteractiveAuthEntryComponents.js
index b3687db2bd..b52dac44a9 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.js
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.js
@@ -81,16 +81,10 @@ export const PasswordAuthEntry = React.createClass({
getInitialState: function() {
return {
- passwordValid: false,
+ password: "",
};
},
- focus: function() {
- if (this.refs.passwordField) {
- this.refs.passwordField.focus();
- }
- },
-
_onSubmit: function(e) {
e.preventDefault();
if (this.props.busy) return;
@@ -98,23 +92,21 @@ export const PasswordAuthEntry = React.createClass({
this.props.submitAuthDict({
type: PasswordAuthEntry.LOGIN_TYPE,
user: this.props.matrixClient.credentials.userId,
- password: this.refs.passwordField.value,
+ password: this.state.password,
});
},
_onPasswordFieldChange: function(ev) {
// enable the submit button iff the password is non-empty
this.setState({
- passwordValid: Boolean(this.refs.passwordField.value),
+ password: ev.target.value,
});
},
render: function() {
- let passwordBoxClass = null;
-
- if (this.props.errorText) {
- passwordBoxClass = 'error';
- }
+ const passwordBoxClass = classnames({
+ "error": this.props.errorText,
+ });
let submitButtonOrSpinner;
if (this.props.busy) {
@@ -124,7 +116,7 @@ export const PasswordAuthEntry = React.createClass({
submitButtonOrSpinner = (
);
}
@@ -138,17 +130,21 @@ export const PasswordAuthEntry = React.createClass({
);
}
+ const Field = sdk.getComponent('elements.Field');
+
return (
;
}
+ let uploadAllButton;
+ if (this.props.currentIndex + 1 < this.props.totalFiles) {
+ uploadAllButton = ;
+ }
+
return (
![]({require("../../../../res/img/warning.svg")} "{_t('Integrations")
;
- // Popup shown when hovering over integrationsButton_error (via CSS)
- integrationsErrorPopup = (
-
- { _t('Could not connect to the integration server') }
-
- );
- }
-
+ if (ScalarAuthClient.isPossible()) {
+ const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
integrationsButton = (
-
- { integrationsWarningTriangle }
- { integrationsErrorPopup }
-
+ />
);
}
diff --git a/src/components/views/elements/MessageEditor.js b/src/components/views/elements/MessageEditor.js
index 72091f2e1c..ce22bf2fc6 100644
--- a/src/components/views/elements/MessageEditor.js
+++ b/src/components/views/elements/MessageEditor.js
@@ -78,6 +78,14 @@ export default class MessageEditor extends React.Component {
this.model.update(text, event.inputType, caret);
}
+ _insertText(textToInsert, inputType = "insertText") {
+ const sel = document.getSelection();
+ const {caret, text} = getCaretOffsetAndText(this._editorRef, sel);
+ const newText = text.substr(0, caret.offset) + textToInsert + text.substr(caret.offset);
+ caret.offset += textToInsert.length;
+ this.model.update(newText, inputType, caret);
+ }
+
_isCaretAtStart() {
const {caret} = getCaretOffsetAndText(this._editorRef, document.getSelection());
return caret.offset === 0;
@@ -92,7 +100,7 @@ export default class MessageEditor extends React.Component {
// insert newline on Shift+Enter
if (event.shiftKey && event.key === "Enter") {
event.preventDefault(); // just in case the browser does support this
- document.execCommand("insertHTML", undefined, "\n");
+ this._insertText("\n");
return;
}
// autocomplete or enter to send below shouldn't have any modifier keys pressed.
@@ -150,16 +158,28 @@ export default class MessageEditor extends React.Component {
dis.dispatch({action: 'focus_composer'});
}
+ _isEmote() {
+ const firstPart = this.model.parts[0];
+ return firstPart && firstPart.type === "plain" && firstPart.text.startsWith("/me ");
+ }
+
_sendEdit = () => {
+ const isEmote = this._isEmote();
+ let model = this.model;
+ if (isEmote) {
+ // trim "/me "
+ model = model.clone();
+ model.removeText({index: 0, offset: 0}, 4);
+ }
const newContent = {
- "msgtype": "m.text",
- "body": textSerialize(this.model),
+ "msgtype": isEmote ? "m.emote" : "m.text",
+ "body": textSerialize(model),
};
const contentBody = {
msgtype: newContent.msgtype,
body: ` * ${newContent.body}`,
};
- const formattedBody = htmlSerializeIfNeeded(this.model);
+ const formattedBody = htmlSerializeIfNeeded(model);
if (formattedBody) {
newContent.format = "org.matrix.custom.html";
newContent.formatted_body = formattedBody;
@@ -232,7 +252,7 @@ export default class MessageEditor extends React.Component {
parts = editState.getSerializedParts().map(p => partCreator.deserializePart(p));
} else {
// otherwise, parse the body of the event
- parts = parseEvent(editState.getEvent(), room, this.context.matrixClient);
+ parts = parseEvent(editState.getEvent(), partCreator);
}
return new EditorModel(
diff --git a/src/components/views/elements/ToolTipButton.js b/src/components/views/elements/TooltipButton.js
similarity index 83%
rename from src/components/views/elements/ToolTipButton.js
rename to src/components/views/elements/TooltipButton.js
index 239095f196..63cf3fe1fe 100644
--- a/src/components/views/elements/ToolTipButton.js
+++ b/src/components/views/elements/TooltipButton.js
@@ -1,5 +1,6 @@
/*
Copyright 2017 New Vector Ltd.
+Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -18,7 +19,7 @@ import React from 'react';
import sdk from '../../../index';
module.exports = React.createClass({
- displayName: 'ToolTipButton',
+ displayName: 'TooltipButton',
getInitialState: function() {
return {
@@ -41,12 +42,12 @@ module.exports = React.createClass({
render: function() {
const Tooltip = sdk.getComponent("elements.Tooltip");
const tip = this.state.hover ?
);
},
diff --git a/src/components/views/rooms/RoomTile.js b/src/components/views/rooms/RoomTile.js
index e1b9567ebd..be73985d16 100644
--- a/src/components/views/rooms/RoomTile.js
+++ b/src/components/views/rooms/RoomTile.js
@@ -2,6 +2,7 @@
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2017 New Vector Ltd
Copyright 2018 Michael Telatynski <7t3chguy@gmail.com>
+Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -67,14 +68,6 @@ module.exports = React.createClass({
});
},
- _shouldShowNotifBadge: function() {
- return RoomNotifs.BADGE_STATES.includes(this.state.notifState);
- },
-
- _shouldShowMentionBadge: function() {
- return RoomNotifs.MENTION_BADGE_STATES.includes(this.state.notifState);
- },
-
_isDirectMessageRoom: function(roomId) {
const dmRooms = DMRoomMap.shared().getUserIdForRoomId(roomId);
return Boolean(dmRooms);
@@ -301,8 +294,8 @@ module.exports = React.createClass({
const notificationCount = this.props.notificationCount;
// var highlightCount = this.props.room.getUnreadNotificationCount("highlight");
- const notifBadges = notificationCount > 0 && this._shouldShowNotifBadge();
- const mentionBadges = this.props.highlight && this._shouldShowMentionBadge();
+ const notifBadges = notificationCount > 0 && RoomNotifs.shouldShowNotifBadge(this.state.notifState);
+ const mentionBadges = this.props.highlight && RoomNotifs.shouldShowMentionBadge(this.state.notifState);
const badges = notifBadges || mentionBadges;
let subtext = null;
diff --git a/src/components/views/rooms/RoomUpgradeWarningBar.js b/src/components/views/rooms/RoomUpgradeWarningBar.js
index c2e2ba89d4..edde0a6865 100644
--- a/src/components/views/rooms/RoomUpgradeWarningBar.js
+++ b/src/components/views/rooms/RoomUpgradeWarningBar.js
@@ -97,20 +97,22 @@ module.exports = React.createClass({
return (
{ _t("To continue, please enter your password.") }
-
+
+
;
+
+ ReactDOM.render(tooltip, getOrCreateContainer());
+ }
+
+ render() {
+ // We use `cloneElement` here to append some props to the child content
+ // without using a wrapper element which could disrupt layout.
+ return React.cloneElement(this.props.children, {
+ ref: this.collectTarget,
+ onMouseOver: this.onTargetMouseOver,
+ });
+ }
+}
diff --git a/src/components/views/elements/ManageIntegsButton.js b/src/components/views/elements/ManageIntegsButton.js
index 165cd20eb5..ef5604dba6 100644
--- a/src/components/views/elements/ManageIntegsButton.js
+++ b/src/components/views/elements/ManageIntegsButton.js
@@ -1,5 +1,6 @@
/*
Copyright 2017 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -17,95 +18,34 @@ limitations under the License.
import React from 'react';
import PropTypes from 'prop-types';
import sdk from '../../../index';
-import classNames from 'classnames';
-import SdkConfig from '../../../SdkConfig';
import ScalarAuthClient from '../../../ScalarAuthClient';
-import ScalarMessaging from '../../../ScalarMessaging';
import Modal from "../../../Modal";
import { _t } from '../../../languageHandler';
-import AccessibleButton from './AccessibleButton';
export default class ManageIntegsButton extends React.Component {
constructor(props) {
super(props);
-
- this.state = {
- scalarError: null,
- };
-
- this.onManageIntegrations = this.onManageIntegrations.bind(this);
}
- componentWillMount() {
- ScalarMessaging.startListening();
- this.scalarClient = null;
-
- if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
- this.scalarClient = new ScalarAuthClient();
- this.scalarClient.connect().done(() => {
- this.forceUpdate();
- }, (err) => {
- this.setState({scalarError: err});
- console.error('Error whilst initialising scalarClient for ManageIntegsButton', err);
- });
- }
- }
-
- componentWillUnmount() {
- ScalarMessaging.stopListening();
- }
-
- onManageIntegrations(ev) {
+ onManageIntegrations = (ev) => {
ev.preventDefault();
- if (this.state.scalarError && !this.scalarClient.hasCredentials()) {
- return;
- }
+
const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
- this.scalarClient.connect().done(() => {
- Modal.createDialog(IntegrationsManager, {
- src: (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
- this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room) :
- null,
- }, "mx_IntegrationsManager");
- }, (err) => {
- this.setState({scalarError: err});
- console.error('Error ensuring a valid scalar_token exists', err);
- });
- }
+ Modal.createDialog(IntegrationsManager, {
+ room: this.props.room,
+ }, "mx_IntegrationsManager");
+ };
render() {
let integrationsButton = ;
- let integrationsWarningTriangle = ;
- let integrationsErrorPopup = ;
- if (this.scalarClient !== null) {
- const integrationsButtonClasses = classNames({
- mx_RoomHeader_button: true,
- mx_RoomHeader_manageIntegsButton: true,
- mx_ManageIntegsButton_error: !!this.state.scalarError,
- });
-
- if (this.state.scalarError && !this.scalarClient.hasCredentials()) {
- integrationsWarningTriangle =
+ {chevron}
+ {this.props.content}
+
+ ;
- // Popup shown when hovering over integrationsButton_error (via CSS)
- integrationsErrorPopup = (
-
- { _t('Could not connect to the integration server') }
-
- );
- }
-
+ if (ScalarAuthClient.isPossible()) {
+ const AccessibleButton = sdk.getComponent("elements.AccessibleButton");
integrationsButton = (
-
+
diff --git a/src/components/views/messages/EditHistoryMessage.js b/src/components/views/messages/EditHistoryMessage.js
new file mode 100644
index 0000000000..fef9c362c6
--- /dev/null
+++ b/src/components/views/messages/EditHistoryMessage.js
@@ -0,0 +1,61 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import * as HtmlUtils from '../../../HtmlUtils';
+import {formatTime} from '../../../DateUtils';
+import {MatrixEvent} from 'matrix-js-sdk';
+import {pillifyLinks} from '../../../utils/pillify';
+
+export default class EditHistoryMessage extends React.PureComponent {
+ static propTypes = {
+ // the message event being edited
+ mxEvent: PropTypes.instanceOf(MatrixEvent).isRequired,
+ };
+
+ componentDidMount() {
+ pillifyLinks(this.refs.content.children, this.props.mxEvent);
+ }
+
+ componentDidUpdate() {
+ pillifyLinks(this.refs.content.children, this.props.mxEvent);
+ }
+
+ render() {
+ const {mxEvent} = this.props;
+ const originalContent = mxEvent.getOriginalContent();
+ const content = originalContent["m.new_content"] || originalContent;
+ const contentElements = HtmlUtils.bodyToHtml(content);
+ let contentContainer;
+ if (mxEvent.getContent().msgtype === "m.emote") {
+ const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
+ contentContainer = (
+ ;
+ }
+}
diff --git a/src/components/views/messages/MessageActionBar.js b/src/components/views/messages/MessageActionBar.js
index 80f0ba538c..e7843c1505 100644
--- a/src/components/views/messages/MessageActionBar.js
+++ b/src/components/views/messages/MessageActionBar.js
@@ -57,7 +57,7 @@ export default class MessageActionBar extends React.PureComponent {
this.props.onFocusChange(focused);
}
- onCryptoClicked = () => {
+ onCryptoClick = () => {
const event = this.props.mxEvent;
Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
import('../../../async-components/views/dialogs/EncryptedEventDialog'),
@@ -89,7 +89,7 @@ export default class MessageActionBar extends React.PureComponent {
let e2eInfoCallback = null;
if (this.props.mxEvent.isEncrypted()) {
- e2eInfoCallback = () => this.onCryptoClicked();
+ e2eInfoCallback = () => this.onCryptoClick();
}
const menuOptions = {
@@ -131,43 +131,28 @@ export default class MessageActionBar extends React.PureComponent {
return SettingsStore.isFeatureEnabled("feature_message_editing");
}
- renderAgreeDimension() {
+ renderReactButton() {
if (!this.isReactionsEnabled()) {
return null;
}
- const ReactionDimension = sdk.getComponent('messages.ReactionDimension');
- return
+
+ ;
+ }
+}
diff --git a/src/components/views/messages/ReactionDimension.js b/src/components/views/messages/ReactionDimension.js
deleted file mode 100644
index de33ad1a57..0000000000
--- a/src/components/views/messages/ReactionDimension.js
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
-Copyright 2019 New Vector Ltd
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import classNames from 'classnames';
-
-import MatrixClientPeg from '../../../MatrixClientPeg';
-
-export default class ReactionDimension extends React.PureComponent {
- static propTypes = {
- mxEvent: PropTypes.object.isRequired,
- // Array of strings containing the emoji for each option
- options: PropTypes.array.isRequired,
- title: PropTypes.string,
- // The Relations model from the JS SDK for reactions
- reactions: PropTypes.object,
- };
-
- constructor(props) {
- super(props);
-
- this.state = this.getSelection();
-
- if (props.reactions) {
- props.reactions.on("Relations.add", this.onReactionsChange);
- props.reactions.on("Relations.remove", this.onReactionsChange);
- props.reactions.on("Relations.redaction", this.onReactionsChange);
- }
- }
-
- componentDidUpdate(prevProps) {
- if (prevProps.reactions !== this.props.reactions) {
- this.props.reactions.on("Relations.add", this.onReactionsChange);
- this.props.reactions.on("Relations.remove", this.onReactionsChange);
- this.props.reactions.on("Relations.redaction", this.onReactionsChange);
- this.onReactionsChange();
- }
- }
-
- componentWillUnmount() {
- if (this.props.reactions) {
- this.props.reactions.removeListener(
- "Relations.add",
- this.onReactionsChange,
- );
- this.props.reactions.removeListener(
- "Relations.remove",
- this.onReactionsChange,
- );
- this.props.reactions.removeListener(
- "Relations.redaction",
- this.onReactionsChange,
- );
- }
- }
-
- onReactionsChange = () => {
- this.setState(this.getSelection());
- }
-
- getSelection() {
- const myReactions = this.getMyReactions();
- if (!myReactions) {
- return {
- selectedOption: null,
- selectedReactionEvent: null,
- };
- }
- const { options } = this.props;
- let selectedOption = null;
- let selectedReactionEvent = null;
- for (const option of options) {
- const reactionForOption = myReactions.find(mxEvent => {
- if (mxEvent.isRedacted()) {
- return false;
- }
- return mxEvent.getRelation().key === option;
- });
- if (!reactionForOption) {
- continue;
- }
- if (selectedOption) {
- // If there are multiple selected values (only expected to occur via
- // non-Riot clients), then act as if none are selected.
- return {
- selectedOption: null,
- selectedReactionEvent: null,
- };
- }
- selectedOption = option;
- selectedReactionEvent = reactionForOption;
- }
- return { selectedOption, selectedReactionEvent };
- }
-
- getMyReactions() {
- const reactions = this.props.reactions;
- if (!reactions) {
- return null;
- }
- const userId = MatrixClientPeg.get().getUserId();
- const myReactions = reactions.getAnnotationsBySender()[userId];
- if (!myReactions) {
- return null;
- }
- return [...myReactions.values()];
- }
-
- onOptionClick = (ev) => {
- const { key } = ev.target.dataset;
- this.toggleDimension(key);
- }
-
- toggleDimension(key) {
- const { selectedOption, selectedReactionEvent } = this.state;
- const newSelectedOption = selectedOption !== key ? key : null;
- this.setState({
- selectedOption: newSelectedOption,
- });
- if (selectedReactionEvent) {
- MatrixClientPeg.get().redactEvent(
- this.props.mxEvent.getRoomId(),
- selectedReactionEvent.getId(),
- );
- }
- if (newSelectedOption) {
- MatrixClientPeg.get().sendEvent(this.props.mxEvent.getRoomId(), "m.reaction", {
- "m.relates_to": {
- "rel_type": "m.annotation",
- "event_id": this.props.mxEvent.getId(),
- "key": newSelectedOption,
- },
- });
- }
- }
-
- render() {
- const { selectedOption } = this.state;
- const { options } = this.props;
-
- const items = options.map(option => {
- const disabled = selectedOption && selectedOption !== option;
- const classes = classNames({
- mx_ReactionDimension_disabled: disabled,
- });
- return
- {option}
- ;
- });
-
- return
- {items}
- ;
- }
-}
diff --git a/src/components/views/messages/ReactionTooltipButton.js b/src/components/views/messages/ReactionTooltipButton.js
new file mode 100644
index 0000000000..e09b9ade69
--- /dev/null
+++ b/src/components/views/messages/ReactionTooltipButton.js
@@ -0,0 +1,68 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+
+import MatrixClientPeg from '../../../MatrixClientPeg';
+
+export default class ReactionTooltipButton extends React.PureComponent {
+ static propTypes = {
+ mxEvent: PropTypes.object.isRequired,
+ // The reaction content / key / emoji
+ content: PropTypes.string.isRequired,
+ title: PropTypes.string,
+ // A possible Matrix event if the current user has voted for this type
+ myReactionEvent: PropTypes.object,
+ };
+
+ onClick = (ev) => {
+ const { mxEvent, myReactionEvent, content } = this.props;
+ if (myReactionEvent) {
+ MatrixClientPeg.get().redactEvent(
+ mxEvent.getRoomId(),
+ myReactionEvent.getId(),
+ );
+ } else {
+ MatrixClientPeg.get().sendEvent(mxEvent.getRoomId(), "m.reaction", {
+ "m.relates_to": {
+ "rel_type": "m.annotation",
+ "event_id": mxEvent.getId(),
+ "key": content,
+ },
+ });
+ }
+ }
+
+ render() {
+ const { content, myReactionEvent } = this.props;
+
+ const classes = classNames({
+ mx_ReactionTooltipButton: true,
+ mx_ReactionTooltipButton_selected: !!myReactionEvent,
+ });
+
+ return
+ {content}
+ ;
+ }
+}
diff --git a/src/components/views/messages/ReactionsQuickTooltip.js b/src/components/views/messages/ReactionsQuickTooltip.js
new file mode 100644
index 0000000000..0505bbd2df
--- /dev/null
+++ b/src/components/views/messages/ReactionsQuickTooltip.js
@@ -0,0 +1,195 @@
+/*
+Copyright 2019 The Matrix.org Foundation C.I.C.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import { _t } from '../../../languageHandler';
+import sdk from '../../../index';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+import { unicodeToShortcode } from '../../../HtmlUtils';
+
+export default class ReactionsQuickTooltip extends React.PureComponent {
+ static propTypes = {
+ mxEvent: PropTypes.object.isRequired,
+ // The Relations model from the JS SDK for reactions to `mxEvent`
+ reactions: PropTypes.object,
+ };
+
+ constructor(props) {
+ super(props);
+
+ if (props.reactions) {
+ props.reactions.on("Relations.add", this.onReactionsChange);
+ props.reactions.on("Relations.remove", this.onReactionsChange);
+ props.reactions.on("Relations.redaction", this.onReactionsChange);
+ }
+
+ this.state = {
+ hoveredItem: null,
+ myReactions: this.getMyReactions(),
+ };
+ }
+
+ componentDidUpdate(prevProps) {
+ if (prevProps.reactions !== this.props.reactions) {
+ this.props.reactions.on("Relations.add", this.onReactionsChange);
+ this.props.reactions.on("Relations.remove", this.onReactionsChange);
+ this.props.reactions.on("Relations.redaction", this.onReactionsChange);
+ this.onReactionsChange();
+ }
+ }
+
+ componentWillUnmount() {
+ if (this.props.reactions) {
+ this.props.reactions.removeListener(
+ "Relations.add",
+ this.onReactionsChange,
+ );
+ this.props.reactions.removeListener(
+ "Relations.remove",
+ this.onReactionsChange,
+ );
+ this.props.reactions.removeListener(
+ "Relations.redaction",
+ this.onReactionsChange,
+ );
+ }
+ }
+
+ onReactionsChange = () => {
+ this.setState({
+ myReactions: this.getMyReactions(),
+ });
+ }
+
+ getMyReactions() {
+ const reactions = this.props.reactions;
+ if (!reactions) {
+ return null;
+ }
+ const userId = MatrixClientPeg.get().getUserId();
+ const myReactions = reactions.getAnnotationsBySender()[userId];
+ if (!myReactions) {
+ return null;
+ }
+ return [...myReactions.values()];
+ }
+
+ onMouseOver = (ev) => {
+ const { key } = ev.target.dataset;
+ const item = this.items.find(({ content }) => content === key);
+ this.setState({
+ hoveredItem: item,
+ });
+ }
+
+ onMouseOut = (ev) => {
+ this.setState({
+ hoveredItem: null,
+ });
+ }
+
+ get items() {
+ return [
+ {
+ content: "👍",
+ title: _t("Agree"),
+ },
+ {
+ content: "👎",
+ title: _t("Disagree"),
+ },
+ {
+ content: "😄",
+ title: _t("Happy"),
+ },
+ {
+ content: "🎉",
+ title: _t("Party Popper"),
+ },
+ {
+ content: "😕",
+ title: _t("Confused"),
+ },
+ {
+ content: "❤️",
+ title: _t("Heart"),
+ },
+ {
+ content: "🚀",
+ title: _t("Rocket"),
+ },
+ {
+ content: "👀",
+ title: _t("Eyes"),
+ },
+ ];
+ }
+
+ render() {
+ const { mxEvent } = this.props;
+ const { myReactions, hoveredItem } = this.state;
+ const ReactionTooltipButton = sdk.getComponent('messages.ReactionTooltipButton');
+
+ const buttons = this.items.map(({ content, title }) => {
+ const myReactionEvent = myReactions && myReactions.find(mxEvent => {
+ if (mxEvent.isRedacted()) {
+ return false;
+ }
+ return mxEvent.getRelation().key === content;
+ });
+
+ return
+
?
{ tip }
diff --git a/src/components/views/groups/GroupRoomInfo.js b/src/components/views/groups/GroupRoomInfo.js
index db060218d4..7296b25344 100644
--- a/src/components/views/groups/GroupRoomInfo.js
+++ b/src/components/views/groups/GroupRoomInfo.js
@@ -224,7 +224,7 @@ module.exports = React.createClass({
- { this.state.groupRoom.canonical_alias }
+ { this.state.groupRoom.canonicalAlias }
*
+ { name }
+ {contentElements}
+
);
+ } else {
+ contentContainer = ({contentElements}
);
+ }
+ const timestamp = formatTime(new Date(mxEvent.getTs()), this.props.isTwelveHour);
+ return
+ {timestamp}
+ { contentContainer }
+
+
+
+ {title}
+
+ {shortcodeLabel}
+
;
+ }
+
+ return
+
;
+ }
+}
diff --git a/src/components/views/messages/ReactionsRow.js b/src/components/views/messages/ReactionsRow.js
index 51f62807a5..57d2afc429 100644
--- a/src/components/views/messages/ReactionsRow.js
+++ b/src/components/views/messages/ReactionsRow.js
@@ -18,10 +18,14 @@ import React from 'react';
import PropTypes from 'prop-types';
import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
import { isContentActionable } from '../../../utils/EventUtils';
import { isSingleEmoji } from '../../../HtmlUtils';
import MatrixClientPeg from '../../../MatrixClientPeg';
+// The maximum number of reactions to initially show on a message.
+const MAX_ITEMS_WHEN_LIMITED = 8;
+
export default class ReactionsRow extends React.PureComponent {
static propTypes = {
// The event we're displaying reactions for
@@ -41,6 +45,7 @@ export default class ReactionsRow extends React.PureComponent {
this.state = {
myReactions: this.getMyReactions(),
+ showAll: false,
};
}
@@ -94,16 +99,22 @@ export default class ReactionsRow extends React.PureComponent {
return [...myReactions.values()];
}
+ onShowAllClick = () => {
+ this.setState({
+ showAll: true,
+ });
+ }
+
render() {
const { mxEvent, reactions } = this.props;
- const { myReactions } = this.state;
+ const { myReactions, showAll } = this.state;
if (!reactions || !isContentActionable(mxEvent)) {
return null;
}
const ReactionsRowButton = sdk.getComponent('messages.ReactionsRowButton');
- const items = reactions.getSortedAnnotationsByKey().map(([content, events]) => {
+ let items = reactions.getSortedAnnotationsByKey().map(([content, events]) => {
if (!isSingleEmoji(content)) {
return null;
}
@@ -125,10 +136,26 @@ export default class ReactionsRow extends React.PureComponent {
reactionEvents={events}
myReactionEvent={myReactionEvent}
/>;
- });
+ }).filter(item => !!item);
+
+ // Show the first MAX_ITEMS if there are MAX_ITEMS + 1 or more items.
+ // The "+ 1" ensure that the "show all" reveals something that takes up
+ // more space than the button itself.
+ let showAllButton;
+ if ((items.length > MAX_ITEMS_WHEN_LIMITED + 1) && !showAll) {
+ items = items.slice(0, MAX_ITEMS_WHEN_LIMITED);
+ showAllButton =
+ {_t("Show all")}
+ ;
+ }
return
+ {buttons}
+
+ {label}
+
{items}
+ {showAllButton}
;
}
}
diff --git a/src/components/views/messages/TextualBody.js b/src/components/views/messages/TextualBody.js
index 6f480b8d3c..25316844df 100644
--- a/src/components/views/messages/TextualBody.js
+++ b/src/components/views/messages/TextualBody.js
@@ -30,12 +30,11 @@ import Modal from '../../../Modal';
import SdkConfig from '../../../SdkConfig';
import dis from '../../../dispatcher';
import { _t } from '../../../languageHandler';
-import MatrixClientPeg from '../../../MatrixClientPeg';
import * as ContextualMenu from '../../structures/ContextualMenu';
import SettingsStore from "../../../settings/SettingsStore";
-import PushProcessor from 'matrix-js-sdk/lib/pushprocessor';
import ReplyThread from "../elements/ReplyThread";
import {host as matrixtoHost} from '../../../matrix-to';
+import {pillifyLinks} from '../../../utils/pillify';
module.exports = React.createClass({
displayName: 'TextualBody',
@@ -99,7 +98,7 @@ module.exports = React.createClass({
// pillifyLinks BEFORE linkifyElement because plain room/user URLs in the composer
// are still sent as plaintext URLs. If these are ever pillified in the composer,
// we should be pillify them here by doing the linkifying BEFORE the pillifying.
- this.pillifyLinks(this.refs.content.children);
+ pillifyLinks(this.refs.content.children, this.props.mxEvent);
HtmlUtils.linkifyElement(this.refs.content);
this.calculateUrlPreview();
@@ -184,98 +183,6 @@ module.exports = React.createClass({
}
},
- pillifyLinks: function(nodes) {
- const shouldShowPillAvatar = SettingsStore.getValue("Pill.shouldShowPillAvatar");
- let node = nodes[0];
- while (node) {
- let pillified = false;
-
- if (node.tagName === "A" && node.getAttribute("href")) {
- const href = node.getAttribute("href");
-
- // If the link is a (localised) matrix.to link, replace it with a pill
- const Pill = sdk.getComponent('elements.Pill');
- if (Pill.isMessagePillUrl(href)) {
- const pillContainer = document.createElement('span');
-
- const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
- const pill = {editedTooltip}{`(${_t("edited")})`}
diff --git a/src/components/views/rooms/AppsDrawer.js b/src/components/views/rooms/AppsDrawer.js
index e0e7a48b8c..3e5528996f 100644
--- a/src/components/views/rooms/AppsDrawer.js
+++ b/src/components/views/rooms/AppsDrawer.js
@@ -24,8 +24,6 @@ import AppTile from '../elements/AppTile';
import Modal from '../../../Modal';
import dis from '../../../dispatcher';
import sdk from '../../../index';
-import SdkConfig from '../../../SdkConfig';
-import ScalarAuthClient from '../../../ScalarAuthClient';
import ScalarMessaging from '../../../ScalarMessaging';
import { _t } from '../../../languageHandler';
import WidgetUtils from '../../../utils/WidgetUtils';
@@ -63,20 +61,6 @@ module.exports = React.createClass({
},
componentDidMount: function() {
- this.scalarClient = null;
- if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
- this.scalarClient = new ScalarAuthClient();
- this.scalarClient.connect().then(() => {
- this.forceUpdate();
- }).catch((e) => {
- console.log('Failed to connect to integrations server');
- // TODO -- Handle Scalar errors
- // this.setState({
- // scalar_error: err,
- // });
- });
- }
-
this.dispatcherRef = dis.register(this.onAction);
},
@@ -144,16 +128,10 @@ module.exports = React.createClass({
_launchManageIntegrations: function() {
const IntegrationsManager = sdk.getComponent('views.settings.IntegrationsManager');
- this.scalarClient.connect().done(() => {
- const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
- this.scalarClient.getScalarInterfaceUrlForRoom(this.props.room, 'add_integ') :
- null;
- Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
- src: src,
- }, 'mx_IntegrationsManager');
- }, (err) => {
- console.error('Error ensuring a valid scalar_token exists', err);
- });
+ Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
+ room: this.props.room,
+ screen: 'add_integ',
+ }, 'mx_IntegrationsManager');
},
onClickAddWidget: function(e) {
diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js
index 9837b4a029..988bf7eb3c 100644
--- a/src/components/views/rooms/EventTile.js
+++ b/src/components/views/rooms/EventTile.js
@@ -1,6 +1,7 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
Copyright 2017 New Vector Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -403,7 +404,7 @@ module.exports = withMatrixClient(React.createClass({
});
},
- onCryptoClicked: function(e) {
+ onCryptoClick: function(e) {
const event = this.props.mxEvent;
Modal.createTrackedDialogAsync('Encrypted Event Dialog', '',
@@ -439,7 +440,7 @@ module.exports = withMatrixClient(React.createClass({
_renderE2EPadlock: function() {
const ev = this.props.mxEvent;
- const props = {onClick: this.onCryptoClicked};
+ const props = {onClick: this.onCryptoClick};
// event could not be decrypted
if (ev.getContent().msgtype === 'm.bad.encrypted') {
@@ -670,13 +671,13 @@ module.exports = withMatrixClient(React.createClass({
{'requestLink': (sub) => { sub }},
);
- const ToolTipButton = sdk.getComponent('elements.ToolTipButton');
+ const TooltipButton = sdk.getComponent('elements.TooltipButton');
const keyRequestInfo = isEncryptionFailure ?
{ keyRequestInfoContent }
-
: null;
let reactionsRow;
@@ -828,7 +829,7 @@ module.exports.haveTileForEvent = function(e) {
if (e.isRedacted() && !isMessageEvent(e)) return false;
// No tile for replacement events since they update the original tile
- if (e.isRelation("m.replace")) return false;
+ if (e.isRelation("m.replace") && SettingsStore.isFeatureEnabled("feature_message_editing")) return false;
const handler = getHandlerTile(e);
if (handler === undefined) return false;
diff --git a/src/components/views/rooms/MessageComposerInput.js b/src/components/views/rooms/MessageComposerInput.js
index e99e87ae1d..7a64e9ad51 100644
--- a/src/components/views/rooms/MessageComposerInput.js
+++ b/src/components/views/rooms/MessageComposerInput.js
@@ -60,6 +60,7 @@ import ReplyThread from "../elements/ReplyThread";
import {ContentHelpers} from 'matrix-js-sdk';
import AccessibleButton from '../elements/AccessibleButton';
import {findEditableEvent} from '../../../utils/EventUtils';
+import ComposerHistoryManager from "../../../ComposerHistoryManager";
const REGEX_EMOTICON_WHITESPACE = new RegExp('(?:^|\\s)(' + EMOTICON_REGEX.source + ')\\s$');
@@ -140,6 +141,7 @@ export default class MessageComposerInput extends React.Component {
client: MatrixClient;
autocomplete: Autocomplete;
+ historyManager: ComposerHistoryManager;
constructor(props, context) {
super(props, context);
@@ -329,6 +331,7 @@ export default class MessageComposerInput extends React.Component {
componentWillMount() {
this.dispatcherRef = dis.register(this.onAction);
+ this.historyManager = new ComposerHistoryManager(this.props.room.roomId, 'mx_slate_composer_history_');
}
componentWillUnmount() {
@@ -679,14 +682,6 @@ export default class MessageComposerInput extends React.Component {
if (this.autocomplete.countCompletions() > 0) {
if (!(ev.ctrlKey || ev.shiftKey || ev.altKey || ev.metaKey)) {
switch (ev.keyCode) {
- case KeyCode.LEFT:
- this.autocomplete.moveSelection(-1);
- ev.preventDefault();
- return true;
- case KeyCode.RIGHT:
- this.autocomplete.moveSelection(+1);
- ev.preventDefault();
- return true;
case KeyCode.UP:
this.autocomplete.moveSelection(-1);
ev.preventDefault();
@@ -1062,6 +1057,7 @@ export default class MessageComposerInput extends React.Component {
if (cmd) {
if (!cmd.error) {
+ this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
this.setState({
editorState: this.createEditorState(),
}, ()=>{
@@ -1139,6 +1135,8 @@ export default class MessageComposerInput extends React.Component {
let sendHtmlFn = ContentHelpers.makeHtmlMessage;
let sendTextFn = ContentHelpers.makeTextMessage;
+ this.historyManager.save(editorState, this.state.isRichTextEnabled ? 'rich' : 'markdown');
+
if (commandText && commandText.startsWith('/me')) {
if (replyingToEv) {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
@@ -1198,19 +1196,31 @@ export default class MessageComposerInput extends React.Component {
};
onVerticalArrow = (e, up) => {
- if (e.ctrlKey || e.shiftKey || e.altKey || e.metaKey) return;
-
- // Select history
- const selection = this.state.editorState.selection;
+ if (e.ctrlKey || e.shiftKey || e.metaKey) return;
// selection must be collapsed
+ const selection = this.state.editorState.selection;
if (!selection.isCollapsed) return;
- const document = this.state.editorState.document;
-
// and we must be at the edge of the document (up=start, down=end)
+ const document = this.state.editorState.document;
if (up) {
if (!selection.anchor.isAtStartOfNode(document)) return;
+ } else {
+ if (!selection.anchor.isAtEndOfNode(document)) return;
+ }
+ const editingEnabled = SettingsStore.isFeatureEnabled("feature_message_editing");
+ const shouldSelectHistory = (editingEnabled && e.altKey) || !editingEnabled;
+ const shouldEditLastMessage = editingEnabled && !e.altKey && up;
+
+ if (shouldSelectHistory) {
+ // Try select composer history
+ const selected = this.selectHistory(up);
+ if (selected) {
+ // We're selecting history, so prevent the key event from doing anything else
+ e.preventDefault();
+ }
+ } else if (shouldEditLastMessage) {
const editEvent = findEditableEvent(this.props.room, false);
if (editEvent) {
// We're selecting history, so prevent the key event from doing anything else
@@ -1223,6 +1233,54 @@ export default class MessageComposerInput extends React.Component {
}
};
+ selectHistory = (up) => {
+ const delta = up ? -1 : 1;
+
+ // True if we are not currently selecting history, but composing a message
+ if (this.historyManager.currentIndex === this.historyManager.history.length) {
+ // We can't go any further - there isn't any more history, so nop.
+ if (!up) {
+ return;
+ }
+ this.setState({
+ currentlyComposedEditorState: this.state.editorState,
+ });
+ } else if (this.historyManager.currentIndex + delta === this.historyManager.history.length) {
+ // True when we return to the message being composed currently
+ this.setState({
+ editorState: this.state.currentlyComposedEditorState,
+ });
+ this.historyManager.currentIndex = this.historyManager.history.length;
+ return;
+ }
+
+ let editorState;
+ const historyItem = this.historyManager.getItem(delta);
+ if (!historyItem) return;
+
+ if (historyItem.format === 'rich' && !this.state.isRichTextEnabled) {
+ editorState = this.richToMdEditorState(historyItem.value);
+ } else if (historyItem.format === 'markdown' && this.state.isRichTextEnabled) {
+ editorState = this.mdToRichEditorState(historyItem.value);
+ } else {
+ editorState = historyItem.value;
+ }
+
+ // Move selection to the end of the selected history
+ const change = editorState.change().moveToEndOfNode(editorState.document);
+
+ // We don't call this.onChange(change) now, as fixups on stuff like pills
+ // should already have been done and persisted in the history.
+ editorState = change.value;
+
+ this.suppressAutoComplete = true;
+
+ this.setState({ editorState }, ()=>{
+ this._editor.focus();
+ });
+ return true;
+ };
+
onTab = async (e) => {
this.setState({
someCompletions: null,
diff --git a/src/components/views/rooms/RoomPreviewBar.js b/src/components/views/rooms/RoomPreviewBar.js
index cbc44d0933..fb5bc3ae0d 100644
--- a/src/components/views/rooms/RoomPreviewBar.js
+++ b/src/components/views/rooms/RoomPreviewBar.js
@@ -66,6 +66,7 @@ module.exports = React.createClass({
error: PropTypes.object,
canPreview: PropTypes.bool,
+ previewLoading: PropTypes.bool,
room: PropTypes.object,
// When a spinner is present, a spinnerState can be specified to indicate the
@@ -254,6 +255,8 @@ module.exports = React.createClass({
},
render: function() {
+ const Spinner = sdk.getComponent('elements.Spinner');
+
let showSpinner = false;
let darkStyle = false;
let title;
@@ -262,6 +265,7 @@ module.exports = React.createClass({
let primaryActionLabel;
let secondaryActionHandler;
let secondaryActionLabel;
+ let footer;
const messageCase = this._getMessageCase();
switch (messageCase) {
@@ -287,6 +291,14 @@ module.exports = React.createClass({
primaryActionHandler = this.onRegisterClick;
secondaryActionLabel = _t("Sign In");
secondaryActionHandler = this.onLoginClick;
+ if (this.props.previewLoading) {
+ footer = (
+
+
+ {_t("Loading room preview")}
+
+ );
+ }
break;
}
case MessageCase.Kicked: {
@@ -433,7 +445,6 @@ module.exports = React.createClass({
}
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
- const Spinner = sdk.getComponent('elements.Spinner');
let subTitleElements;
if (subTitle) {
@@ -484,6 +495,9 @@ module.exports = React.createClass({
{ secondaryButton }
{ primaryButton }
+ { footer }
+
-
+ if (nodeIndex === -1) { + focusNode = lineNode; + } else { + focusNode = lineNode.childNodes[nodeIndex]; + // make sure we have a text node + if (focusNode.nodeType === Node.ELEMENT_NODE && focusNode.firstChild) { + focusNode = focusNode.firstChild; + } + } + range.setStart(focusNode, offset); + range.collapse(true); + sel.addRange(range); +} + +function getLineAndNodePosition(model, caretPosition) { const {parts} = model; - const {index} = caretPosition; + const partIndex = caretPosition.index; + const lineResult = findNodeInLineForPart(parts, partIndex); + const {lineIndex} = lineResult; + let {nodeIndex} = lineResult; let {offset} = caretPosition; + // we're at an empty line between a newline part + // and another newline part or end/start of parts. + // set offset to 0 so it gets set to the
inside the line container + if (nodeIndex === -1) { + offset = 0; + } else { + // move caret out of uneditable part (into caret node, or empty line br) if needed + ({nodeIndex, offset} = moveOutOfUneditablePart(parts, partIndex, nodeIndex, offset)); + } + return {lineIndex, nodeIndex, offset}; +} + +function findNodeInLineForPart(parts, partIndex) { let lineIndex = 0; let nodeIndex = -1; - for (let i = 0; i <= index; ++i) { + + let prevPart = null; + // go through to parts up till (and including) the index + // to find newline parts + for (let i = 0; i <= partIndex; ++i) { const part = parts[i]; - if (part && part.type === "newline") { - if (i < index) { - lineIndex += 1; - nodeIndex = -1; - } else { - // if index points at a newline part, - // put the caret at the end of the previous part - // so it stays on the same line - const prevPart = parts[i - 1]; - offset = prevPart ? prevPart.text.length : 0; + if (part.type === "newline") { + lineIndex += 1; + nodeIndex = -1; + prevPart = null; + } else { + nodeIndex += 1; + if (needsCaretNodeBefore(part, prevPart)) { + nodeIndex += 1; + } + // only jump over caret node if we're not at our destination node already, + // as we'll assume in moveOutOfUneditablePart that nodeIndex + // refers to the node corresponding to the part, + // and not an adjacent caret node + if (i < partIndex) { + const nextPart = parts[i + 1]; + const isLastOfLine = !nextPart || nextPart.type === "newline"; + if (needsCaretNodeAfter(part, isLastOfLine)) { + nodeIndex += 1; + } + } + prevPart = part; + } + } + + return {lineIndex, nodeIndex}; +} + +function moveOutOfUneditablePart(parts, partIndex, nodeIndex, offset) { + // move caret before or after uneditable part + const part = parts[partIndex]; + if (part && !part.canEdit) { + if (offset === 0) { + nodeIndex -= 1; + const prevPart = parts[partIndex - 1]; + // if the previous node is a caret node, it's empty + // so the offset can stay at 0 + // only when it's not, we need to set the offset + // at the end of the node + if (!needsCaretNodeBefore(part, prevPart)) { + offset = prevPart.text.length; } } else { nodeIndex += 1; + offset = 0; } } - let focusNode; - const lineNode = editor.childNodes[lineIndex]; - if (lineNode) { - focusNode = lineNode.childNodes[nodeIndex]; - if (!focusNode) { - focusNode = lineNode; - } else if (focusNode.nodeType === Node.ELEMENT_NODE) { - focusNode = focusNode.childNodes[0]; - } - } - // node not found, set caret at end - if (!focusNode) { - range.selectNodeContents(editor); - range.collapse(false); - } else { - // make sure we have a text node - range.setStart(focusNode, offset); - range.collapse(true); - } - sel.addRange(range); + return {nodeIndex, offset}; } diff --git a/src/editor/deserialize.js b/src/editor/deserialize.js index 48625cba5f..6507a8dc12 100644 --- a/src/editor/deserialize.js +++ b/src/editor/deserialize.js @@ -16,73 +16,92 @@ limitations under the License. */ import { MATRIXTO_URL_PATTERN } from '../linkify-matrix'; -import { PlainPart, UserPillPart, RoomPillPart, NewlinePart } from "./parts"; import { walkDOMDepthFirst } from "./dom"; const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN); -function parseLink(a, room, client) { +function parseAtRoomMentions(text, partCreator) { + const ATROOM = "@room"; + const parts = []; + text.split(ATROOM).forEach((textPart, i, arr) => { + if (textPart.length) { + parts.push(partCreator.plain(textPart)); + } + // it's safe to never append @room after the last textPart + // as split will report an empty string at the end if + // `text` ended in @room. + const isLast = i === arr.length - 1; + if (!isLast) { + parts.push(partCreator.atRoomPill(ATROOM)); + } + }); + return parts; +} + +function parseLink(a, partCreator) { const {href} = a; const pillMatch = REGEX_MATRIXTO.exec(href) || []; const resourceId = pillMatch[1]; // The room/user ID const prefix = pillMatch[2]; // The first character of prefix switch (prefix) { case "@": - return new UserPillPart( - resourceId, - a.textContent, - room.getMember(resourceId), - ); + return partCreator.userPill(a.textContent, resourceId); case "#": - return new RoomPillPart(resourceId, client); + return partCreator.roomPill(resourceId); default: { if (href === a.textContent) { - return new PlainPart(a.textContent); + return partCreator.plain(a.textContent); } else { - return new PlainPart(`[${a.textContent}](${href})`); + return partCreator.plain(`[${a.textContent}](${href})`); } } } } -function parseCodeBlock(n) { +function parseCodeBlock(n, partCreator) { const parts = []; const preLines = ("```\n" + n.textContent + "```").split("\n"); preLines.forEach((l, i) => { - parts.push(new PlainPart(l)); + parts.push(partCreator.plain(l)); if (i < preLines.length - 1) { - parts.push(new NewlinePart("\n")); + parts.push(partCreator.newline()); } }); return parts; } -function parseElement(n, room, client) { +function parseElement(n, partCreator, state) { switch (n.nodeName) { case "A": - return parseLink(n, room, client); + return parseLink(n, partCreator); case "BR": - return new NewlinePart("\n"); + return partCreator.newline(); case "EM": - return new PlainPart(`*${n.textContent}*`); + return partCreator.plain(`*${n.textContent}*`); case "STRONG": - return new PlainPart(`**${n.textContent}**`); + return partCreator.plain(`**${n.textContent}**`); case "PRE": - return parseCodeBlock(n); + return parseCodeBlock(n, partCreator); case "CODE": - return new PlainPart(`\`${n.textContent}\``); + return partCreator.plain(`\`${n.textContent}\``); case "DEL": - return new PlainPart(`${n.textContent}`);
- case "LI":
+ return partCreator.plain(`${n.textContent}`);
+ case "LI": {
+ const indent = " ".repeat(state.listDepth - 1);
if (n.parentElement.nodeName === "OL") {
- return new PlainPart(` 1. `);
+ return partCreator.plain(`${indent}1. `);
} else {
- return new PlainPart(` - `);
+ return partCreator.plain(`${indent}- `);
}
+ }
+ case "OL":
+ case "UL":
+ state.listDepth = (state.listDepth || 0) + 1;
+ // es-lint-disable-next-line no-fallthrough
default:
// don't textify block nodes we'll decend into
if (!checkDecendInto(n)) {
- return new PlainPart(n.textContent);
+ return partCreator.plain(n.textContent);
}
}
}
@@ -125,22 +144,22 @@ function checkIgnored(n) {
return true;
}
-function prefixQuoteLines(isFirstNode, parts) {
+function prefixQuoteLines(isFirstNode, parts, partCreator) {
const PREFIX = "> ";
// a newline (to append a > to) wouldn't be added to parts for the first line
// if there was no content before the BLOCKQUOTE, so handle that
if (isFirstNode) {
- parts.splice(0, 0, new PlainPart(PREFIX));
+ parts.splice(0, 0, partCreator.plain(PREFIX));
}
for (let i = 0; i < parts.length; i += 1) {
if (parts[i].type === "newline") {
- parts.splice(i + 1, 0, new PlainPart(PREFIX));
+ parts.splice(i + 1, 0, partCreator.plain(PREFIX));
i += 1;
}
}
}
-function parseHtmlMessage(html, room, client) {
+function parseHtmlMessage(html, partCreator) {
// no nodes from parsing here should be inserted in the document,
// as scripts in event handlers, etc would be executed then.
// we're only taking text, so that is fine
@@ -148,6 +167,7 @@ function parseHtmlMessage(html, room, client) {
const parts = [];
let lastNode;
let inQuote = false;
+ const state = {};
function onNodeEnter(n) {
if (checkIgnored(n)) {
@@ -159,13 +179,13 @@ function parseHtmlMessage(html, room, client) {
const newParts = [];
if (lastNode && (checkBlockNode(lastNode) || checkBlockNode(n))) {
- newParts.push(new NewlinePart("\n"));
+ newParts.push(partCreator.newline());
}
if (n.nodeType === Node.TEXT_NODE) {
- newParts.push(new PlainPart(n.nodeValue));
+ newParts.push(...parseAtRoomMentions(n.nodeValue, partCreator));
} else if (n.nodeType === Node.ELEMENT_NODE) {
- const parseResult = parseElement(n, room, client);
+ const parseResult = parseElement(n, partCreator, state);
if (parseResult) {
if (Array.isArray(parseResult)) {
newParts.push(...parseResult);
@@ -177,14 +197,14 @@ function parseHtmlMessage(html, room, client) {
if (newParts.length && inQuote) {
const isFirstPart = parts.length === 0;
- prefixQuoteLines(isFirstPart, newParts);
+ prefixQuoteLines(isFirstPart, newParts, partCreator);
}
parts.push(...newParts);
// extra newline after quote, only if there something behind it...
if (lastNode && lastNode.nodeName === "BLOCKQUOTE") {
- parts.push(new NewlinePart("\n"));
+ parts.push(partCreator.newline());
}
lastNode = null;
return checkDecendInto(n);
@@ -194,8 +214,14 @@ function parseHtmlMessage(html, room, client) {
if (checkIgnored(n)) {
return;
}
- if (n.nodeName === "BLOCKQUOTE") {
- inQuote = false;
+ switch (n.nodeName) {
+ case "BLOCKQUOTE":
+ inQuote = false;
+ break;
+ case "OL":
+ case "UL":
+ state.listDepth -= 1;
+ break;
}
lastNode = n;
}
@@ -205,23 +231,25 @@ function parseHtmlMessage(html, room, client) {
return parts;
}
-export function parseEvent(event, room, client) {
+export function parseEvent(event, partCreator) {
const content = event.getContent();
+ let parts;
if (content.format === "org.matrix.custom.html") {
- return parseHtmlMessage(content.formatted_body || "", room, client);
+ parts = parseHtmlMessage(content.formatted_body || "", partCreator);
} else {
const body = content.body || "";
const lines = body.split("\n");
- const parts = lines.reduce((parts, line, i) => {
+ parts = lines.reduce((parts, line, i) => {
const isLast = i === lines.length - 1;
- const text = new PlainPart(line);
- const newLine = !isLast && new NewlinePart("\n");
- if (newLine) {
- return parts.concat(text, newLine);
- } else {
- return parts.concat(text);
+ const newParts = parseAtRoomMentions(line, partCreator);
+ if (!isLast) {
+ newParts.push(partCreator.newline());
}
+ return parts.concat(newParts);
}, []);
- return parts;
}
+ if (content.msgtype === "m.emote") {
+ parts.unshift(partCreator.plain("/me "));
+ }
+ return parts;
}
diff --git a/src/editor/dom.js b/src/editor/dom.js
index 3ef1df24c3..1b683c2c5e 100644
--- a/src/editor/dom.js
+++ b/src/editor/dom.js
@@ -15,6 +15,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+import {CARET_NODE_CHAR, isCaretNode} from "./render";
+
export function walkDOMDepthFirst(rootNode, enterNodeCallback, leaveNodeCallback) {
let node = rootNode.firstChild;
while (node && node !== rootNode) {
@@ -38,27 +40,54 @@ export function walkDOMDepthFirst(rootNode, enterNodeCallback, leaveNodeCallback
}
export function getCaretOffsetAndText(editor, sel) {
- let {focusNode} = sel;
- const {focusOffset} = sel;
- let caretOffset = focusOffset;
+ let {focusNode, focusOffset} = sel;
+ // sometimes focusNode is an element, and then focusOffset means
+ // the index of a child element ... - 1 🤷
+ if (focusNode.nodeType === Node.ELEMENT_NODE && focusOffset !== 0) {
+ focusNode = focusNode.childNodes[focusOffset - 1];
+ focusOffset = focusNode.textContent.length;
+ }
+ const {text, focusNodeOffset} = getTextAndFocusNodeOffset(editor, focusNode, focusOffset);
+ const caret = getCaret(focusNode, focusNodeOffset, focusOffset);
+ return {caret, text};
+}
+
+// gets the caret position details, ignoring and adjusting to
+// the ZWS if you're typing in a caret node
+function getCaret(focusNode, focusNodeOffset, focusOffset) {
+ let atNodeEnd = focusOffset === focusNode.textContent.length;
+ if (focusNode.nodeType === Node.TEXT_NODE && isCaretNode(focusNode.parentElement)) {
+ const zwsIdx = focusNode.nodeValue.indexOf(CARET_NODE_CHAR);
+ if (zwsIdx !== -1 && zwsIdx < focusOffset) {
+ focusOffset -= 1;
+ }
+ // if typing in a caret node, you're either typing before or after the ZWS.
+ // In both cases, you should be considered at node end because the ZWS is
+ // not included in the text here, and once the model is updated and rerendered,
+ // that caret node will be removed.
+ atNodeEnd = true;
+ }
+ return {offset: focusNodeOffset + focusOffset, atNodeEnd};
+}
+
+// gets the text of the editor as a string,
+// and the offset in characters where the focusNode starts in that string
+// all ZWS from caret nodes are filtered out
+function getTextAndFocusNodeOffset(editor, focusNode, focusOffset) {
+ let focusNodeOffset = 0;
let foundCaret = false;
let text = "";
- if (focusNode.nodeType === Node.ELEMENT_NODE && focusOffset !== 0) {
- focusNode = focusNode.childNodes[focusOffset - 1];
- caretOffset = focusNode.textContent.length;
- }
-
function enterNodeCallback(node) {
- const nodeText = node.nodeType === Node.TEXT_NODE && node.nodeValue;
if (!foundCaret) {
if (node === focusNode) {
foundCaret = true;
}
}
+ const nodeText = node.nodeType === Node.TEXT_NODE && getTextNodeValue(node);
if (nodeText) {
if (!foundCaret) {
- caretOffset += nodeText.length;
+ focusNodeOffset += nodeText.length;
}
text += nodeText;
}
@@ -73,14 +102,30 @@ export function getCaretOffsetAndText(editor, sel) {
if (node.tagName === "DIV" && node.nextSibling && node.nextSibling.tagName === "DIV") {
text += "\n";
if (!foundCaret) {
- caretOffset += 1;
+ focusNodeOffset += 1;
}
}
}
walkDOMDepthFirst(editor, enterNodeCallback, leaveNodeCallback);
- const atNodeEnd = sel.focusOffset === sel.focusNode.textContent.length;
- const caret = {atNodeEnd, offset: caretOffset};
- return {caret, text};
+ return {text, focusNodeOffset};
+}
+
+// get text value of text node, ignoring ZWS if it's a caret node
+function getTextNodeValue(node) {
+ const nodeText = node.nodeValue;
+ // filter out ZWS for caret nodes
+ if (isCaretNode(node.parentElement)) {
+ // typed in the caret node, so there is now something more in it than the ZWS
+ // so filter out the ZWS, and take the typed text into account
+ if (nodeText.length !== 1) {
+ return nodeText.replace(CARET_NODE_CHAR, "");
+ } else {
+ // only contains ZWS, which is ignored, so return emtpy string
+ return "";
+ }
+ } else {
+ return nodeText;
+ }
}
diff --git a/src/editor/model.js b/src/editor/model.js
index 04a56ab65b..1080df67ba 100644
--- a/src/editor/model.js
+++ b/src/editor/model.js
@@ -27,6 +27,10 @@ export default class EditorModel {
this._updateCallback = updateCallback;
}
+ clone() {
+ return new EditorModel(this._parts, this._partCreator, this._updateCallback);
+ }
+
_insertPart(index, part) {
this._parts.splice(index, 0, part);
if (this._activePartIdx >= index) {
@@ -91,7 +95,7 @@ export default class EditorModel {
const position = this.positionForOffset(diff.at, caret.atNodeEnd);
let removedOffsetDecrease = 0;
if (diff.removed) {
- removedOffsetDecrease = this._removeText(position, diff.removed.length);
+ removedOffsetDecrease = this.removeText(position, diff.removed.length);
}
let addedLen = 0;
if (diff.added) {
@@ -99,8 +103,7 @@ export default class EditorModel {
}
this._mergeAdjacentParts();
const caretOffset = diff.at - removedOffsetDecrease + addedLen;
- let newPosition = this.positionForOffset(caretOffset, true);
- newPosition = newPosition.skipUneditableParts(this._parts);
+ const newPosition = this.positionForOffset(caretOffset, true);
this._setActivePart(newPosition);
this._updateCallback(newPosition);
}
@@ -136,10 +139,9 @@ export default class EditorModel {
let pos;
if (replacePart) {
this._replacePart(this._autoCompletePartIdx, replacePart);
- let index = this._autoCompletePartIdx;
+ const index = this._autoCompletePartIdx;
if (caretOffset === undefined) {
- caretOffset = 0;
- index += 1;
+ caretOffset = replacePart.text.length;
}
pos = new DocumentPosition(index, caretOffset);
}
@@ -154,11 +156,11 @@ export default class EditorModel {
}
_mergeAdjacentParts(docPos) {
- let prevPart = this._parts[0];
- for (let i = 1; i < this._parts.length; ++i) {
+ let prevPart;
+ for (let i = 0; i < this._parts.length; ++i) {
let part = this._parts[i];
const isEmpty = !part.text.length;
- const isMerged = !isEmpty && prevPart.merge(part);
+ const isMerged = !isEmpty && prevPart && prevPart.merge(part);
if (isEmpty || isMerged) {
// remove empty or merged part
part = prevPart;
@@ -177,7 +179,7 @@ export default class EditorModel {
* @return {Number} how many characters before pos were also removed,
* usually because of non-editable parts that can only be removed in their entirety.
*/
- _removeText(pos, len) {
+ removeText(pos, len) {
let {index, offset} = pos;
let removedOffsetDecrease = 0;
while (len > 0) {
@@ -279,13 +281,4 @@ class DocumentPosition {
get offset() {
return this._offset;
}
-
- skipUneditableParts(parts) {
- const part = parts[this.index];
- if (part && !part.canEdit) {
- return new DocumentPosition(this.index + 1, 0);
- } else {
- return this;
- }
- }
}
diff --git a/src/editor/parts.js b/src/editor/parts.js
index a122c7ab7a..dc2c1e69a2 100644
--- a/src/editor/parts.js
+++ b/src/editor/parts.js
@@ -107,7 +107,7 @@ class BasePart {
}
}
-export class PlainPart extends BasePart {
+class PlainPart extends BasePart {
acceptsInsertion(chr) {
return chr !== "@" && chr !== "#" && chr !== ":" && chr !== "\n";
}
@@ -199,7 +199,7 @@ class PillPart extends BasePart {
}
}
-export class NewlinePart extends BasePart {
+class NewlinePart extends BasePart {
acceptsInsertion(chr, i) {
return (this.text.length + i) === 0 && chr === "\n";
}
@@ -235,20 +235,10 @@ export class NewlinePart extends BasePart {
}
}
-export class RoomPillPart extends PillPart {
- constructor(displayAlias, client) {
+class RoomPillPart extends PillPart {
+ constructor(displayAlias, room) {
super(displayAlias, displayAlias);
- this._room = this._findRoomByAlias(displayAlias, client);
- }
-
- _findRoomByAlias(alias, client) {
- if (alias[0] === '#') {
- return client.getRooms().find((r) => {
- return r.getAliases().includes(alias);
- });
- } else {
- return client.getRoom(alias);
- }
+ this._room = room;
}
setAvatar(node) {
@@ -270,7 +260,13 @@ export class RoomPillPart extends PillPart {
}
}
-export class UserPillPart extends PillPart {
+class AtRoomPillPart extends RoomPillPart {
+ get type() {
+ return "at-room-pill";
+ }
+}
+
+class UserPillPart extends PillPart {
constructor(userId, displayName, member) {
super(userId, displayName);
this._member = member;
@@ -311,7 +307,7 @@ export class UserPillPart extends PillPart {
}
-export class PillCandidatePart extends PlainPart {
+class PillCandidatePart extends PlainPart {
constructor(text, autoCompleteCreator) {
super(text);
this._autoCompleteCreator = autoCompleteCreator;
@@ -351,8 +347,7 @@ export class PartCreator {
updateCallback,
getAutocompleterComponent,
updateQuery,
- room,
- client,
+ this,
);
};
}
@@ -362,7 +357,7 @@ export class PartCreator {
case "#":
case "@":
case ":":
- return new PillCandidatePart("", this._autoCompleteCreator);
+ return this.pillCandidate("");
case "\n":
return new NewlinePart();
default:
@@ -371,24 +366,57 @@ export class PartCreator {
}
createDefaultPart(text) {
- return new PlainPart(text);
+ return this.plain(text);
}
deserializePart(part) {
switch (part.type) {
case "plain":
- return new PlainPart(part.text);
+ return this.plain(part.text);
case "newline":
- return new NewlinePart(part.text);
+ return this.newline();
+ case "at-room-pill":
+ return this.atRoomPill(part.text);
case "pill-candidate":
- return new PillCandidatePart(part.text, this._autoCompleteCreator);
+ return this.pillCandidate(part.text);
case "room-pill":
- return new RoomPillPart(part.text, this._client);
- case "user-pill": {
- const member = this._room.getMember(part.userId);
- return new UserPillPart(part.userId, part.text, member);
- }
+ return this.roomPill(part.text);
+ case "user-pill":
+ return this.userPill(part.text, part.userId);
}
}
+
+ plain(text) {
+ return new PlainPart(text);
+ }
+
+ newline() {
+ return new NewlinePart("\n");
+ }
+
+ pillCandidate(text) {
+ return new PillCandidatePart(text, this._autoCompleteCreator);
+ }
+
+ roomPill(alias) {
+ let room;
+ if (alias[0] === '#') {
+ room = this._client.getRooms().find((r) => {
+ return r.getAliases().includes(alias);
+ });
+ } else {
+ room = this._client.getRoom(alias);
+ }
+ return new RoomPillPart(alias, room);
+ }
+
+ atRoomPill(text) {
+ return new AtRoomPillPart(text, this._room);
+ }
+
+ userPill(displayName, userId) {
+ const member = this._room.getMember(userId);
+ return new UserPillPart(userId, displayName, member);
+ }
}
diff --git a/src/editor/render.js b/src/editor/render.js
index 58ef0eaee1..9d42bbe947 100644
--- a/src/editor/render.js
+++ b/src/editor/render.js
@@ -15,6 +15,137 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
+export function needsCaretNodeBefore(part, prevPart) {
+ const isFirst = !prevPart || prevPart.type === "newline";
+ return !part.canEdit && (isFirst || !prevPart.canEdit);
+}
+
+export function needsCaretNodeAfter(part, isLastOfLine) {
+ return !part.canEdit && isLastOfLine;
+}
+
+function insertAfter(node, nodeToInsert) {
+ const next = node.nextSibling;
+ if (next) {
+ node.parentElement.insertBefore(nodeToInsert, next);
+ } else {
+ node.parentElement.appendChild(nodeToInsert);
+ }
+}
+
+// Use a BOM marker for caret nodes.
+// On a first test, they seem to be filtered out when copying text out of the editor,
+// but this could be platform dependent.
+// As a precautionary measure, I chose the character that slate also uses.
+export const CARET_NODE_CHAR = "\ufeff";
+// a caret node is a node that allows the caret to be placed
+// where otherwise it wouldn't be possible
+// (e.g. next to a pill span without adjacent text node)
+function createCaretNode() {
+ const span = document.createElement("span");
+ span.className = "caretNode";
+ span.appendChild(document.createTextNode(CARET_NODE_CHAR));
+ return span;
+}
+
+function updateCaretNode(node) {
+ // ensure the caret node contains only a zero-width space
+ if (node.textContent !== CARET_NODE_CHAR) {
+ node.textContent = CARET_NODE_CHAR;
+ }
+}
+
+export function isCaretNode(node) {
+ return node && node.tagName === "SPAN" && node.className === "caretNode";
+}
+
+function removeNextSiblings(node) {
+ if (!node) {
+ return;
+ }
+ node = node.nextSibling;
+ while (node) {
+ const removeNode = node;
+ node = node.nextSibling;
+ removeNode.remove();
+ }
+}
+
+function removeChildren(parent) {
+ const firstChild = parent.firstChild;
+ if (firstChild) {
+ removeNextSiblings(firstChild);
+ firstChild.remove();
+ }
+}
+
+function reconcileLine(lineContainer, parts) {
+ let currentNode;
+ let prevPart;
+ const lastPart = parts[parts.length - 1];
+
+ for (const part of parts) {
+ const isFirst = !prevPart;
+ currentNode = isFirst ? lineContainer.firstChild : currentNode.nextSibling;
+
+ if (needsCaretNodeBefore(part, prevPart)) {
+ if (isCaretNode(currentNode)) {
+ updateCaretNode(currentNode);
+ currentNode = currentNode.nextSibling;
+ } else {
+ lineContainer.insertBefore(createCaretNode(), currentNode);
+ }
+ }
+ // remove nodes until matching current part
+ while (currentNode && !part.canUpdateDOMNode(currentNode)) {
+ const nextNode = currentNode.nextSibling;
+ lineContainer.removeChild(currentNode);
+ currentNode = nextNode;
+ }
+ // update or insert node for current part
+ if (currentNode && part) {
+ part.updateDOMNode(currentNode);
+ } else if (part) {
+ currentNode = part.toDOMNode();
+ // hooks up nextSibling for next iteration
+ lineContainer.appendChild(currentNode);
+ }
+
+ if (needsCaretNodeAfter(part, part === lastPart)) {
+ if (isCaretNode(currentNode.nextSibling)) {
+ currentNode = currentNode.nextSibling;
+ updateCaretNode(currentNode);
+ } else {
+ const caretNode = createCaretNode();
+ insertAfter(currentNode, caretNode);
+ currentNode = caretNode;
+ }
+ }
+
+ prevPart = part;
+ }
+
+ removeNextSiblings(currentNode);
+}
+
+function reconcileEmptyLine(lineContainer) {
+ // empty div needs to have a BR in it to give it height
+ let foundBR = false;
+ let partNode = lineContainer.firstChild;
+ while (partNode) {
+ const nextNode = partNode.nextSibling;
+ if (!foundBR && partNode.tagName === "BR") {
+ foundBR = true;
+ } else {
+ partNode.remove();
+ }
+ partNode = nextNode;
+ }
+ if (!foundBR) {
+ lineContainer.appendChild(document.createElement("br"));
+ }
+}
+
export function renderModel(editor, model) {
const lines = model.parts.reduce((lines, part) => {
if (part.type === "newline") {
@@ -25,8 +156,9 @@ export function renderModel(editor, model) {
}
return lines;
}, [[]]);
- // TODO: refactor this code, DRY it
lines.forEach((parts, i) => {
+ // find first (and remove anything else) div without className
+ // (as browsers insert these in contenteditable) line container
let lineContainer = editor.childNodes[i];
while (lineContainer && (lineContainer.tagName !== "DIV" || !!lineContainer.className)) {
editor.removeChild(lineContainer);
@@ -38,46 +170,14 @@ export function renderModel(editor, model) {
}
if (parts.length) {
- parts.forEach((part, j) => {
- let partNode = lineContainer.childNodes[j];
- while (partNode && !part.canUpdateDOMNode(partNode)) {
- lineContainer.removeChild(partNode);
- partNode = lineContainer.childNodes[j];
- }
- if (partNode && part) {
- part.updateDOMNode(partNode);
- } else if (part) {
- lineContainer.appendChild(part.toDOMNode());
- }
- });
-
- let surplusElementCount = Math.max(0, lineContainer.childNodes.length - parts.length);
- while (surplusElementCount) {
- lineContainer.removeChild(lineContainer.lastChild);
- --surplusElementCount;
- }
+ reconcileLine(lineContainer, parts);
} else {
- // empty div needs to have a BR in it to give it height
- let foundBR = false;
- let partNode = lineContainer.firstChild;
- while (partNode) {
- const nextNode = partNode.nextSibling;
- if (!foundBR && partNode.tagName === "BR") {
- foundBR = true;
- } else {
- lineContainer.removeChild(partNode);
- }
- partNode = nextNode;
- }
- if (!foundBR) {
- lineContainer.appendChild(document.createElement("br"));
- }
- }
-
- let surplusElementCount = Math.max(0, editor.childNodes.length - lines.length);
- while (surplusElementCount) {
- editor.removeChild(editor.lastChild);
- --surplusElementCount;
+ reconcileEmptyLine(lineContainer);
}
});
+ if (lines.length) {
+ removeNextSiblings(editor.children[lines.length]);
+ } else {
+ removeChildren(editor);
+ }
}
diff --git a/src/editor/serialize.js b/src/editor/serialize.js
index 73fbbe5d01..876130074c 100644
--- a/src/editor/serialize.js
+++ b/src/editor/serialize.js
@@ -24,6 +24,7 @@ export function mdSerialize(model) {
return html + "\n";
case "plain":
case "pill-candidate":
+ case "at-room-pill":
return html + part.text;
case "room-pill":
case "user-pill":
@@ -47,6 +48,7 @@ export function textSerialize(model) {
return text + "\n";
case "plain":
case "pill-candidate":
+ case "at-room-pill":
return text + part.text;
case "room-pill":
case "user-pill":
@@ -58,13 +60,11 @@ export function textSerialize(model) {
export function requiresHtml(model) {
return model.parts.some(part => {
switch (part.type) {
- case "newline":
- case "plain":
- case "pill-candidate":
- return false;
case "room-pill":
case "user-pill":
return true;
+ default:
+ return false;
}
});
}
diff --git a/src/i18n/strings/bg.json b/src/i18n/strings/bg.json
index 83e12507ca..b48232b085 100644
--- a/src/i18n/strings/bg.json
+++ b/src/i18n/strings/bg.json
@@ -1971,5 +1971,32 @@
"Invalid base_url for m.homeserver": "Невалиден base_url в m.homeserver",
"Homeserver URL does not appear to be a valid Matrix homeserver": "Homeserver адресът не изглежда да е валиден Matrix сървър",
"Invalid base_url for m.identity_server": "Невалиден base_url в m.identity_server",
- "Identity server URL does not appear to be a valid identity server": "Адресът на сървърът за самоличност не изглежда да е валиден сървър за самоличност"
+ "Identity server URL does not appear to be a valid identity server": "Адресът на сървърът за самоличност не изглежда да е валиден сървър за самоличност",
+ "Cannot reach homeserver": "Неуспешна връзка със сървъра",
+ "Ensure you have a stable internet connection, or get in touch with the server admin": "Уверете се, че интернет връзката ви е стабилна, или се свържете с администратора на сървъра",
+ "Your Riot is misconfigured": "Riot не е конфигуриран правилно",
+ "Ask your Riot admin to check your config for incorrect or duplicate entries.": "Попитайте Riot администратора да провери конфигурацията ви за неправилни или дублирани записи.",
+ "Cannot reach identity server": "Неуспешна връзка със сървъра за самоличност",
+ "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Може да се регистрирате, но някои функции няма да са достъпни докато сървъра за самоличност е офлайн. Ако продължавате да виждате това предупреждение, проверете конфигурацията или се свържете с администратора на сървъра.",
+ "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Може да възстановите паролата си, но някои функции няма да са достъпни докато сървъра за самоличност е офлайн. Ако продължавате да виждате това предупреждение, проверете конфигурацията или се свържете с администратора на сървъра.",
+ "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Може да влезете в профила си, но някои функции няма да са достъпни докато сървъра за самоличност е офлайн. Ако продължавате да виждате това предупреждение, проверете конфигурацията или се свържете с администратора на сървъра.",
+ "Unexpected error resolving identity server configuration": "Неочаквана грешка при откриване на конфигурацията на сървъра за самоличност",
+ "Use lowercase letters, numbers, dashes and underscores only": "Използвайте само малки букви, цифри, тирета и подчерта",
+ "Log in to your new account.": "Влезте в новия си профил.",
+ "You can now close this window or log in to your new account.": "Можете да затворите този прозорец или да влезете в новия си профил.",
+ "Registration Successful": "Успешна регистрация",
+ "No integrations server configured": "Не е конфигуриран сървър за интеграции",
+ "This Riot instance does not have an integrations server configured.": "Тази Riot инсталация няма конфигуриран сървър за интеграции.",
+ "Connecting to integrations server...": "Свързване към сървъра за интеграции...",
+ "Cannot connect to integrations server": "Неуспешна връзка към сървъра за интеграции",
+ "The integrations server is offline or it cannot reach your homeserver.": "Сървърът за интеграции не работи или не може да се свърже с вашия сървър.",
+ "Unnamed microphone": "Микрофон без име",
+ "Unnamed audio output": "Аудио изход без име",
+ "Unnamed camera": "Камера без име",
+ "Failed to connect to integrations server": "Неуспешно свързване със сървъра за интеграции",
+ "No integrations server is configured to manage stickers with": "Няма конфигуриран сървър за интеграции, с който да се управляват стикерите",
+ "Upload all": "Качи всички",
+ "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Новият ви профил (%(newAccountId)s) е регистриран, но вече сте влезли с друг профил (%(loggedInUserId)s).",
+ "Continue with previous account": "Продължи с предишния профил",
+ "Sign out of previous account": "Излез от предишния профил"
}
diff --git a/src/i18n/strings/cs.json b/src/i18n/strings/cs.json
index d4c0d8e799..44b991c0c9 100644
--- a/src/i18n/strings/cs.json
+++ b/src/i18n/strings/cs.json
@@ -1905,5 +1905,9 @@
"Your Riot is misconfigured": "Riot je špatně nakonfigurován",
"Ask your Riot admin to check your config for incorrect or duplicate entries.": "Zeptejte se svého administrátora, jestli by vám nezkontrolovat konfiguraci Riotu, asi obsahuje chyby nebo duplicity.",
"Unexpected error resolving identity server configuration": "Chyba při hledání konfigurace serveru identity",
- "Use lowercase letters, numbers, dashes and underscores only": "Používejte pouze malá písmena, čísla, pomlčky a podtržítka"
+ "Use lowercase letters, numbers, dashes and underscores only": "Používejte pouze malá písmena, čísla, pomlčky a podtržítka",
+ "Cannot reach identity server": "Nelze se připojit k serveru identity",
+ "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Můžete se zaregistrovat, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte administrátora serveru.",
+ "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Můžete si změnit heslo, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte administrátora serveru.",
+ "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Můžete se přihlásit, ale některé funkce nebudou dostupné dokud nezačne server identity fungovat. Pokud se vám toto varování zobrazuje pořád, tak zkontrolujte svojí konfiguraci a nebo kontaktujte administrátora serveru."
}
diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json
index 38d42e2993..a3ad566d9e 100644
--- a/src/i18n/strings/de_DE.json
+++ b/src/i18n/strings/de_DE.json
@@ -1808,5 +1808,9 @@
"Could not load user profile": "Konnte Nutzerprofil nicht laden",
"Your Matrix account": "Dein Matrixkonto",
"Your Matrix account on %(serverName)s": "Dein Matrixkonto auf %(serverName)s",
- "Show recent room avatars above the room list": "Zeige die letzten Avatare über der Raumliste an (neu laden um Änderungen zu übernehmen)"
+ "Show recent room avatars above the room list": "Zeige die letzten Avatare über der Raumliste an (neu laden um Änderungen zu übernehmen)",
+ "Email, name or Matrix ID": "E-Mail, Name oder Matrix-ID",
+ "Name or Matrix ID": "Name oder Matrix ID",
+ "Your Riot is misconfigured": "Dein Riot ist falsch konfiguriert",
+ "You cannot modify widgets in this room.": "Du kannst in diesem Raum keine Widgets verändern"
}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 53fd82f6f2..769316cd3b 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -372,7 +372,7 @@
"Decline": "Decline",
"Accept": "Accept",
"The other party cancelled the verification.": "The other party cancelled the verification.",
- "Cancel": "Cancel",
+ "OK": "OK",
"Verified!": "Verified!",
"You've successfully verified this user.": "You've successfully verified this user.",
"Secure messages with this user are end-to-end encrypted and not able to be read by third parties.": "Secure messages with this user are end-to-end encrypted and not able to be read by third parties.",
@@ -380,6 +380,7 @@
"Verify this user by confirming the following emoji appear on their screen.": "Verify this user by confirming the following emoji appear on their screen.",
"Verify this user by confirming the following number appears on their screen.": "Verify this user by confirming the following number appears on their screen.",
"Unable to find a supported verification method.": "Unable to find a supported verification method.",
+ "Cancel": "Cancel",
"For maximum security, we recommend you do this in person or use another trusted means of communication.": "For maximum security, we recommend you do this in person or use another trusted means of communication.",
"Dog": "Dog",
"Cat": "Cat",
@@ -483,6 +484,11 @@
"Email Address": "Email Address",
"Disable Notifications": "Disable Notifications",
"Enable Notifications": "Enable Notifications",
+ "No integrations server configured": "No integrations server configured",
+ "This Riot instance does not have an integrations server configured.": "This Riot instance does not have an integrations server configured.",
+ "Connecting to integrations server...": "Connecting to integrations server...",
+ "Cannot connect to integrations server": "Cannot connect to integrations server",
+ "The integrations server is offline or it cannot reach your homeserver.": "The integrations server is offline or it cannot reach your homeserver.",
"Delete Backup": "Delete Backup",
"Are you sure? You will lose your encrypted messages if your keys are not backed up properly.": "Are you sure? You will lose your encrypted messages if your keys are not backed up properly.",
"Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Encrypted messages are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.",
@@ -513,7 +519,6 @@
"An error occurred whilst saving your email notification preferences.": "An error occurred whilst saving your email notification preferences.",
"Keywords": "Keywords",
"Enter keywords separated by a comma:": "Enter keywords separated by a comma:",
- "OK": "OK",
"Failed to change settings": "Failed to change settings",
"Can't update user notification settings": "Can't update user notification settings",
"Failed to update keywords": "Failed to update keywords",
@@ -827,6 +832,7 @@
"Join the conversation with an account": "Join the conversation with an account",
"Sign Up": "Sign Up",
"Sign In": "Sign In",
+ "Loading room preview": "Loading room preview",
"You were kicked from %(roomName)s by %(memberName)s": "You were kicked from %(roomName)s by %(memberName)s",
"Reason: %(reason)s": "Reason: %(reason)s",
"Forget this room": "Forget this room",
@@ -864,6 +870,8 @@
"This Room": "This Room",
"All Rooms": "All Rooms",
"Search…": "Search…",
+ "Failed to connect to integrations server": "Failed to connect to integrations server",
+ "No integrations server is configured to manage stickers with": "No integrations server is configured to manage stickers with",
"You don't currently have any stickerpacks enabled": "You don't currently have any stickerpacks enabled",
"Add some now": "Add some now",
"Stickerpack": "Stickerpack",
@@ -918,8 +926,6 @@
"Today": "Today",
"Yesterday": "Yesterday",
"Error decrypting audio": "Error decrypting audio",
- "Agree or Disagree": "Agree or Disagree",
- "Like or Dislike": "Like or Dislike",
"Reply": "Reply",
"Edit": "Edit",
"Options": "Options",
@@ -930,6 +936,13 @@
"Invalid file%(extra)s": "Invalid file%(extra)s",
"Error decrypting image": "Error decrypting image",
"Error decrypting video": "Error decrypting video",
+ "Agree": "Agree",
+ "Disagree": "Disagree",
+ "Happy": "Happy",
+ "Party Popper": "Party Popper",
+ "Confused": "Confused",
+ "Eyes": "Eyes",
+ "Show all": "Show all",
"reacted with %(shortName)s ": "reacted with %(shortName)s ",
"%(senderDisplayName)s changed the avatar for %(roomName)s": "%(senderDisplayName)s changed the avatar for %(roomName)s",
"%(senderDisplayName)s removed the room avatar.": "%(senderDisplayName)s removed the room avatar.",
@@ -940,7 +953,7 @@
"Failed to copy": "Failed to copy",
"Add an Integration": "Add an Integration",
"You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?",
- "Edited at %(date)s": "Edited at %(date)s",
+ "Edited at %(date)s. Click to view edits.": "Edited at %(date)s. Click to view edits.",
"edited": "edited",
"Removed or unknown message type": "Removed or unknown message type",
"Message removed by %(userId)s": "Message removed by %(userId)s",
@@ -1017,7 +1030,6 @@
"Rotate Right": "Rotate Right",
"Rotate clockwise": "Rotate clockwise",
"Download this file": "Download this file",
- "Integrations Error": "Integrations Error",
"Manage Integrations": "Manage Integrations",
"%(nameList)s %(transitionList)s": "%(nameList)s %(transitionList)s",
"%(severalUsers)sjoined %(count)s times|other": "%(severalUsers)sjoined %(count)s times",
@@ -1136,7 +1148,6 @@
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.",
"Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)",
"To continue, please enter your password:": "To continue, please enter your password:",
- "password": "password",
"Verify device": "Verify device",
"Use Legacy Verification (for older clients)": "Use Legacy Verification (for older clients)",
"Verify by comparing a short text string.": "Verify by comparing a short text string.",
@@ -1187,6 +1198,7 @@
"Manually export keys": "Manually export keys",
"You'll lose access to your encrypted messages": "You'll lose access to your encrypted messages",
"Are you sure you want to sign out?": "Are you sure you want to sign out?",
+ "Message edits": "Message edits",
"If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.": "If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.",
"To help avoid duplicate issues, please view existing issues first (and add a +1) or create a new issue if you can't find it.": "To help avoid duplicate issues, please view existing issues first (and add a +1) or create a new issue if you can't find it.",
"Report bugs & give feedback": "Report bugs & give feedback",
@@ -1196,7 +1208,7 @@
"The room upgrade could not be completed": "The room upgrade could not be completed",
"Upgrade this room to version %(version)s": "Upgrade this room to version %(version)s",
"Upgrade Room Version": "Upgrade Room Version",
- "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:": "Upgrading this room requires closing down the current instance of the room and creating a new room it its place. To give room members the best possible experience, we will:",
+ "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:": "Upgrading this room requires closing down the current instance of the room and creating a new room in its place. To give room members the best possible experience, we will:",
"Create a new room with the same name, description and avatar": "Create a new room with the same name, description and avatar",
"Update any local room aliases to point to the new room": "Update any local room aliases to point to the new room",
"Stop users from speaking in the old version of the room, and post a message advising users to move to the new room": "Stop users from speaking in the old version of the room, and post a message advising users to move to the new room",
@@ -1248,6 +1260,7 @@
"Unknown devices": "Unknown devices",
"Upload files (%(current)s of %(total)s)": "Upload files (%(current)s of %(total)s)",
"Upload files": "Upload files",
+ "Upload all": "Upload all",
"Upload": "Upload",
"This file is too large to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "This file is too large to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.",
"These files are too large to upload. The file size limit is %(limit)s.": "These files are too large to upload. The file size limit is %(limit)s.",
@@ -1325,7 +1338,6 @@
"You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.": "You can use the custom server options to sign into other Matrix servers by specifying a different homeserver URL. This allows you to use this app with an existing Matrix account on a different homeserver.",
"You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.": "You can also set a custom identity server, but you won't be able to invite users by email address, or be invited by email address yourself.",
"To continue, please enter your password.": "To continue, please enter your password.",
- "Password:": "Password:",
"Please review and accept all of the homeserver's policies": "Please review and accept all of the homeserver's policies",
"Please review and accept the policies of this homeserver:": "Please review and accept the policies of this homeserver:",
"An email has been sent to %(emailAddress)s": "An email has been sent to %(emailAddress)s",
@@ -1449,8 +1461,6 @@
"Review terms and conditions": "Review terms and conditions",
"Old cryptography data detected": "Old cryptography data detected",
"Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.",
- "You are logged in to another account": "You are logged in to another account",
- "Thank you for verifying your email! The account you're logged into here (%(sessionUserId)s) appears to be different from the account you've verified an email for (%(verifiedUserId)s). If you would like to log in to %(verifiedUserId2)s, please log out first.": "Thank you for verifying your email! The account you're logged into here (%(sessionUserId)s) appears to be different from the account you've verified an email for (%(verifiedUserId)s). If you would like to log in to %(verifiedUserId2)s, please log out first.",
"Logout": "Logout",
"Your Communities": "Your Communities",
"Did you know: you can use communities to filter your Riot.im experience!": "Did you know: you can use communities to filter your Riot.im experience!",
@@ -1557,6 +1567,8 @@
"Registration has been disabled on this homeserver.": "Registration has been disabled on this homeserver.",
"Unable to query for supported registration methods.": "Unable to query for supported registration methods.",
"This server does not support authentication with a phone number.": "This server does not support authentication with a phone number.",
+ "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).",
+ "Continue with previous account": "Continue with previous account",
"Log in to your new account.": "Log in to your new account.",
"You can now close this window or log in to your new account.": "You can now close this window or log in to your new account.",
"Registration Successful": "Registration Successful",
diff --git a/src/i18n/strings/eo.json b/src/i18n/strings/eo.json
index 24d52f9331..1718b05cda 100644
--- a/src/i18n/strings/eo.json
+++ b/src/i18n/strings/eo.json
@@ -103,7 +103,7 @@
"Unknown (user, device) pair:": "Nekonata duopo (uzanto, aparato):",
"Device already verified!": "Aparato jam kontroliĝis!",
"WARNING: Device already verified, but keys do NOT MATCH!": "AVERTO: Aparato jam kontroliĝis, sed la ŝlosiloj NE KONGRUAS!",
- "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVERTO: KONTROLO DE ŜLOSILO MALSUKCESIS! Subskriba ŝlosilo por %(userId)s kaj aparato%(deviceId)s estas \"%(fprint)s\", kiu ne kongruas kun la donita ŝlosilo \"%(fingerprint)s\". Eble do via komuniko estas subaŭskultata!",
+ "WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "AVERTO: KONTROLO DE ŜLOSILO MALSUKCESIS! Subskriba ŝlosilo por %(userId)s kaj aparato%(deviceId)s estas « %(fprint)s », kiu ne kongruas kun la donita ŝlosilo « %(fingerprint)s ». Eble do via komuniko estas subaŭskultata!",
"Verified key": "Kontrolita ŝlosilo",
"The signing key you provided matches the signing key you received from %(userId)s's device %(deviceId)s. Device marked as verified.": "La donita subskriba ŝlosilo kongruas kun la ŝlosilo ricevita de %(userId)s por ĝia aparato %(deviceId)s. Aparato markita kiel kontrolita.",
"Unrecognised command:": "Nerekonita komando:",
@@ -126,7 +126,7 @@
"%(senderName)s unbanned %(targetName)s.": "%(senderName)s malbaris uzanton %(targetName)s.",
"%(senderName)s kicked %(targetName)s.": "%(senderName)s forpelis uzanton %(targetName)s.",
"%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s nuligis inviton por %(targetName)s.",
- "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ŝanĝis la temon al \"%(topic)s\".",
+ "%(senderDisplayName)s changed the topic to \"%(topic)s\".": "%(senderDisplayName)s ŝanĝis la temon al « %(topic)s ».",
"%(senderDisplayName)s removed the room name.": "%(senderDisplayName)s forigis nomon de la ĉambro.",
"%(senderDisplayName)s changed the room name to %(roomName)s.": "%(senderDisplayName)s ŝanĝis nomon de la ĉambro al %(roomName)s.",
"%(senderDisplayName)s sent an image.": "%(senderDisplayName)s sendis bildon.",
@@ -683,7 +683,7 @@
"You are currently blacklisting unverified devices; to send messages to these devices you must verify them.": "Vi nun malpermesas legadon de ĉifritaj mesaĝoj al nekontrolitaj aparatoj; por sendi mesaĝojn al tiuj, vi devas ilin kontroli.",
"We recommend you go through the verification process for each device to confirm they belong to their legitimate owner, but you can resend the message without verifying if you prefer.": "Ni rekomendas al vi bone kontroli ĉiun aparaton por certigi, ke ĝi apartenas al la verŝajna posedanto, sed vi povas resendi la mesaĝon sen kontrolo, laŭprefere.",
"Room contains unknown devices": "Ĉambro enhavas nekonatajn aparatojn",
- "\"%(RoomName)s\" contains devices that you haven't seen before.": "\"%(RoomName)s\" enhavas aparatojn, kiujn vi neniam vidis antaŭe.",
+ "\"%(RoomName)s\" contains devices that you haven't seen before.": "« %(RoomName)s » enhavas aparatojn, kiujn vi neniam vidis antaŭe.",
"Unknown devices": "Nekonataj aparatoj",
"Private Chat": "Privata babilo",
"Public Chat": "Publika babilo",
@@ -697,7 +697,7 @@
"You must register to use this functionality": "Vi devas registriĝî por uzi tiun ĉi funkcion",
"You must join the room to see its files": "Vi devas aliĝi al la ĉambro por vidi tie dosierojn",
"There are no visible files in this room": "En ĉi tiu ĉambro estas neniaj videblaj dosieroj",
- "name and avatar might not be seen by other users for up to 30 minutes.": "Ŝanĝoj al viaj komunumaj nomo kaj profilbildo eble ne montriĝos al aliaj uzantoj ĝis 30 minutoj.",
"Who can join this community?": "Kiu povas aliĝi al tiu ĉi komunumo?",
"This room is not public. You will not be able to rejoin without an invite.": "Ĉi tiu ĉambro ne estas publika. Vi ne povos realiĝi sen invito.",
- "Can't leave Server Notices room": "Ne eblas eliri el ĉambro « Server Notices »",
+ "Can't leave Server Notices room": "Ne eblas eliri el ĉambro « Server Notices »",
"Revoke invite": "Nuligi inviton",
"Invited by %(sender)s": "Invitita de %(sender)s",
"Error updating main address": "Eraro dum ĝisdatigo de la ĉefa adreso",
@@ -1547,5 +1547,55 @@
"Your Riot is misconfigured": "Via kliento Riot estas misagordita",
"All devices for this user are trusted": "Ĉiuj aparatoj de tiu ĉi uzanto estas fidataj",
"All devices in this encrypted room are trusted": "Ĉiuj aparatoj en ĉi tiu ĉifrita ĉambro estas fidataj",
- "Your key share request has been sent - please check your other devices for key share requests.": "Via peto por havigo de ŝlosilo sendiĝis – bonvolu kontroli viajn aliajn aparatojn pro petoj."
+ "Your key share request has been sent - please check your other devices for key share requests.": "Via peto por havigo de ŝlosilo sendiĝis – bonvolu kontroli viajn aliajn aparatojn pro petoj.",
+ "At this time it is not possible to reply with an emote.": "Ankoraŭ ne eblas respondi per mieno.",
+ "Joining room …": "Aliĝanta al ĉambro …",
+ "Loading …": "Enleganta …",
+ "Rejecting invite …": "Rifuzanta inviton …",
+ "Join the conversation with an account": "Aliĝu al la interparolo per konto",
+ "Sign Up": "Registriĝi",
+ "Sign In": "Saluti",
+ "You were kicked from %(roomName)s by %(memberName)s": "%(memberName)s forpelis vin de %(roomName)s",
+ "Reason: %(reason)s": "Kialo: %(reason)s",
+ "Forget this room": "Forgesi ĉi tiun ĉambron",
+ "Re-join": "Re-aliĝi",
+ "You were banned from %(roomName)s by %(memberName)s": "%(memberName)s vin forbaris de %(roomName)s",
+ "Something went wrong with your invite to %(roomName)s": "Io misokazis al via invito al %(roomName)s",
+ "%(errcode)s was returned while trying to valide your invite. You could try to pass this information on to a room admin.": "Okazis eraro %(errcode)s dum kontrolado de via invito. Eble transdonu tiun informon al ĉambrestro.",
+ "You can only join it with a working invite.": "Vi povas aliĝi nur kun funkcianta invito.",
+ "You can still join it because this is a public room.": "Tamen vi povas aliĝi, ĉar ĉi tiu ĉambro estas publika.",
+ "Join the discussion": "Aliĝi al la diskuto",
+ "Try to join anyway": "Tamen provi aliĝi",
+ "This invite to %(roomName)s wasn't sent to your account": "Ĉi tiu invito al %(roomName)s ne sendiĝis al via konto",
+ "Sign in with a different account, ask for another invite, or add the e-mail address %(email)s to this account.": "Salutu per alia konto, petu inviton, aŭ aldonu la retpoŝtadreson %(email)s al ĉi tiu konto.",
+ "Do you want to chat with %(user)s?": "Ĉu vi volas babili kun %(user)s?",
+ "Do you want to join %(roomName)s?": "Ĉu vi volas aliĝi al %(roomName)s?",
+ "submit a bug report .": "Okazis eraro %(errcode)s dum aliro al la ĉambro. Se vi pensas, ke vi mise vidas la eraron, bonvolu raporti problemon .",
+ "Never lose encrypted messages": "Neniam perdu ĉifritajn mesaĝojn",
+ "Messages in this room are secured with end-to-end encryption. Only you and the recipient(s) have the keys to read these messages.": "Mesaĝoj en ĉi tiu ĉambro estas tutvoje ĉifrataj. Nur vi kaj la ricevonto(j) havas la ŝlosilojn necesajn por ilin legi.",
+ "Securely back up your keys to avoid losing them. Learn more.": "Savkopiu sekure viajn ŝlosilojn por ilin ne perdi. Eksciu plion.",
+ "Upgrading this room will shut down the current instance of the room and create an upgraded room with the same name.": "Gradaltigo de la ĉambro forigos la nunan ĉambron kaj kreos novan kun la sama nomo.",
+ "You don't currently have any stickerpacks enabled": "Vi havas neniujn ŝaltitajn glumarkarojn",
+ "Add some now": "Iujn aldoni",
+ "Stickerpack": "Glumarkaro",
+ "Hide Stickers": "Kaŝi glumarkojn",
+ "Show Stickers": "Montri glumarkojn",
+ "Failed to revoke invite": "Malsukcesis senvalidigi inviton",
+ "Could not revoke the invite. The server may be experiencing a temporary problem or you do not have sufficient permissions to revoke the invite.": "Ne povis senvalidigi inviton. Aŭ la servilo nun trairas problemon, aŭ vi ne havas sufiĉajn permesojn.",
+ "Continue With Encryption Disabled": "Pluigi sen ĉifrado",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Ĉi tio igos vian konton daŭre neuzebla. Vi ne povos saluti, kaj neniu povos reregistri la saman identigilon de uzanto. Ĝi foririgos vian konton de ĉiuj enataj ĉambroj, kaj forigos detalojn de via konto de la identeca servilo. Tiun agon ne eblas malfari.",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "Malaktivigo de via konto implicite ne forgesigas viajn mesaĝojn al ni. Se vi volas, ke ni ilin forgesu, bonvolu marki la suban markbutonon.",
+ "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Videbleco de mesaĝoj en Matrix similas tiun de retpoŝto. Nia forgeso de viaj mesaĝoj signifas, ke ili haviĝos al neniu nova aŭ neregistrita uzanto, sed registritaj uzantoj, kiuj jam havas viajn mesaĝojn, ankoraŭ povos aliri siajn kopiaĵojn.",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Bonvolu dum malaktivigo forgesi ĉiujn mesaĝojn, kiujn mi sendis. (Averto: tio vidigos al osaj uzantoj neplenajn interparolojn.)",
+ "Use Legacy Verification (for older clients)": "Uzi malnovecan kontrolon (por malnovaj klientoj)",
+ "Verify by comparing a short text string.": "Kontrolu per komparo de mallonga teksto.",
+ "Begin Verifying": "Komenci kontrolon",
+ "Waiting for partner to accept...": "Atendanta akcepton de kunulo…",
+ "Nothing appearing? Not all clients support interactive verification yet. .": "Ĉu neniu aperas? Ankoraŭ ne ĉiuj klientoj subtenas interagan kontrolon. .",
+ "Waiting for %(userId)s to confirm...": "Atendanta konfirmon de %(userId)s…"
}
diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json
index 43e0d25d51..f0e3013090 100644
--- a/src/i18n/strings/eu.json
+++ b/src/i18n/strings/eu.json
@@ -1878,7 +1878,7 @@
"Reason: %(reason)s": "Arrazoia: %(reason)s",
"Forget this room": "Ahaztu gela hau",
"Re-join": "Berriro elkartu",
- "You were banned from %(roomName)s by %(memberName)s": "%(roomName)s gelan sartzea debekatu dizu %(memberName) erabiltzaileak",
+ "You were banned from %(roomName)s by %(memberName)s": "%(roomName)s gelan sartzea debekatu dizu %(memberName)s erabiltzaileak",
"Something went wrong with your invite to %(roomName)s": "Arazo bat egon da zure %(roomName)s gelarako gonbidapenarekin",
"%(errcode)s was returned while trying to valide your invite. You could try to pass this information on to a room admin.": "%(errcode)s jaso da zure gonbidapena balioztatzean. Saiatu informazio hau gelako administratzaileari ematen.",
"You can only join it with a working invite.": "Elkartzeko baliozko gonbidapen bat behar duzu.",
@@ -1942,5 +1942,26 @@
"Your profile": "Zure profila",
"Your Matrix account on reacted with %(shortName)s ": "%(shortName)s batekin erreakzionatu du ",
+ "If there is additional context that would help in analysing the issue, such as what you were doing at the time, room IDs, user IDs, etc., please include those things here.": "Arazoa ikertzen lagundu gaitzakeen testuinguru gehiago badago, esaterako gertatutakoan zer egiten ari zinen, gelaren ID-a, erabiltzaile ID-ak eta abar, mesedez jarri horiek hemen.",
+ "Some session data, including encrypted message keys, is missing. Sign out and sign in to fix this, restoring keys from backup.": "Saioaren datu batzuk, zifratutako mezuen gakoak barne, falta dira. Amaitu saioa eta hasi saioa berriro hau konpontzeko, gakoak babes-kopiatik berreskuratuz.",
+ "Your browser likely removed this data when running low on disk space.": "Ziur asko zure nabigatzaileak kendu ditu datu hauek diskoan leku gutxi zuelako.",
+ "This file is too large to upload. The file size limit is %(limit)s but this file is %(sizeOfThisFile)s.": "Fitxategi hau handiegia da igo ahal izateko. Fitxategiaren tamaina-muga %(limit)s da, baina fitxategi honen tamaina %(sizeOfThisFile)s da.",
+ "These files are too large to upload. The file size limit is %(limit)s.": "Fitxategi hauek handiegiak dira igotzeko. Fitxategien tamaina-muga %(limit)s da.",
+ "Some files are too large to be uploaded. The file size limit is %(limit)s.": "Fitxategi batzuk handiegiak dira igotzeko. Fitxategien tamaina-muga %(limit)s da.",
+ "A widget located at %(widgetUrl)s would like to verify your identity. By allowing this, the widget will be able to verify your user ID, but not perform actions as you.": "%(widgetUrl)s helbidean kokatutako trepeta batek zure identitatea egiaztatu nahi du. Hau baimentzen baduzu, trepetak zure erabiltzaile ID-a egiaztatu ahal izango du, baina ez zure izenean ekintzarik egin.",
+ "Riot failed to get the protocol list from the homeserver. The homeserver may be too old to support third party networks.": "Riot-ek huts egin du zure hasiera-zerbitzariaren protokoloen zerrenda eskuratzean. Agian hasiera-zerbitzaria zaharregia da hirugarrengoen sareak onartzeko.",
+ "Failed to get autodiscovery configuration from server": "Huts egin du aurkikuntza automatikoaren konfigurazioa zerbitzaritik eskuratzean",
+ "Invalid base_url for m.homeserver": "Baliogabeko base_url m.homeserver zerbitzariarentzat",
+ "Invalid base_url for m.identity_server": "Baliogabeko base_url m.identity_server zerbitzariarentzat",
+ "Log in to your new account.": "Hasi saioa zure kontu berrian.",
+ "You can now close this window or log in to your new account.": "Itxi leiho hau edo hasi saioa zure kontu berrian.",
+ "Registration Successful": "Ongi erregistratuta",
+ "Upload all": "Igo denak"
}
diff --git a/src/i18n/strings/fi.json b/src/i18n/strings/fi.json
index fbcc3d2430..21b99da142 100644
--- a/src/i18n/strings/fi.json
+++ b/src/i18n/strings/fi.json
@@ -58,8 +58,8 @@
"Attachment": "Liite",
"Autoplay GIFs and videos": "Toista GIF-animaatiot ja videot automaattisesti",
"%(senderName)s banned %(targetName)s.": "%(senderName)s antoi porttikiellon käyttäjälle %(targetName)s.",
- "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Yhdistäminen kotipalvelimeen epäonnistui. Ole hyvä ja tarkista verkkoyhteytesi ja varmista että kotipalvelimen SSL-sertifikaatti on luotettu, ja että jokin selaimen lisäosa ei estä pyyntöjen lähettämisen.",
- "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Yhdistäminen kotipalveluun HTTP:n avulla ei ole mahdollista kun selaimen osoitepalkissa on HTTPS URL. Käytä joko HTTPS tai salli turvattomat skriptit.",
+ "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Kotipalvelimeen ei saada yhteyttä. Tarkista verkkoyhteytesi, varmista että kotipalvelimesi SSL-sertifikaatti on luotettu, ja että mikään selaimen lisäosa ei estä pyyntöjen lähettämistä.",
+ "Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Yhdistäminen kotipalvelimeen HTTP:n avulla ei ole mahdollista, kun selaimen osoitepalkissa on HTTPS-osoite. Käytä joko HTTPS:ää tai salli turvattomat skriptit.",
"Can't load user settings": "Käyttäjäasetusten lataaminen epäonnistui",
"Change Password": "Muuta salasana",
"%(senderName)s changed their profile picture.": "%(senderName)s muutti profiilikuvansa.",
@@ -527,7 +527,7 @@
"Tried to load a specific point in this room's timeline, but was unable to find it.": "Huoneen aikajanan tietty hetki yritettiin ladata, mutta sitä ei löytynyt.",
"Unable to ascertain that the address this invite was sent to matches one associated with your account.": "Ei voida varmistaa että osoite, johon tämä kutsu lähetettiin, vastaa tiliisi liittettyä osoitetta.",
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (oikeustaso %(powerLevelNumber)s)",
- "Verification Pending": "Varmennus on vireillä",
+ "Verification Pending": "Varmennus odottaa",
"(could not connect media)": "(mediaa ei voitu yhdistää)",
"WARNING: Device already verified, but keys do NOT MATCH!": "VAROITUS: Laite on jo varmennettu mutta avaimet eivät vastaa toisiaan!",
"WARNING: KEY VERIFICATION FAILED! The signing key for %(userId)s and device %(deviceId)s is \"%(fprint)s\" which does not match the provided key \"%(fingerprint)s\". This could mean your communications are being intercepted!": "VAROITUS: AVAIMEN VARMENNUS EPÄONNISTUI! Käyttäjän %(userId)s ja laitteen %(deviceId)s allekirjoitusavain on \"%(fprint)s\" joka ei vastaa annettua avainta \"%(fingerprint)s\". Tämä saattaa tarkoittaa että viestintäsi siepataan!",
@@ -583,7 +583,7 @@
"Username available": "Käyttäjätunnus saatavilla",
"Username not available": "Käyttäjätunnus ei ole saatavissa",
"Something went wrong!": "Jokin meni vikaan!",
- "This will be your account name on the homeserver, or you can pick a different server.": "Tästä tulee tilisi nimi -kotipalvelimella, tai voit valita toisen palvelimen.",
+ "This will be your account name on the homeserver, or you can pick a different server.": "Tästä tulee tilisi nimi -kotipalvelimella, tai voit valita toisen palvelimen.",
"If you already have a Matrix account you can log in instead.": "Jos sinulla on jo Matrix-tili, voit kirjautua.",
"Your browser does not support the required cryptography extensions": "Selaimesi ei tue vaadittuja kryptografisia laajennuksia",
"Not a valid Riot keyfile": "Ei kelvollinen Riot-avaintiedosto",
@@ -661,7 +661,7 @@
"Ban this user?": "Anna porttikielto tälle käyttäjälle?",
"Unignore": "Huomioi käyttäjä jälleen",
"Ignore": "Jätä käyttäjä huomioimatta",
- "Jump to read receipt": "Hyppää lukukuittakseen",
+ "Jump to read receipt": "Hyppää lukukuittaukseen",
"Mention": "Mainitse",
"Invite": "Kutsu",
"User Options": "Käyttäjä-asetukset",
@@ -749,7 +749,7 @@
"Community ID": "Yhteisötunniste",
"example": "esimerkki",
"Advanced options": "Lisäasetukset",
- "Block users on other matrix homeservers from joining this room": "Salli vain tämän palvelimen käyttäjät",
+ "Block users on other matrix homeservers from joining this room": "Salli vain tämän kotipalvelimen käyttäjät",
"This setting cannot be changed later!": "Tätä asetusta ei voi muuttaa myöhemmin!",
"Add rooms to the community summary": "Lisää huoneita yhteisön yhteenvetoon",
"Which rooms would you like to add to this summary?": "Mitkä huoneet haluaisit lisätä tähän yhteenvetoon?",
@@ -816,9 +816,9 @@
"Unignored user": "Sallitut käyttäjät",
"%(userId)s from %(fromPowerLevel)s to %(toPowerLevel)s": "%(userId)s tasolta %(fromPowerLevel)s tasolle %(toPowerLevel)s",
"%(senderName)s changed the power level of %(powerLevelDiffText)s.": "%(senderName)s muutti %(powerLevelDiffText)s:n oikeustasoa.",
- "%(widgetName)s widget modified by %(senderName)s": "%(widgetName)s pienoisohjelmaa muokannut %(senderName)s",
- "%(widgetName)s widget added by %(senderName)s": "%(widgetName)s pienoisohjelman lisännyt %(senderName)s",
- "%(widgetName)s widget removed by %(senderName)s": "%(widgetName)s pienoisohjelman poistanut %(senderName)s",
+ "%(widgetName)s widget modified by %(senderName)s": "%(senderName)s muutti pienoisohjelmaa %(widgetName)s",
+ "%(widgetName)s widget added by %(senderName)s": "%(senderName)s lisäsi pienoisohjelman %(widgetName)s",
+ "%(widgetName)s widget removed by %(senderName)s": "%(senderName)s poisti pienoisohjelman %(widgetName)s",
"Send": "Lähetä",
"Delete %(count)s devices|other": "Poista %(count)s laitetta",
"Delete %(count)s devices|one": "Poista laite",
@@ -1101,7 +1101,7 @@
"%(senderName)s removed %(count)s %(removedAddresses)s as addresses for this room.|one": "%(senderName)s poisti osoitteet %(removedAddresses)s tältä huoneelta.",
"%(senderName)s set the main address for this room to %(address)s.": "%(senderName)s asetti tälle huoneelle pääosoitteen %(address)s.",
"%(senderName)s removed the main address for this room.": "%(senderName)s poisti tämän huoneen pääosoitteen.",
- "Please contact your service administrator to continue using the service.": "Otathan yhteyttä palvelun ylläpitäjään jatkaaksesi palvelun käyttöä.",
+ "Please contact your service administrator to continue using the service.": "Ota yhteyttä palvelun ylläpitäjään jatkaaksesi palvelun käyttöä.",
"Unable to connect to Homeserver. Retrying...": "Kotipalvelimeen ei saatu yhteyttä. Yritetään uudelleen...",
"User %(user_id)s does not exist": "Käyttäjää %(user_id)s ei ole olemassa",
"Avoid repeated words and characters": "Vältä toistettuja sanoja ja merkkejä",
@@ -1212,7 +1212,7 @@
"Log out and remove encryption keys?": "Kirjaudutaanko ulos ja poistetaan salausavaimet?",
"Encrypted": "Salattu",
"Changes to who can read history will only apply to future messages in this room. The visibility of existing history will be unchanged.": "Muutokset historian lukuoikeuksiin pätevät vain tuleviin viesteihin tässä huoneessa. Nykyisen historian näkyvyys pysyy muuttumattomana.",
- "Open Devtools": "Avaa Devtools",
+ "Open Devtools": "Avaa kehittäjätyökalut",
"You don't currently have any stickerpacks enabled": "Sinulla ei ole tarrapaketteja käytössä",
"Stickerpack": "Tarrapaketti",
"Hide Stickers": "Piilota tarrat",
@@ -1229,7 +1229,7 @@
"Theme": "Teema",
"Default theme": "Oletusteema",
"Account management": "Tilin hallinta",
- "Composer": "Lähetys",
+ "Composer": "Viestin kirjoitus",
"Preferences": "Valinnat",
"Voice & Video": "Ääni ja video",
"Help & About": "Ohje ja tietoja",
@@ -1451,7 +1451,7 @@
"Share User": "Jaa käyttäjä",
"Share Community": "Jaa yhteisö",
"Share Room Message": "Jaa huoneviesti",
- "Use a longer keyboard pattern with more turns": "Käytä pidempiä näppäinyhdistelmiä suuremmalla vuoromäärällä",
+ "Use a longer keyboard pattern with more turns": "Käytä pidempiä näppäinyhdistelmiä, joissa on enemmän suunnanmuutoksia",
"Changes your display nickname in the current room only": "Vaihtaa näyttönimesi vain nykyisessä huoneessa",
"Group & filter rooms by custom tags (refresh to apply changes)": "Ryhmittele ja suodata huoneita tagien perusteella (päivitä ottaaksesi muutokset käyttöön)",
"Render simple counters in room header": "Näytä yksinkertaiset laskurit huoneen yläpalkissa",
@@ -1550,7 +1550,7 @@
"Ban users": "Estä käyttäjiä",
"Remove messages": "Poista viestejä",
"Notify everyone": "Kiinnitä kaikkien huomio",
- "Send %(eventType)s events": "Lähetä %(eventType)s tapahtumaa",
+ "Send %(eventType)s events": "Lähetä %(eventType)s-tapahtumat",
"Select the roles required to change various parts of the room": "Valitse roolit, jotka vaaditaan huoneen eri osioiden vaihtamiseen",
"Enable encryption?": "Ota salaus käyttöön?",
"Once enabled, encryption for a room cannot be disabled. Messages sent in an encrypted room cannot be seen by the server, only by the participants of the room. Enabling encryption may prevent many bots and bridges from working correctly. Learn more about encryption.": "Salausta ei voi ottaa pois käytöstä käyttöönoton jälkeen. Viestejä, jotka on lähetetty salattuun huoneeseen, voidaan lukea vain huoneen jäsenten, ei palvelimen, toimesta. Salauksen käyttöönotto saattaa haitata bottien ja siltojen toimivuutta. Lisää tietoa salauksesta.",
@@ -1733,7 +1733,7 @@
"Guest access is disabled on this homeserver.": "Tämä kotipalvelin ei salli vieraiden pääsyä.",
"Failed to perform homeserver discovery": "Kotipalvelimen etsinnän suoritus epäonnistui",
"Unknown failure discovering homeserver": "Kotipalvelimen etsinnässä tapahtui tuntematon virhe",
- "This homeserver doesn't offer any login flows which are supported by this client.": "Tämä kotipalvelin ei tarjoa yhtään kirjautumistapaa, jota tämä klientti tukisi.",
+ "This homeserver doesn't offer any login flows which are supported by this client.": "Tämä kotipalvelin ei tarjoa yhtään kirjautumistapaa, jota tämä asiakasohjelma tukisi.",
"Claimed Ed25519 fingerprint key": "Väitetty Ed25519-avaimen sormenjälki",
"Set up with a Recovery Key": "Ota palautusavain käyttöön",
"Please enter your passphrase a second time to confirm.": "Syötä salalauseesi toisen kerran varmistukseksi.",
@@ -1864,5 +1864,39 @@
"Create your Matrix account on submit a bug report .": "%(errcode)s si è verificato tentando di accedere alla stanza. Se pensi che tu stia vedendo questo messaggio per errore, invia una segnalazione di errore .",
"This room has already been upgraded.": "Questa stanza è già stata aggiornata.",
- "Agree or Disagree": "",
+ "Agree or Disagree": "D'accordo o Non d'accordo",
"reacted with %(shortName)s ": "ha reagito con %(shortName)s ",
"Edited at %(date)s": "Modificato il %(date)s",
"edited": "modificato",
@@ -1942,5 +1942,33 @@
"Notification sound": "Suoni di notifica",
"Reset": "Ripristina",
"Set a new custom sound": "Imposta un nuovo suono personalizzato",
- "Browse": "Sfoglia"
+ "Browse": "Sfoglia",
+ "Cannot reach homeserver": "Impossibile raggiungere l'homeserver",
+ "Ensure you have a stable internet connection, or get in touch with the server admin": "Assicurati di avere una connessione internet stabile, o contatta l'amministratore del server",
+ "Your Riot is misconfigured": "Il tuo Riot è configurato male",
+ "Ask your Riot admin to check your config for incorrect or duplicate entries.": "Chiedi al tuo amministratore di Riot di controllare la tua configurazione per voci non valide o doppie.",
+ "Cannot reach identity server": "Impossibile raggiungere il server identità",
+ "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Puoi registrarti, ma alcune funzioni non saranno disponibili finchè il server identità non sarà tornato online. Se continui a vedere questo avviso, controlla la tua configurazione o contatta un amministratore del server.",
+ "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Puoi ripristinare la password, ma alcune funzioni non saranno disponibili finchè il server identità non sarà tornato online. Se continui a vedere questo avviso, controlla la tua configurazione o contatta un amministratore del server.",
+ "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "Puoi accedere, ma alcune funzioni non saranno disponibili finchè il server identità non sarà tornato online. Se continui a vedere questo avviso, controlla la tua configurazione o contatta un amministratore del server.",
+ "Unexpected error resolving identity server configuration": "Errore inaspettato risolvendo la configurazione del server identità",
+ "Like or Dislike": "Piace o Non piace",
+ "Use lowercase letters, numbers, dashes and underscores only": "Usa solo minuscole, numeri, trattini e trattini bassi",
+ "Upload all": "Invia tutto",
+ "Log in to your new account.": "Accedi al tuo nuovo account.",
+ "You can now close this window or log in to your new account.": "Ora puoi chiudere questa finestra o accedere al tuo nuovo account.",
+ "Registration Successful": "Registrazione riuscita",
+ "No integrations server configured": "Nessun server di integrazione configurato",
+ "This Riot instance does not have an integrations server configured.": "Questa istanza di Riot non ha un server di integrazione configurato.",
+ "Connecting to integrations server...": "Connessione al server di integrazione...",
+ "Cannot connect to integrations server": "Impossibile connettersi al server di integrazione",
+ "The integrations server is offline or it cannot reach your homeserver.": "Il server di integrazione è offline o non può raggiungere il tuo homeserver.",
+ "Unnamed microphone": "Microfono senza nome",
+ "Unnamed audio output": "Uscita audio senza nome",
+ "Unnamed camera": "Fotocamera senza nome",
+ "Failed to connect to integrations server": "Connessione al server di integrazione fallita",
+ "No integrations server is configured to manage stickers with": "Nessun server di integrazione configurato con cui gestire gli adesivi",
+ "Your new account (%(newAccountId)s) is registered, but you're already logged into a different account (%(loggedInUserId)s).": "Il tuo nuovo account (%(newAccountId)s) è registrato, ma hai già fatto l'accesso in un account diverso (%(loggedInUserId)s).",
+ "Continue with previous account": "Continua con l'account precedente",
+ "Sign out of previous account": "Disconnetti dall'account precedente"
}
diff --git a/src/i18n/strings/nl.json b/src/i18n/strings/nl.json
index bcc4cbe75e..e982fffca8 100644
--- a/src/i18n/strings/nl.json
+++ b/src/i18n/strings/nl.json
@@ -1898,5 +1898,12 @@
"Your Riot is misconfigured": "Uw Riot is verkeerd geconfigureerd",
"Ask your Riot admin to check your config for incorrect or duplicate entries.": "Vraag uw Riot-beheerder om uw configuratie na te kijken op onjuiste of duplicate items.",
"Unexpected error resolving identity server configuration": "Onverwachte fout bij het oplossen van de identiteitsserverconfiguratie",
- "Use lowercase letters, numbers, dashes and underscores only": "Gebruik enkel letters, cijfers, streepjes en underscores"
+ "Use lowercase letters, numbers, dashes and underscores only": "Gebruik enkel letters, cijfers, streepjes en underscores",
+ "Cannot reach identity server": "Kan identiteitsserver niet bereiken",
+ "You can register, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "U kunt zich registreren, maar sommige functies zullen pas beschikbaar zijn wanneer de identiteitsserver weer online is. Als u deze waarschuwing blijft zien, controleer dan uw configuratie of neem contact op met een serverbeheerder.",
+ "You can reset your password, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "U kunt uw wachtwoord opnieuw instellen, maar sommige functies zullen pas beschikbaar zijn wanneer de identiteitsserver weer online is. Als u deze waarschuwing blijft zien, controleer dan uw configuratie of neem contact op met een serverbeheerder.",
+ "You can log in, but some features will be unavailable until the identity server is back online. If you keep seeing this warning, check your configuration or contact a server admin.": "U kunt zich aanmelden, maar sommige functies zullen pas beschikbaar zijn wanneer de identiteitsserver weer online is. Als u deze waarschuwing blijft zien, controleer dan uw configuratie of neem contact op met een systeembeheerder.",
+ "Log in to your new account.": "Meld u aan met uw nieuwe account.",
+ "You can now close this window or log in to your new account.": "U kunt dit venster nu sluiten, of u aanmelden met uw nieuwe account.",
+ "Registration Successful": "Registratie geslaagd"
}
diff --git a/src/i18n/strings/pl.json b/src/i18n/strings/pl.json
index 77a058a048..71cb0087a2 100644
--- a/src/i18n/strings/pl.json
+++ b/src/i18n/strings/pl.json
@@ -907,7 +907,7 @@
"Enable email notifications": "Włącz powiadomienia e-mailowe",
"Event Type": "Typ wydarzenia",
"Download this file": "Pobierz plik",
- "Pin Message": "Przypnij Wiadomość",
+ "Pin Message": "Przypnij wiadomość",
"Failed to change settings": "Nie udało się zmienić ustawień",
"View Community": "Pokaż społeczność",
"%(count)s Members|one": "%(count)s Członek",
@@ -1461,5 +1461,9 @@
"Developer options": "Opcje programistyczne",
"Change main address for the room": "Zmienianie głównego adresu pokoju",
"Modify widgets": "Modyfikowanie widżetów",
- "Invite users": "Zapraszanie użytkowników"
+ "Invite users": "Zapraszanie użytkowników",
+ "There was an error joining the room": "Wystąpił błąd dołączając do pokoju",
+ "Joining room …": "Dołączanie do pokoju…",
+ "edited": "edytowane",
+ "Edit message": "Edytuj wiadomość"
}
diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json
index 7a873c5210..686960467e 100644
--- a/src/i18n/strings/ru.json
+++ b/src/i18n/strings/ru.json
@@ -296,7 +296,7 @@
"No more results": "Больше никаких результатов",
"No results": "Нет результатов",
"OK": "OK",
- "Only people who have been invited": "Только приглашенные участники",
+ "Only people who have been invited": "Только приглашённые участники",
"Passwords can't be empty": "Пароли не могут быть пустыми",
"%(senderName)s placed a %(callType)s call.": "%(senderName)s начал(а) %(callType)s-звонок.",
"Please check your email and click on the link it contains. Once this is done, click continue.": "Проверьте свою электронную почту и нажмите на содержащуюся ссылку. После этого нажмите кнопку Продолжить.",
@@ -336,7 +336,7 @@
"The main address for this room is": "Основной адрес этой комнаты",
"This email address is already in use": "Этот email уже используется",
"This email address was not found": "Этот адрес электронной почты не найден",
- "The email address linked to your account must be entered.": "Необходимо ввести адрес электронной почты, связанный с вашей учетной записью.",
+ "The email address linked to your account must be entered.": "Необходимо ввести адрес электронной почты, связанный с вашей учётной записью.",
"The file '%(fileName)s' failed to upload": "Не удалось отправить файл '%(fileName)s'",
"The remote side failed to pick up": "Собеседник не ответил на ваш звонок",
"This room has no local addresses": "У этой комнаты нет адресов на вашем сервере",
@@ -365,7 +365,7 @@
"numbullet": "элемент нумерованного списка",
"Can't connect to homeserver via HTTP when an HTTPS URL is in your browser bar. Either use HTTPS or enable unsafe scripts.": "Не удается подключиться к домашнему серверу через HTTP, так как в адресной строке браузера указан URL HTTPS. Используйте HTTPS или либо включите небезопасные сценарии.",
"Dismiss": "Отклонить",
- "Custom Server Options": "Выбор другого сервера",
+ "Custom Server Options": "Параметры другого сервера",
"Mute": "Приглушить",
"Operation failed": "Сбой операции",
"powered by Matrix": "основано на Matrix",
@@ -389,7 +389,7 @@
"Guest access is disabled on this Home Server.": "Гостевой доступ отключен на этом сервере.",
"Guests cannot join this room even if explicitly invited.": "Посторонние не смогут войти в эту комнату, даже если они будут приглашены.",
"Missing Media Permissions, click here to request.": "Отсутствуют разрешения, нажмите для запроса.",
- "No media permissions": "Нет разрешенных носителей",
+ "No media permissions": "Нет разрешённых носителей",
"You may need to manually permit Riot to access your microphone/webcam": "Вам необходимо предоставить Riot доступ к микрофону или веб-камере вручную",
"Anyone": "Все",
"Are you sure you want to leave the room '%(roomName)s'?": "Вы уверены, что хотите покинуть '%(roomName)s'?",
@@ -517,7 +517,7 @@
"Error decrypting image": "Ошибка расшифровки изображения",
"Error decrypting video": "Ошибка расшифровки видео",
"Add an Integration": "Добавить интеграцию",
- "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Вы будете перенаправлены на внешний сайт, чтобы войти в свою учетную запись для использования с %(integrationsUrl)s. Продолжить?",
+ "You are about to be taken to a third-party site so you can authenticate your account for use with %(integrationsUrl)s. Do you wish to continue?": "Вы будете перенаправлены на внешний сайт, чтобы войти в свою учётную запись для использования с %(integrationsUrl)s. Продолжить?",
"Removed or unknown message type": "Сообщение удалено или имеет неизвестный тип",
"URL Previews": "Предпросмотр содержимого ссылок",
"Drop file here to upload": "Перетащите файл сюда для отправки",
@@ -552,8 +552,8 @@
"Username available": "Имя пользователя доступно",
"Username not available": "Имя пользователя недоступно",
"Something went wrong!": "Что-то пошло не так!",
- "This will be your account name on the homeserver, or you can pick a different server.": "Это будет имя вашей учетной записи на домашнем сервере, или вы можете выбрать другой сервер.",
- "If you already have a Matrix account you can log in instead.": "Если у вас уже есть учетная запись Matrix, вы можете войти.",
+ "This will be your account name on the homeserver, or you can pick a different server.": "Это будет имя вашей учётной записи на домашнем сервере, или вы можете выбрать другой сервер.",
+ "If you already have a Matrix account you can log in instead.": "Если у вас уже есть учётная запись Matrix, вы можете войти.",
"Home": "Начало",
"Accept": "Принять",
"Active call (%(roomName)s)": "Текущий вызов (%(roomName)s)",
@@ -707,9 +707,9 @@
"Failed to invite the following users to %(groupId)s:": "Не удалось пригласить этих пользователей в %(groupId)s:",
"Failed to remove '%(roomName)s' from %(groupId)s": "Не удалось убрать '%(roomName)s' из %(groupId)s",
"Are you sure you want to remove '%(roomName)s' from %(groupId)s?": "Вы действительно хотите убрать '%(roomName)s' из %(groupId)s?",
- "Jump to read receipt": "Перейти к последнему прочтенному им сообщению",
+ "Jump to read receipt": "Перейти к последнему прочтённому им сообщению",
"Disable big emoji in chat": "Отключить большие Emoji в чате",
- "Message Pinning": "Закрепленные сообщения",
+ "Message Pinning": "Закреплённые сообщения",
"Remove avatar": "Удалить аватар",
"Failed to invite users to %(groupId)s": "Не удалось пригласить пользователей в %(groupId)s",
"Unable to reject invite": "Невозможно отклонить приглашение",
@@ -721,15 +721,15 @@
"Failed to add the following users to the summary of %(groupId)s:": "Не удалось добавить следующих пользователей в сводку %(groupId)s:",
"Which rooms would you like to add to this summary?": "Какие комнаты вы хотите добавить в эту сводку?",
"Room name or alias": "Название комнаты или псевдоним",
- "Pinned Messages": "Закрепленные сообщения",
- "%(senderName)s changed the pinned messages for the room.": "%(senderName)s изменил(а) закрепленные в этой комнате сообщения.",
+ "Pinned Messages": "Закреплённые сообщения",
+ "%(senderName)s changed the pinned messages for the room.": "%(senderName)s изменил(а) закреплённые в этой комнате сообщения.",
"Failed to add the following rooms to the summary of %(groupId)s:": "Не удалось добавить следующие комнаты в сводку %(groupId)s:",
"Failed to remove the room from the summary of %(groupId)s": "Не удалось удалить комнату из сводки %(groupId)s",
"The room '%(roomName)s' could not be removed from the summary.": "Комнату '%(roomName)s' не удалось удалить из сводки.",
"Failed to remove a user from the summary of %(groupId)s": "Не удалось удалить пользователя из сводки %(groupId)s",
"The user '%(displayName)s' could not be removed from the summary.": "Пользователя '%(displayName)s' не удалось удалить из сводки.",
"Light theme": "Светлая тема",
- "Dark theme": "Темная тема",
+ "Dark theme": "Тёмная тема",
"Unknown": "Неизвестно",
"Failed to add the following rooms to %(groupId)s:": "Не удалось добавить эти комнаты в %(groupId)s:",
"Matrix ID": "Matrix ID",
@@ -739,7 +739,7 @@
"You have entered an invalid address.": "Введен неправильный адрес.",
"Unpin Message": "Открепить сообщение",
"Jump to message": "Перейти к сообщению",
- "No pinned messages.": "Нет прикрепленных сообщений.",
+ "No pinned messages.": "Нет прикреплённых сообщений.",
"Loading...": "Загрузка...",
"Unnamed room": "Комната без названия",
"World readable": "Открыта для чтения",
@@ -1013,7 +1013,7 @@
"Advanced notification settings": "Дополнительные параметры уведомлений",
"Failed to send logs: ": "Не удалось отправить журналы: ",
"delete the alias.": "удалить псевдоним.",
- "To return to your account in future you need to set a password": "Чтобы вы могли вернуться в свою учетную запись в будущем, вам необходимо задать пароль",
+ "To return to your account in future you need to set a password": "Чтобы вы могли вернуться в свою учётную запись в будущем, вам необходимо задать пароль",
"Forget": "Забыть",
"#example": "#пример",
"Hide panel": "Скрыть панель",
@@ -1046,16 +1046,16 @@
"Failed to get protocol list from Home Server": "Не удалось получить список протоколов с домашнего сервера",
"Collecting app version information": "Сбор информации о версии приложения",
"Delete the room alias %(alias)s and remove %(name)s from the directory?": "Удалить псевдоним комнаты %(alias)s и удалить %(name)s из каталога?",
- "This will allow you to return to your account after signing out, and sign in on other devices.": "Это позволит вам вернуться к учетной записи после выхода из системы и войти на других устройствах.",
+ "This will allow you to return to your account after signing out, and sign in on other devices.": "Это позволит вам вернуться к учётной записи после выхода из системы и войти на других устройствах.",
"Keywords": "Ключевые слова",
- "Enable notifications for this account": "Включить уведомления для этой учетной записи",
+ "Enable notifications for this account": "Включить уведомления для этой учётной записи",
"Directory": "Каталог",
"Invite to this community": "Пригласить в это сообщество",
"Search for a room": "Поиск комнаты",
- "Messages containing keywords": "Сообщения, содержащие определенные ключевые слова",
+ "Messages containing keywords": "Сообщения, содержащие определённые ключевые слова",
"View Source": "Просмотр источника",
"Tuesday": "Вторник",
- "Enter keywords separated by a comma:": "Введите ключевые слова, разделенные запятой:",
+ "Enter keywords separated by a comma:": "Введите ключевые слова, разделённые запятой:",
"Search…": "Поиск…",
"You have successfully set a password and an email address!": "Вы успешно установили пароль и email!",
"Remove %(name)s from the directory?": "Удалить %(name)s из каталога?",
@@ -1122,7 +1122,7 @@
"Riot does not know how to join a room on this network": "Riot не знает, как присоединиться к комнате, принадлежащей к этой сети",
"Mentions only": "Только при упоминаниях",
"Wednesday": "Среда",
- "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы сможете вернуться к своей учетной записи после выхода из системы и войти на других устройствах.",
+ "You can now return to your account after signing out, and sign in on other devices.": "Теперь вы сможете вернуться к своей учётной записи после выхода из системы и войти на других устройствах.",
"Enable email notifications": "Включить уведомления на email",
"Event Type": "Тип мероприятия",
"Download this file": "Скачать файл",
@@ -1159,17 +1159,17 @@
"Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах",
"Collapse Reply Thread": "Ответить с цитированием",
"Send analytics data": "Отправить данные аналитики",
- "Muted Users": "Приглушенные пользователи",
+ "Muted Users": "Приглушённые пользователи",
"Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.",
"Terms and Conditions": "Условия и положения",
"To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.",
"Review terms and conditions": "Просмотр условий и положений",
"e.g. %(exampleValue)s": "напр. %(exampleValue)s",
"Failed to indicate account erasure": "Не удается удалить учетную запись",
- "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. Это действие необратимо.",
- "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи не приведет к удалению всех ваших сообщений. Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.",
+ "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Это навсегда сделает вашу учётную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведёт к тому, что ваша учётная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учётной записи с сервера идентификации. Это действие необратимо.",
+ "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учётной записи не приведёт к удалению всех ваших сообщений. Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.",
"Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Видимость сообщений в Matrix похожа на электронную почту. Удаление ваших сообщений означает, что отправленные вами сообщения не будут видны новым или незарегистрированным пользователям, но зарегистрированные пользователи, у которых уже есть доступ к этим сообщениям, по-прежнему будут иметь доступ к своей копии.",
- "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Пожалуйста, удалите все сообщения, которые я отправил, после деактивации учетной записи. (Внимание: будущие пользователи увидят неполный вид разговоров)",
+ "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Пожалуйста, удалите все сообщения, которые я отправил, после деактивации учётной записи. (Внимание: будущие пользователи увидят неполный вид разговоров)",
"To continue, please enter your password:": "Чтобы продолжить, введите пароль:",
"password": "пароль",
"Please help improve Riot.im by sending anonymous usage data . This will use a cookie (please see our Cookie Policy ).": "Пожалуйста, помогите улучшить Riot.im, отправляя анонимные данные использования . При этом будут использоваться cookie (ознакомьтесь с нашейПолитикой cookie ).",
@@ -1281,10 +1281,10 @@
"Sequences like abc or 6543 are easy to guess": "Последовательности типа abc или 6543 легко угадываемы",
"Recent years are easy to guess": "Последние года легко угадываемы",
"Dates are often easy to guess": "Даты часто легко угадать",
- "This is a top-10 common password": "Это топ-10 распространенных паролей",
- "This is a top-100 common password": "Это топ-100 распространенных паролей",
- "This is a very common password": "Это очень распространенный пароль",
- "This is similar to a commonly used password": "Это похоже на распространенный пароль",
+ "This is a top-10 common password": "Это топ-10 распространённых паролей",
+ "This is a top-100 common password": "Это топ-100 распространённых паролей",
+ "This is a very common password": "Это очень распространённый пароль",
+ "This is similar to a commonly used password": "Это похоже на распространённый пароль",
"A word by itself is easy to guess": "Общеупотребительные слова легко угадываемы",
"Names and surnames by themselves are easy to guess": "Имена и фамилии легко угадываемые",
"Common names and surnames are easy to guess": "Распространённые имена и фамилии легко угадываемы",
@@ -1345,7 +1345,7 @@
"Theme": "Тема",
"2018 theme": "Тема 2018 года",
"Account management": "Управление аккаунтом",
- "Deactivating your account is a permanent action - be careful!": "Деактивация вашей учетной записи — это необратимое действие. Будьте осторожны!",
+ "Deactivating your account is a permanent action - be careful!": "Деактивация вашей учётной записи — это необратимое действие. Будьте осторожны!",
"Chat with Riot Bot": "Чат с ботом Riot",
"Help & About": "Помощь & о программе",
"FAQ": "Часто задаваемые вопросы",
@@ -1353,12 +1353,12 @@
"Lazy loading is not supported by your current homeserver.": "Ленивая подгрузка не поддерживается вашим сервером.",
"Preferences": "Параметры",
"Room list": "Список комнат",
- "Timeline": "Временная шкала",
+ "Timeline": "Временна́я шкала",
"Autocomplete delay (ms)": "Задержка автодополнения (мс)",
"Roles & Permissions": "Роли и права",
"Security & Privacy": "Безопасность и конфиденциальность",
"Encryption": "Шифрование",
- "Encrypted": "Зашифрованно",
+ "Encrypted": "Зашифровано",
"Ignored users": "Игнорируемые пользователи",
"Key backup": "Резервное копирование ключей",
"Voice & Video": "Голос и видео",
@@ -1392,7 +1392,7 @@
"All keys backed up": "Все ключи сохранены",
"Developer options": "Параметры разработчика",
"General": "Общий",
- "Set a new account password...": "Установить новый пароль учетной записи...",
+ "Set a new account password...": "Установить новый пароль учётной записи...",
"Legal": "Законный",
"At this time it is not possible to reply with an emote.": "В настоящее время невозможно ответить с помощью эмоции.",
"Room avatar": "Аватар комнаты",
@@ -1435,7 +1435,7 @@
"Copy to clipboard": "Скопировать в буфер обмена",
"Download": "Скачать",
"Your Recovery Key": "Ваш ключ восстановления",
- "Create your account": "Создать учетную запись",
+ "Create your account": "Создать учётную запись",
"Your account": "Ваша учетная запись",
"Username": "Имя пользователя",
"Not sure of your password? Set a new one": "Не уверены в пароле? Установите новый",
@@ -1612,7 +1612,7 @@
"Please confirm that you'd like to go forward with upgrading this room from
- {_t(
- "This room is running room version
- {doUpgradeWarnings}
- {this.props.room.getVersion()},
- "i": (sub) => {sub},
- },
- )}
-
- {_t("Only room administrators will see this warning")}
+
);
diff --git a/src/components/views/rooms/Stickerpicker.js b/src/components/views/rooms/Stickerpicker.js
index a0e3f1b7a9..6918810842 100644
--- a/src/components/views/rooms/Stickerpicker.js
+++ b/src/components/views/rooms/Stickerpicker.js
@@ -14,12 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from 'react';
-import { _t } from '../../../languageHandler';
+import {_t, _td} from '../../../languageHandler';
import AppTile from '../elements/AppTile';
import MatrixClientPeg from '../../../MatrixClientPeg';
import Modal from '../../../Modal';
import sdk from '../../../index';
-import SdkConfig from '../../../SdkConfig';
import ScalarAuthClient from '../../../ScalarAuthClient';
import dis from '../../../dispatcher';
import AccessibleButton from '../elements/AccessibleButton';
@@ -53,6 +52,9 @@ export default class Stickerpicker extends React.Component {
this.popoverWidth = 300;
this.popoverHeight = 300;
+ // This is loaded by _acquireScalarClient on an as-needed basis.
+ this.scalarClient = null;
+
this.state = {
showStickers: false,
imError: null,
@@ -63,14 +65,34 @@ export default class Stickerpicker extends React.Component {
};
}
- _removeStickerpickerWidgets() {
+ _acquireScalarClient() {
+ if (this.scalarClient) return Promise.resolve(this.scalarClient);
+ if (ScalarAuthClient.isPossible()) {
+ this.scalarClient = new ScalarAuthClient();
+ return this.scalarClient.connect().then(() => {
+ this.forceUpdate();
+ return this.scalarClient;
+ }).catch((e) => {
+ this._imError(_td("Failed to connect to integrations server"), e);
+ });
+ } else {
+ this._imError(_td("No integrations server is configured to manage stickers with"));
+ }
+ }
+
+ async _removeStickerpickerWidgets() {
+ const scalarClient = await this._acquireScalarClient();
console.warn('Removing Stickerpicker widgets');
if (this.state.widgetId) {
- this.scalarClient.disableWidgetAssets(widgetType, this.state.widgetId).then(() => {
- console.warn('Assets disabled');
- }).catch((err) => {
- console.error('Failed to disable assets');
- });
+ if (scalarClient) {
+ scalarClient.disableWidgetAssets(widgetType, this.state.widgetId).then(() => {
+ console.warn('Assets disabled');
+ }).catch((err) => {
+ console.error('Failed to disable assets');
+ });
+ } else {
+ console.error("Cannot disable assets: no scalar client");
+ }
} else {
console.warn('No widget ID specified, not disabling assets');
}
@@ -87,19 +109,7 @@ export default class Stickerpicker extends React.Component {
// Close the sticker picker when the window resizes
window.addEventListener('resize', this._onResize);
- this.scalarClient = null;
- if (SdkConfig.get().integrations_ui_url && SdkConfig.get().integrations_rest_url) {
- this.scalarClient = new ScalarAuthClient();
- this.scalarClient.connect().then(() => {
- this.forceUpdate();
- }).catch((e) => {
- this._imError("Failed to connect to integrations server", e);
- });
- }
-
- if (!this.state.imError) {
- this.dispatcherRef = dis.register(this._onWidgetAction);
- }
+ this.dispatcherRef = dis.register(this._onWidgetAction);
// Track updates to widget state in account data
MatrixClientPeg.get().on('accountData', this._updateWidget);
@@ -126,7 +136,7 @@ export default class Stickerpicker extends React.Component {
console.error(errorMsg, e);
this.setState({
showStickers: false,
- imError: errorMsg,
+ imError: _t(errorMsg),
});
}
@@ -339,22 +349,13 @@ export default class Stickerpicker extends React.Component {
*/
_launchManageIntegrations() {
const IntegrationsManager = sdk.getComponent("views.settings.IntegrationsManager");
- this.scalarClient.connect().done(() => {
- const src = (this.scalarClient !== null && this.scalarClient.hasCredentials()) ?
- this.scalarClient.getScalarInterfaceUrlForRoom(
- this.props.room,
- 'type_' + widgetType,
- this.state.widgetId,
- ) :
- null;
- Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
- src: src,
- }, "mx_IntegrationsManager");
- this.setState({showStickers: false});
- }, (err) => {
- this.setState({imError: err});
- console.error('Error ensuring a valid scalar_token exists', err);
- });
+
+ // The integrations manager will handle scalar auth for us.
+ Modal.createTrackedDialog('Integrations Manager', '', IntegrationsManager, {
+ room: this.props.room,
+ screen: `type_${widgetType}`,
+ integrationId: this.state.widgetId,
+ }, "mx_IntegrationsManager");
}
render() {
diff --git a/src/components/views/settings/IntegrationsManager.js b/src/components/views/settings/IntegrationsManager.js
index a517771f1d..754693b73e 100644
--- a/src/components/views/settings/IntegrationsManager.js
+++ b/src/components/views/settings/IntegrationsManager.js
@@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -14,50 +15,124 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../../index';
+import { _t } from '../../../languageHandler';
+import dis from '../../../dispatcher';
+import ScalarAuthClient from '../../../ScalarAuthClient';
-const React = require('react');
-const sdk = require('../../../index');
-const MatrixClientPeg = require('../../../MatrixClientPeg');
-const dis = require('../../../dispatcher');
+export default class IntegrationsManager extends React.Component {
+ static propTypes = {
+ // the room object where the integrations manager should be opened in
+ room: PropTypes.object.isRequired,
-module.exports = React.createClass({
- displayName: 'IntegrationsManager',
+ // the screen name to open
+ screen: PropTypes.string,
- propTypes: {
- src: React.PropTypes.string.isRequired, // the source of the integration manager being embedded
- onFinished: React.PropTypes.func.isRequired, // callback when the lightbox is dismissed
- },
+ // the integration ID to open
+ integrationId: PropTypes.string,
- // XXX: keyboard shortcuts for managing dialogs should be done by the modal
- // dialog base class somehow, surely...
- componentDidMount: function() {
+ // callback when the manager is dismissed
+ onFinished: PropTypes.func.isRequired,
+ };
+
+ constructor(props) {
+ super(props);
+
+ this.state = {
+ loading: true,
+ configured: ScalarAuthClient.isPossible(),
+ connected: false, // true if a `src` is set and able to be connected to
+ src: null, // string for where to connect to
+ };
+ }
+
+ componentWillMount() {
+ if (!this.state.configured) return;
+
+ const scalarClient = new ScalarAuthClient();
+ scalarClient.connect().then(() => {
+ const hasCredentials = scalarClient.hasCredentials();
+ if (!hasCredentials) {
+ this.setState({
+ connected: false,
+ loading: false,
+ });
+ } else {
+ const src = scalarClient.getScalarInterfaceUrlForRoom(
+ this.props.room,
+ this.props.screen,
+ this.props.integrationId,
+ );
+ this.setState({
+ loading: false,
+ connected: true,
+ src: src,
+ });
+ }
+ }).catch(err => {
+ console.error(err);
+ this.setState({
+ loading: false,
+ connected: false,
+ });
+ });
+ }
+
+ componentDidMount() {
this.dispatcherRef = dis.register(this.onAction);
document.addEventListener("keydown", this.onKeyDown);
- },
+ }
- componentWillUnmount: function() {
+ componentWillUnmount() {
dis.unregister(this.dispatcherRef);
document.removeEventListener("keydown", this.onKeyDown);
- },
+ }
- onKeyDown: function(ev) {
- if (ev.keyCode == 27) { // escape
+ onKeyDown = (ev) => {
+ if (ev.keyCode === 27) { // escape
ev.stopPropagation();
ev.preventDefault();
this.props.onFinished();
}
- },
+ };
- onAction: function(payload) {
+ onAction = (payload) => {
if (payload.action === 'close_scalar') {
this.props.onFinished();
}
- },
+ };
- render: function() {
- return (
-
- );
- },
-});
+ render() {
+ if (!this.state.configured) {
+ return (
+
+
+ {_t(
+ "This room is running room version
+ {doUpgradeWarnings}
+ {this.props.room.getVersion()},
+ "i": (sub) => {sub},
+ },
+ )}
+
+ {_t("Only room administrators will see this warning")}
+
+
+ );
+ }
+
+ if (this.state.loading) {
+ const Spinner = sdk.getComponent("elements.Spinner");
+ return (
+ {_t("No integrations server configured")}
+{_t("This Riot instance does not have an integrations server configured.")}
+
+
+ );
+ }
+
+ if (!this.state.connected) {
+ return (
+ {_t("Connecting to integrations server...")}
+
+
+ );
+ }
+
+ return ;
+ }
+}
diff --git a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
index 84d70a48d4..eb85fe4e44 100644
--- a/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/VoiceUserSettingsTab.js
@@ -29,48 +29,64 @@ export default class VoiceUserSettingsTab extends React.Component {
super();
this.state = {
- mediaDevices: null,
+ mediaDevices: false,
activeAudioOutput: null,
activeAudioInput: null,
activeVideoInput: null,
};
}
- componentWillMount(): void {
- this._refreshMediaDevices();
+ async componentDidMount() {
+ const canSeeDeviceLabels = await CallMediaHandler.hasAnyLabeledDevices();
+ if (canSeeDeviceLabels) {
+ this._refreshMediaDevices();
+ }
}
_refreshMediaDevices = async (stream) => {
- if (stream) {
- // kill stream so that we don't leave it lingering around with webcam enabled etc
- // as here we called gUM to ask user for permission to their device names only
- stream.getTracks().forEach((track) => track.stop());
- }
-
this.setState({
mediaDevices: await CallMediaHandler.getDevices(),
activeAudioOutput: CallMediaHandler.getAudioOutput(),
activeAudioInput: CallMediaHandler.getAudioInput(),
activeVideoInput: CallMediaHandler.getVideoInput(),
});
+ if (stream) {
+ // kill stream (after we've enumerated the devices, otherwise we'd get empty labels again)
+ // so that we don't leave it lingering around with webcam enabled etc
+ // as here we called gUM to ask user for permission to their device names only
+ stream.getTracks().forEach((track) => track.stop());
+ }
};
- _requestMediaPermissions = () => {
- const getUserMedia = (
- window.navigator.getUserMedia || window.navigator.webkitGetUserMedia || window.navigator.mozGetUserMedia
- );
- if (getUserMedia) {
- return getUserMedia.apply(window.navigator, [
- { video: true, audio: true },
- this._refreshMediaDevices,
- function() {
- const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
- Modal.createTrackedDialog('No media permissions', '', ErrorDialog, {
- title: _t('No media permissions'),
- description: _t('You may need to manually permit Riot to access your microphone/webcam'),
- });
- },
- ]);
+ _requestMediaPermissions = async () => {
+ let constraints;
+ let stream;
+ let error;
+ try {
+ constraints = {video: true, audio: true};
+ stream = await navigator.mediaDevices.getUserMedia(constraints);
+ } catch (err) {
+ // user likely doesn't have a webcam,
+ // we should still allow to select a microphone
+ if (err.name === "NotFoundError") {
+ constraints = { audio: true };
+ try {
+ stream = await navigator.mediaDevices.getUserMedia(constraints);
+ } catch (err) {
+ error = err;
+ }
+ } else {
+ error = err;
+ }
+ }
+ if (error) {
+ const ErrorDialog = sdk.getComponent('dialogs.ErrorDialog');
+ Modal.createTrackedDialog('No media permissions', '', ErrorDialog, {
+ title: _t('No media permissions'),
+ description: _t('You may need to manually permit Riot to access your microphone/webcam'),
+ });
+ } else {
+ this._refreshMediaDevices(stream);
}
};
@@ -100,7 +116,9 @@ export default class VoiceUserSettingsTab extends React.Component {
};
_renderDeviceOptions(devices, category) {
- return devices.map((d) => );
+ return devices.map((d) => {
+ return ();
+ });
}
render() {
diff --git a/src/components/views/verification/VerificationCancelled.js b/src/components/views/verification/VerificationCancelled.js
index b21153f2cc..baace2ca1e 100644
--- a/src/components/views/verification/VerificationCancelled.js
+++ b/src/components/views/verification/VerificationCancelled.js
@@ -31,7 +31,7 @@ export default class VerificationCancelled extends React.Component {
"The other party cancelled the verification.",
)}
{_t("Cannot connect to integrations server")}
+{_t("The integrations server is offline or it cannot reach your homeserver.")}
++ if (nodeIndex === -1) { + focusNode = lineNode; + } else { + focusNode = lineNode.childNodes[nodeIndex]; + // make sure we have a text node + if (focusNode.nodeType === Node.ELEMENT_NODE && focusNode.firstChild) { + focusNode = focusNode.firstChild; + } + } + range.setStart(focusNode, offset); + range.collapse(true); + sel.addRange(range); +} + +function getLineAndNodePosition(model, caretPosition) { const {parts} = model; - const {index} = caretPosition; + const partIndex = caretPosition.index; + const lineResult = findNodeInLineForPart(parts, partIndex); + const {lineIndex} = lineResult; + let {nodeIndex} = lineResult; let {offset} = caretPosition; + // we're at an empty line between a newline part + // and another newline part or end/start of parts. + // set offset to 0 so it gets set to the
inside the line container + if (nodeIndex === -1) { + offset = 0; + } else { + // move caret out of uneditable part (into caret node, or empty line br) if needed + ({nodeIndex, offset} = moveOutOfUneditablePart(parts, partIndex, nodeIndex, offset)); + } + return {lineIndex, nodeIndex, offset}; +} + +function findNodeInLineForPart(parts, partIndex) { let lineIndex = 0; let nodeIndex = -1; - for (let i = 0; i <= index; ++i) { + + let prevPart = null; + // go through to parts up till (and including) the index + // to find newline parts + for (let i = 0; i <= partIndex; ++i) { const part = parts[i]; - if (part && part.type === "newline") { - if (i < index) { - lineIndex += 1; - nodeIndex = -1; - } else { - // if index points at a newline part, - // put the caret at the end of the previous part - // so it stays on the same line - const prevPart = parts[i - 1]; - offset = prevPart ? prevPart.text.length : 0; + if (part.type === "newline") { + lineIndex += 1; + nodeIndex = -1; + prevPart = null; + } else { + nodeIndex += 1; + if (needsCaretNodeBefore(part, prevPart)) { + nodeIndex += 1; + } + // only jump over caret node if we're not at our destination node already, + // as we'll assume in moveOutOfUneditablePart that nodeIndex + // refers to the node corresponding to the part, + // and not an adjacent caret node + if (i < partIndex) { + const nextPart = parts[i + 1]; + const isLastOfLine = !nextPart || nextPart.type === "newline"; + if (needsCaretNodeAfter(part, isLastOfLine)) { + nodeIndex += 1; + } + } + prevPart = part; + } + } + + return {lineIndex, nodeIndex}; +} + +function moveOutOfUneditablePart(parts, partIndex, nodeIndex, offset) { + // move caret before or after uneditable part + const part = parts[partIndex]; + if (part && !part.canEdit) { + if (offset === 0) { + nodeIndex -= 1; + const prevPart = parts[partIndex - 1]; + // if the previous node is a caret node, it's empty + // so the offset can stay at 0 + // only when it's not, we need to set the offset + // at the end of the node + if (!needsCaretNodeBefore(part, prevPart)) { + offset = prevPart.text.length; } } else { nodeIndex += 1; + offset = 0; } } - let focusNode; - const lineNode = editor.childNodes[lineIndex]; - if (lineNode) { - focusNode = lineNode.childNodes[nodeIndex]; - if (!focusNode) { - focusNode = lineNode; - } else if (focusNode.nodeType === Node.ELEMENT_NODE) { - focusNode = focusNode.childNodes[0]; - } - } - // node not found, set caret at end - if (!focusNode) { - range.selectNodeContents(editor); - range.collapse(false); - } else { - // make sure we have a text node - range.setStart(focusNode, offset); - range.collapse(true); - } - sel.addRange(range); + return {nodeIndex, offset}; } diff --git a/src/editor/deserialize.js b/src/editor/deserialize.js index 48625cba5f..6507a8dc12 100644 --- a/src/editor/deserialize.js +++ b/src/editor/deserialize.js @@ -16,73 +16,92 @@ limitations under the License. */ import { MATRIXTO_URL_PATTERN } from '../linkify-matrix'; -import { PlainPart, UserPillPart, RoomPillPart, NewlinePart } from "./parts"; import { walkDOMDepthFirst } from "./dom"; const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN); -function parseLink(a, room, client) { +function parseAtRoomMentions(text, partCreator) { + const ATROOM = "@room"; + const parts = []; + text.split(ATROOM).forEach((textPart, i, arr) => { + if (textPart.length) { + parts.push(partCreator.plain(textPart)); + } + // it's safe to never append @room after the last textPart + // as split will report an empty string at the end if + // `text` ended in @room. + const isLast = i === arr.length - 1; + if (!isLast) { + parts.push(partCreator.atRoomPill(ATROOM)); + } + }); + return parts; +} + +function parseLink(a, partCreator) { const {href} = a; const pillMatch = REGEX_MATRIXTO.exec(href) || []; const resourceId = pillMatch[1]; // The room/user ID const prefix = pillMatch[2]; // The first character of prefix switch (prefix) { case "@": - return new UserPillPart( - resourceId, - a.textContent, - room.getMember(resourceId), - ); + return partCreator.userPill(a.textContent, resourceId); case "#": - return new RoomPillPart(resourceId, client); + return partCreator.roomPill(resourceId); default: { if (href === a.textContent) { - return new PlainPart(a.textContent); + return partCreator.plain(a.textContent); } else { - return new PlainPart(`[${a.textContent}](${href})`); + return partCreator.plain(`[${a.textContent}](${href})`); } } } } -function parseCodeBlock(n) { +function parseCodeBlock(n, partCreator) { const parts = []; const preLines = ("```\n" + n.textContent + "```").split("\n"); preLines.forEach((l, i) => { - parts.push(new PlainPart(l)); + parts.push(partCreator.plain(l)); if (i < preLines.length - 1) { - parts.push(new NewlinePart("\n")); + parts.push(partCreator.newline()); } }); return parts; } -function parseElement(n, room, client) { +function parseElement(n, partCreator, state) { switch (n.nodeName) { case "A": - return parseLink(n, room, client); + return parseLink(n, partCreator); case "BR": - return new NewlinePart("\n"); + return partCreator.newline(); case "EM": - return new PlainPart(`*${n.textContent}*`); + return partCreator.plain(`*${n.textContent}*`); case "STRONG": - return new PlainPart(`**${n.textContent}**`); + return partCreator.plain(`**${n.textContent}**`); case "PRE": - return parseCodeBlock(n); + return parseCodeBlock(n, partCreator); case "CODE": - return new PlainPart(`\`${n.textContent}\``); + return partCreator.plain(`\`${n.textContent}\``); case "DEL": - return new PlainPart(`
HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even use 'img' tags\n
\n": "HTML por la paĝo de via komunumo
\n\n Uzu la longan priskribon por enkonduki novajn komunumanojn, aŭ disdoni iujn\n gravajn ligilojn\n
\n\n Vi povas eĉ uzi etikedojn 'img'\n
\n", + "HTML for your community's page
\n\n Use the long description to introduce new members to the community, or distribute\n some important links\n
\n\n You can even use 'img' tags\n
\n": "HTML por la paĝo de via komunumo
\n\n Uzu la longan priskribon por enkonduki novajn komunumanojn, aŭ disdoni iujn\n gravajn ligilojn\n
\n\n Vi povas eĉ uzi etikedojn « img »\n
\n", "Add rooms to the community summary": "Aldoni ĉambrojn al la komunuma superrigardo", "Which rooms would you like to add to this summary?": "Kiujn ĉambrojn vi volas aldoni al ĉi tiu superrigardo?", "Add to summary": "Aldoni al superrigardo", @@ -1146,9 +1146,9 @@ "Reversed words aren't much harder to guess": "Renversitaj vortoj ne estas multe pli malfacile konjekteblaj", "Predictable substitutions like '@' instead of 'a' don't help very much": "Facile diveneblaj anstataŭigoj, kiel '@' anstataŭ 'a', ne helpas multe", "Add another word or two. Uncommon words are better.": "Aldonu alian vorton aŭ du. Maloftaj vortoj pli bonas.", - "Repeats like \"aaa\" are easy to guess": "Ripetoj kiel \"aaa\" estas facile diveneblaj", - "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Ripetoj kiel \"abcabcabc\" estas apenaŭ pli bonaj ol nur \"abc\"", - "Sequences like abc or 6543 are easy to guess": "Sinsekvoj kiel \"abc\" aŭ \"6543\" estas facile diveneblaj", + "Repeats like \"aaa\" are easy to guess": "Ripetoj kiel « aaa » estas facile diveneblaj", + "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Ripetoj kiel « abcabcabc » estas apenaŭ pli bonaj ol nur « abc »", + "Sequences like abc or 6543 are easy to guess": "Sinsekvoj kiel « abc » aŭ « 6543 » estas facile diveneblaj", "Recent years are easy to guess": "Freŝdataj jaroj estas facile diveneblaj", "Dates are often easy to guess": "Datoj estas ofte facile diveneblaj", "This is a top-10 common password": "Ĉi tiu pasvorto estas inter la 10 plej oftaj", @@ -1396,7 +1396,7 @@ "A conference call could not be started because the integrations server is not available": "Grupa voko ne povis komenciĝi, ĉar la kuniga servilo estas neatingebla", "Replying With Files": "Respondado kun dosieroj", "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "Nun ne eblas respondi kun dosiero. Ĉu vi volas alŝuti la dosieron sen respondo?", - "The file '%(fileName)s' failed to upload.": "Malsukcesis alŝuti dosieron «%(fileName)s».", + "The file '%(fileName)s' failed to upload.": "Malsukcesis alŝuti dosieron « %(fileName)s ».", "The server does not support the room version specified.": "La servilo ne subtenas la donitan ĉambran version.", "Name or Matrix ID": "Nomo aŭ Matrix-identigilo", "Email, name or Matrix ID": "Retpoŝtadreso, nomo, aŭ Matrix-identigilo", @@ -1508,7 +1508,7 @@ "Changes made to your community