PLT-126: Change 'Private Messages' to 'Direct Messages'
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
Этот коммит содержится в:
@@ -230,7 +230,7 @@ func fireAndForgetNotifications(post *model.Post, teamId, siteURL string) {
|
|||||||
channel = result.Data.(*model.Channel)
|
channel = result.Data.(*model.Channel)
|
||||||
if channel.Type == model.CHANNEL_DIRECT {
|
if channel.Type == model.CHANNEL_DIRECT {
|
||||||
bodyText = "You have one new message."
|
bodyText = "You have one new message."
|
||||||
subjectText = "New Private Message"
|
subjectText = "New Direct Message"
|
||||||
} else {
|
} else {
|
||||||
bodyText = "You have one new mention."
|
bodyText = "You have one new mention."
|
||||||
subjectText = "New Mention"
|
subjectText = "New Mention"
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ export default class MoreDirectChannels extends React.Component {
|
|||||||
<span aria-hidden='true'>×</span>
|
<span aria-hidden='true'>×</span>
|
||||||
<span className='sr-only'>Close</span>
|
<span className='sr-only'>Close</span>
|
||||||
</button>
|
</button>
|
||||||
<h4 className='modal-title'>More Private Messages</h4>
|
<h4 className='modal-title'>More Direct Messages</h4>
|
||||||
</div>
|
</div>
|
||||||
<div className='modal-body'>
|
<div className='modal-body'>
|
||||||
<ul className='nav nav-pills nav-stacked'>
|
<ul className='nav nav-pills nav-stacked'>
|
||||||
|
|||||||
@@ -326,8 +326,8 @@ export default class PostList extends React.Component {
|
|||||||
<strong><UserProfile userId={teammate.id} /></strong>
|
<strong><UserProfile userId={teammate.id} /></strong>
|
||||||
</div>
|
</div>
|
||||||
<p className='channel-intro-text'>
|
<p className='channel-intro-text'>
|
||||||
{'This is the start of your private message history with ' + teammateName + '.'}<br/>
|
{'This is the start of your direct message history with ' + teammateName + '.'}<br/>
|
||||||
{'Private messages and files shared here are not shown to people outside this area.'}
|
{'Direct messages and files shared here are not shown to people outside this area.'}
|
||||||
</p>
|
</p>
|
||||||
<a
|
<a
|
||||||
className='intro-links'
|
className='intro-links'
|
||||||
@@ -346,7 +346,7 @@ export default class PostList extends React.Component {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className='channel-intro'>
|
<div className='channel-intro'>
|
||||||
<p className='channel-intro-text'>{'This is the start of your private message history with this teammate. Private messages and files shared here are not shown to people outside this area.'}</p>
|
<p className='channel-intro-text'>{'This is the start of your direct message history with this teammate. Direct messages and files shared here are not shown to people outside this area.'}</p>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ export default class RhsRootPost extends React.Component {
|
|||||||
var channelName;
|
var channelName;
|
||||||
if (channel) {
|
if (channel) {
|
||||||
if (channel.type === 'D') {
|
if (channel.type === 'D') {
|
||||||
channelName = 'Private Message';
|
channelName = 'Direct Message';
|
||||||
} else {
|
} else {
|
||||||
channelName = channel.display_name;
|
channelName = channel.display_name;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ export default class SearchResultsItem extends React.Component {
|
|||||||
if (channel) {
|
if (channel) {
|
||||||
channelName = channel.display_name;
|
channelName = channel.display_name;
|
||||||
if (channel.type === 'D') {
|
if (channel.type === 'D') {
|
||||||
channelName = 'Private Message';
|
channelName = 'Direct Message';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -566,7 +566,7 @@ export default class Sidebar extends React.Component {
|
|||||||
{privateChannelItems}
|
{privateChannelItems}
|
||||||
</ul>
|
</ul>
|
||||||
<ul className='nav nav-pills nav-stacked'>
|
<ul className='nav nav-pills nav-stacked'>
|
||||||
<li><h4>Private Messages</h4></li>
|
<li><h4>Direct Messages</h4></li>
|
||||||
{directMessageItems}
|
{directMessageItems}
|
||||||
{directMessageMore}
|
{directMessageMore}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
@@ -241,7 +241,7 @@ export default class NotificationsTab extends React.Component {
|
|||||||
checked={notifyActive[1]}
|
checked={notifyActive[1]}
|
||||||
onChange={this.handleNotifyRadio.bind(this, 'mention')}
|
onChange={this.handleNotifyRadio.bind(this, 'mention')}
|
||||||
>
|
>
|
||||||
Only for mentions and private messages
|
Only for mentions and direct messages
|
||||||
</input>
|
</input>
|
||||||
</label>
|
</label>
|
||||||
<br/>
|
<br/>
|
||||||
@@ -277,7 +277,7 @@ export default class NotificationsTab extends React.Component {
|
|||||||
} else {
|
} else {
|
||||||
let describe = '';
|
let describe = '';
|
||||||
if (this.state.notifyLevel === 'mention') {
|
if (this.state.notifyLevel === 'mention') {
|
||||||
describe = 'Only for mentions and private messages';
|
describe = 'Only for mentions and direct messages';
|
||||||
} else if (this.state.notifyLevel === 'none') {
|
} else if (this.state.notifyLevel === 'none') {
|
||||||
describe = 'Never';
|
describe = 'Never';
|
||||||
} else {
|
} else {
|
||||||
@@ -414,7 +414,7 @@ export default class NotificationsTab extends React.Component {
|
|||||||
</label>
|
</label>
|
||||||
<br/>
|
<br/>
|
||||||
</div>
|
</div>
|
||||||
<div><br/>{'Email notifications are sent for mentions and private messages after you have been away from ' + global.window.config.SiteName + ' for 5 minutes.'}</div>
|
<div><br/>{'Email notifications are sent for mentions and direct messages after you have been away from ' + global.window.config.SiteName + ' for 5 minutes.'}</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user