mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-11-23 09:46:09 +03:00
Code Issues Projects Releases Packages Wiki Activity

PR feedback

Browse source
This commit is contained in:
David Baker 2019-04-02 10:50:17 +01:00
parent 0add3d0825
commit b6faaf419c
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ContentMessages.js
View file

@ -321,6 +321,8 @@ export default class ContentMessages {
getUploadLimit() { getUploadLimit() {
if (this._mediaConfig !== null && this._mediaConfig["m.upload.size"] !== undefined) { if (this._mediaConfig !== null && this._mediaConfig["m.upload.size"] !== undefined) {
return this._mediaConfig["m.upload.size"]; return this._mediaConfig["m.upload.size"];
} else {
return null;
} }
} }
@ -338,8 +340,8 @@ export default class ContentMessages {
title: _t('Replying With Files'), title: _t('Replying With Files'),
description: ( description: (
<div>{_t( <div>{_t(
'At this time it is not possible to reply with a file ' + 'At this time it is not possible to reply with a file. ' +
'so this will be sent without being a reply.', 'Would you like to upload this file without replying?',
)}</div> )}</div>
), ),
hasCancelButton: true, hasCancelButton: true,

28
src/components/structures/RoomView.js
View file

@ -20,27 +20,27 @@ limitations under the License.
// - Search results component // - Search results component
// - Drag and drop // - Drag and drop
import shouldHideEvent from "../../shouldHideEvent"; import shouldHideEvent from '../../shouldHideEvent';
const React = require("react"); import React from 'react';
const ReactDOM = require("react-dom"); import ReactDOM from 'react-dom';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import Promise from 'bluebird'; import Promise from 'bluebird';
import filesize from 'filesize'; import filesize from 'filesize';
const classNames = require("classnames"); import classNames from 'classnames';
import { _t } from '../../languageHandler'; import { _t } from '../../languageHandler';
import {RoomPermalinkCreator} from "../../matrix-to"; import {RoomPermalinkCreator} from '../../matrix-to';
const MatrixClientPeg = require("../../MatrixClientPeg"); import MatrixClientPeg from '../../MatrixClientPeg';
import ContentMessages from '../../ContentMessages'; import ContentMessages from '../../ContentMessages';
const Modal = require("../../Modal"); import Modal from '../../Modal';
const sdk = require('../../index'); import sdk from '../../index';
const CallHandler = require('../../CallHandler'); import CallHandler from '../../CallHandler';
const dis = require("../../dispatcher"); import dis from '../../dispatcher';
const Tinter = require("../../Tinter"); import Tinter from '../../Tinter';
const rate_limited_func = require('../../ratelimitedfunc'); import rate_limited_func from '../../ratelimitedfunc';
const ObjectUtils = require('../../ObjectUtils'); import ObjectUtils from '../../ObjectUtils';
const Rooms = require('../../Rooms'); import Rooms from '../../Rooms';
import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard'; import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';

2
src/i18n/strings/en_EN.json
View file

@ -41,7 +41,7 @@
"Permission Required": "Permission Required", "Permission Required": "Permission Required",
"You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room", "You do not have permission to start a conference call in this room": "You do not have permission to start a conference call in this room",
"Replying With Files": "Replying With Files", "Replying With Files": "Replying With Files",
"At this time it is not possible to reply with a file so this will be sent without being a reply.": "At this time it is not possible to reply with a file so this will be sent without being a reply.", "At this time it is not possible to reply with a file. Would you like to upload this file without replying?": "At this time it is not possible to reply with a file. Would you like to upload this file without replying?",
"Continue": "Continue", "Continue": "Continue",
"The file '%(fileName)s' failed to upload.": "The file '%(fileName)s' failed to upload.", "The file '%(fileName)s' failed to upload.": "The file '%(fileName)s' failed to upload.",
"The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "The file '%(fileName)s' exceeds this homeserver's size limit for uploads", "The file '%(fileName)s' exceeds this homeserver's size limit for uploads": "The file '%(fileName)s' exceeds this homeserver's size limit for uploads",