matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-08-06 10:22:45 +03:00
Code Activity

Review comments

Browse Source
This commit is contained in:
Kegan Dougal
2017-06-08 14:45:59 +01:00
parent e3ac78bd28
commit f2efdf8a4f
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/views/rooms/AuxPanel.js
View File

@@ -96,8 +96,8 @@ module.exports = React.createClass({
else { else {
joinText = (<span> joinText = (<span>
{_tJsx( {_tJsx(
"Join as <a>voice</a> or <a>video</a>.", "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
[/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/], [/<voiceText>(.*?)<\/voiceText>/, /<videoText>(.*?)<\/videoText>/],
[ [
(sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}} href="#">{sub}</a>, (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'voice');}} href="#">{sub}</a>,
(sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video');}} href="#">{sub}</a>, (sub) => <a onClick={(event)=>{ this.onConferenceNotificationClick(event, 'video');}} href="#">{sub}</a>,

4
src/components/views/rooms/RoomPreviewBar.js
View File

@@ -138,8 +138,8 @@ module.exports = React.createClass({
</div> </div>
<div className="mx_RoomPreviewBar_join_text"> <div className="mx_RoomPreviewBar_join_text">
{ _tJsx( { _tJsx(
'Would you like to <a>accept</a> or <a>decline</a> this invitation?', 'Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?',
[/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/], [/<acceptText>(.*?)<\/acceptText>/, /<declineText>(.*?)<\/declineText>/],
[ [
(sub) => <a onClick={ this.props.onJoinClick }>{sub}</a>, (sub) => <a onClick={ this.props.onJoinClick }>{sub}</a>,
(sub) => <a onClick={ this.props.onRejectClick }>{sub}</a> (sub) => <a onClick={ this.props.onRejectClick }>{sub}</a>

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

@@ -754,7 +754,7 @@ module.exports = React.createClass({
if (this.state.join_rule === "public" && aliasCount == 0) { if (this.state.join_rule === "public" && aliasCount == 0) {
addressWarning = addressWarning =
<div className="mx_RoomSettings_warning"> <div className="mx_RoomSettings_warning">
{ _tJsx( { _tJsx(
'To link to a room it must have <a>an address</a>.', 'To link to a room it must have <a>an address</a>.',
/<a>(.*?)<\/a>/, /<a>(.*?)<\/a>/,
(sub) => <a href="#addresses">{sub}</a> (sub) => <a href="#addresses">{sub}</a>

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

@@ -365,7 +365,7 @@
"'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias",
"%(displayName)s is typing": "%(displayName)s is typing", "%(displayName)s is typing": "%(displayName)s is typing",
"Sign in with": "Sign in with", "Sign in with": "Sign in with",
"Join as <a>voice</a> or <a>video</a>.": "Join as <a>voice</a> or <a>video</a>.", "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.": "Join as <voiceText>voice</voiceText> or <videoText>video</videoText>.",
"Join Room": "Join Room", "Join Room": "Join Room",
"joined and left": "joined and left", "joined and left": "joined and left",
"joined": "joined", "joined": "joined",
@@ -647,7 +647,7 @@
"Who would you like to communicate with?": "Who would you like to communicate with?", "Who would you like to communicate with?": "Who would you like to communicate with?",
"Searching known users": "Searching known users", "Searching known users": "Searching known users",
"%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.", "%(senderName)s withdrew %(targetName)s's invitation.": "%(senderName)s withdrew %(targetName)s's invitation.",
"Would you like to <a>accept</a> or <a>decline</a> this invitation?": "Would you like to <a>accept</a> or <a>decline</a> this invitation?", "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?",
"You already have existing direct chats with this user:": "You already have existing direct chats with this user:", "You already have existing direct chats with this user:": "You already have existing direct chats with this user:",
"You are already in a call.": "You are already in a call.", "You are already in a call.": "You are already in a call.",
"You're not in any rooms yet! Press": "You're not in any rooms yet! Press", "You're not in any rooms yet! Press": "You're not in any rooms yet! Press",