Merge branch 'master' into PLT-1429
Этот коммит содержится в:
=Corey Hulen
@@ -11,6 +11,8 @@ import Constants from '../utils/constants.jsx';
|
||||
import TeamStore from '../stores/team_store.jsx';
|
||||
import * as EventHelpers from '../dispatcher/event_helpers.jsx';
|
||||
|
||||
import {FormattedMessage, FormattedHTMLMessage, FormattedDate} from 'mm-intl';
|
||||
|
||||
export function createChannelIntroMessage(channel) {
|
||||
if (channel.type === 'D') {
|
||||
return createDMIntroMessage(channel);
|
||||
@@ -48,8 +50,13 @@ export function createDMIntroMessage(channel) {
|
||||
</strong>
|
||||
</div>
|
||||
<p className='channel-intro-text'>
|
||||
{'This is the start of your direct message history with ' + teammateName + '.'}<br/>
|
||||
{'Direct messages and files shared here are not shown to people outside this area.'}
|
||||
<FormattedHTMLMessage
|
||||
id='intro_messages.DM'
|
||||
defaultMessage='This is the start of your direct message history with {teammate}.<br />Direct messages and files shared here are not shown to people outside this area.'
|
||||
values={{
|
||||
teammate: teammateName
|
||||
}}
|
||||
/>
|
||||
</p>
|
||||
{createSetHeaderButton(channel)}
|
||||
</div>
|
||||
@@ -58,7 +65,12 @@ export function createDMIntroMessage(channel) {
|
||||
|
||||
return (
|
||||
<div className='channel-intro'>
|
||||
<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>
|
||||
<p className='channel-intro-text'>
|
||||
<FormattedMessage
|
||||
id='intro_messages.teammate'
|
||||
defaultMessage='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>
|
||||
);
|
||||
}
|
||||
@@ -66,11 +78,13 @@ export function createDMIntroMessage(channel) {
|
||||
export function createOffTopicIntroMessage(channel) {
|
||||
return (
|
||||
<div className='channel-intro'>
|
||||
<h4 className='channel-intro__title'>{'Beginning of ' + channel.display_name}</h4>
|
||||
<p className='channel-intro__content'>
|
||||
{'This is the start of ' + channel.display_name + ', a channel for non-work-related conversations.'}
|
||||
<br/>
|
||||
</p>
|
||||
<FormattedHTMLMessage
|
||||
id='intro_messages.offTopic'
|
||||
defaultMessage='<h4 class="channel-intro__title">Beginning of {display_name}</h4><p class="channel-intro__content">This is the start of {display_name}, a channel for non-work-related conversations.<br/></p>'
|
||||
values={{
|
||||
display_name: channel.display_name
|
||||
}}
|
||||
/>
|
||||
{createSetHeaderButton(channel)}
|
||||
{createInviteChannelMemberButton(channel, 'channel')}
|
||||
</div>
|
||||
@@ -87,7 +101,11 @@ export function createDefaultIntroMessage(channel) {
|
||||
href='#'
|
||||
onClick={EventHelpers.showInviteMemberModal}
|
||||
>
|
||||
<i className='fa fa-user-plus'></i>{'Invite others to this team'}
|
||||
<i className='fa fa-user-plus'></i>
|
||||
<FormattedMessage
|
||||
id='intro_messages.inviteOthers'
|
||||
defaultMessage='Invite others to this team'
|
||||
/>
|
||||
</a>
|
||||
);
|
||||
} else {
|
||||
@@ -97,19 +115,24 @@ export function createDefaultIntroMessage(channel) {
|
||||
href='#'
|
||||
onClick={EventHelpers.showGetTeamInviteLinkModal}
|
||||
>
|
||||
<i className='fa fa-user-plus'></i>{'Invite others to this team'}
|
||||
<i className='fa fa-user-plus'></i>
|
||||
<FormattedMessage
|
||||
id='intro_messages.inviteOthers'
|
||||
defaultMessage='Invite others to this team'
|
||||
/>
|
||||
</a>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className='channel-intro'>
|
||||
<h4 className='channel-intro__title'>{'Beginning of ' + channel.display_name}</h4>
|
||||
<p className='channel-intro__content'>
|
||||
<strong>{'Welcome to ' + channel.display_name + '!'}</strong>
|
||||
<br/><br/>
|
||||
{'This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.'}
|
||||
</p>
|
||||
<FormattedHTMLMessage
|
||||
id='intro_messages.default'
|
||||
defaultMessage="<h4 class='channel-intro__title'>Beginning of {display_name}</h4><p class='channel-intro__content'><strong>Welcome to {display_name}!'</strong><br/><br/>This is the first channel teammates see when they sign up - use it for posting updates everyone needs to know.</p>"
|
||||
values={{
|
||||
display_name: channel.display_name
|
||||
}}
|
||||
/>
|
||||
{inviteModalLink}
|
||||
{createSetHeaderButton(channel)}
|
||||
<br/>
|
||||
@@ -124,33 +147,83 @@ export function createStandardIntroMessage(channel) {
|
||||
var uiType;
|
||||
var memberMessage;
|
||||
if (channel.type === 'P') {
|
||||
uiType = 'private group';
|
||||
memberMessage = ' Only invited members can see this private group.';
|
||||
uiType = (
|
||||
<FormattedMessage
|
||||
id='intro_messages.group'
|
||||
defaultMessage='private group'
|
||||
/>
|
||||
);
|
||||
memberMessage = (
|
||||
<FormattedMessage
|
||||
id='intro_messages.onlyInvited'
|
||||
defaultMessage=' Only invited members can see this private group.'
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
uiType = 'channel';
|
||||
memberMessage = ' Any member can join and read this channel.';
|
||||
uiType = (
|
||||
<FormattedMessage
|
||||
id='intro_messages.channel'
|
||||
defaultMessage='channel'
|
||||
/>
|
||||
);
|
||||
memberMessage = (
|
||||
<FormattedMessage
|
||||
id='intro_messages.anyMember'
|
||||
defaultMessage=' Any member can join and read this channel.'
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
const date = (
|
||||
<FormattedDate
|
||||
value={channel.create_at}
|
||||
month='long'
|
||||
day='2-digit'
|
||||
year='numeric'
|
||||
/>
|
||||
);
|
||||
|
||||
var createMessage;
|
||||
if (creatorName === '') {
|
||||
createMessage = 'This is the start of the ' + uiName + ' ' + uiType + ', created on ' + Utils.displayDate(channel.create_at) + '.';
|
||||
createMessage = (
|
||||
<FormattedMessage
|
||||
id='intro_messages.noCreator'
|
||||
defaultMessage='This is the start of the {name} {type}, created on {date}.'
|
||||
values={{
|
||||
name: (uiName),
|
||||
type: (uiType),
|
||||
date: (date)
|
||||
}}
|
||||
/>
|
||||
);
|
||||
} else {
|
||||
createMessage = (
|
||||
<span>
|
||||
{'This is the start of the '}
|
||||
<strong>{uiName}</strong>
|
||||
{' '}
|
||||
{uiType}{', created by '}
|
||||
<strong>{creatorName}</strong>
|
||||
{' on '}
|
||||
<strong>{Utils.displayDate(channel.create_at)}</strong>
|
||||
<FormattedHTMLMessage
|
||||
id='intro_messages.creator'
|
||||
defaultMessage='This is the start of the <strong>{name}</strong> {type}, created by <strong>{creator}</strong> on <strong>{date}</strong>'
|
||||
values={{
|
||||
name: (uiName),
|
||||
type: (uiType),
|
||||
date: (date),
|
||||
creator: creatorName
|
||||
}}
|
||||
/>
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<div className='channel-intro'>
|
||||
<h4 className='channel-intro__title'>{'Beginning of ' + uiName}</h4>
|
||||
<h4 className='channel-intro__title'>
|
||||
<FormattedMessage
|
||||
id='intro_messages.beginning'
|
||||
defaultMessage='Beginning of {name}'
|
||||
values={{
|
||||
name: (uiName)
|
||||
}}
|
||||
/>
|
||||
</h4>
|
||||
<p className='channel-intro__content'>
|
||||
{createMessage}
|
||||
{memberMessage}
|
||||
@@ -169,7 +242,14 @@ function createInviteChannelMemberButton(channel, uiType) {
|
||||
dialogType={ChannelInviteModal}
|
||||
dialogProps={{channel}}
|
||||
>
|
||||
<i className='fa fa-user-plus'></i>{'Invite others to this ' + uiType}
|
||||
<i className='fa fa-user-plus'></i>
|
||||
<FormattedMessage
|
||||
id='intro_messages.invite'
|
||||
defaultMessage='Invite others to this {type}'
|
||||
values={{
|
||||
type: (uiType)
|
||||
}}
|
||||
/>
|
||||
</ToggleModalButton>
|
||||
);
|
||||
}
|
||||
@@ -181,7 +261,11 @@ function createSetHeaderButton(channel) {
|
||||
dialogType={EditChannelHeaderModal}
|
||||
dialogProps={{channel}}
|
||||
>
|
||||
<i className='fa fa-pencil'></i>{'Set a header'}
|
||||
<i className='fa fa-pencil'></i>
|
||||
<FormattedMessage
|
||||
id='intro_messages.setHeader'
|
||||
defaultMessage='Set a Header'
|
||||
/>
|
||||
</ToggleModalButton>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,16 +0,0 @@
|
||||
// GENERATED FILE
|
||||
"use strict";
|
||||
|
||||
Object.defineProperty(exports, "__esModule", {
|
||||
value: true
|
||||
});
|
||||
exports["default"] = [{ "locale": "en", "pluralRuleFunction": function pluralRuleFunction(n, ord) {
|
||||
var s = String(n).split("."),
|
||||
v0 = !s[1],
|
||||
t0 = Number(s[0]) == n,
|
||||
n10 = t0 && s[0].slice(-1),
|
||||
n100 = t0 && s[0].slice(-2);if (ord) return n10 == 1 && n100 != 11 ? "one" : n10 == 2 && n100 != 12 ? "two" : n10 == 3 && n100 != 13 ? "few" : "other";return n == 1 && v0 ? "one" : "other";
|
||||
}, "fields": { "year": { "displayName": "Year", "relative": { "0": "this year", "1": "next year", "-1": "last year" }, "relativeTime": { "future": { "one": "in {0} year", "other": "in {0} years" }, "past": { "one": "{0} year ago", "other": "{0} years ago" } } }, "month": { "displayName": "Month", "relative": { "0": "this month", "1": "next month", "-1": "last month" }, "relativeTime": { "future": { "one": "in {0} month", "other": "in {0} months" }, "past": { "one": "{0} month ago", "other": "{0} months ago" } } }, "day": { "displayName": "Day", "relative": { "0": "today", "1": "tomorrow", "-1": "yesterday" }, "relativeTime": { "future": { "one": "in {0} day", "other": "in {0} days" }, "past": { "one": "{0} day ago", "other": "{0} days ago" } } }, "hour": { "displayName": "Hour", "relativeTime": { "future": { "one": "in {0} hour", "other": "in {0} hours" }, "past": { "one": "{0} hour ago", "other": "{0} hours ago" } } }, "minute": { "displayName": "Minute", "relativeTime": { "future": { "one": "in {0} minute", "other": "in {0} minutes" }, "past": { "one": "{0} minute ago", "other": "{0} minutes ago" } } }, "second": { "displayName": "Second", "relative": { "0": "now" }, "relativeTime": { "future": { "one": "in {0} second", "other": "in {0} seconds" }, "past": { "one": "{0} second ago", "other": "{0} seconds ago" } } } } }, { "locale": "en-001", "parentLocale": "en" }, { "locale": "en-150", "parentLocale": "en-GB" }, { "locale": "en-GB", "parentLocale": "en-001" }, { "locale": "en-AG", "parentLocale": "en-001" }, { "locale": "en-AI", "parentLocale": "en-001" }, { "locale": "en-AS", "parentLocale": "en" }, { "locale": "en-AU", "parentLocale": "en-GB", "fields": { "year": { "displayName": "Year", "relative": { "0": "This year", "1": "Next year", "-1": "Last year" }, "relativeTime": { "future": { "one": "in {0} year", "other": "in {0} years" }, "past": { "one": "{0} year ago", "other": "{0} years ago" } } }, "month": { "displayName": "Month", "relative": { "0": "This month", "1": "Next month", "-1": "Last month" }, "relativeTime": { "future": { "one": "in {0} month", "other": "in {0} months" }, "past": { "one": "{0} month ago", "other": "{0} months ago" } } }, "day": { "displayName": "Day", "relative": { "0": "today", "1": "tomorrow", "-1": "yesterday" }, "relativeTime": { "future": { "one": "in {0} day", "other": "in {0} days" }, "past": { "one": "{0} day ago", "other": "{0} days ago" } } }, "hour": { "displayName": "Hour", "relativeTime": { "future": { "one": "in {0} hour", "other": "in {0} hours" }, "past": { "one": "{0} hour ago", "other": "{0} hours ago" } } }, "minute": { "displayName": "Minute", "relativeTime": { "future": { "one": "in {0} minute", "other": "in {0} minutes" }, "past": { "one": "{0} minute ago", "other": "{0} minutes ago" } } }, "second": { "displayName": "Second", "relative": { "0": "now" }, "relativeTime": { "future": { "one": "in {0} second", "other": "in {0} seconds" }, "past": { "one": "{0} second ago", "other": "{0} seconds ago" } } } } }, { "locale": "en-BB", "parentLocale": "en-001" }, { "locale": "en-BE", "parentLocale": "en-GB" }, { "locale": "en-BM", "parentLocale": "en-001" }, { "locale": "en-BS", "parentLocale": "en-001" }, { "locale": "en-BW", "parentLocale": "en-001" }, { "locale": "en-BZ", "parentLocale": "en-001" }, { "locale": "en-CA", "parentLocale": "en" }, { "locale": "en-CC", "parentLocale": "en-001" }, { "locale": "en-CK", "parentLocale": "en-001" }, { "locale": "en-CM", "parentLocale": "en-001" }, { "locale": "en-CX", "parentLocale": "en-001" }, { "locale": "en-DG", "parentLocale": "en-GB" }, { "locale": "en-DM", "parentLocale": "en-001" }, { "locale": "en-Dsrt", "pluralRuleFunction": function pluralRuleFunction(n, ord) {
|
||||
if (ord) return "other";return "other";
|
||||
}, "fields": { "year": { "displayName": "Year", "relative": { "0": "this year", "1": "next year", "-1": "last year" }, "relativeTime": { "future": { "other": "+{0} y" }, "past": { "other": "-{0} y" } } }, "month": { "displayName": "Month", "relative": { "0": "this month", "1": "next month", "-1": "last month" }, "relativeTime": { "future": { "other": "+{0} m" }, "past": { "other": "-{0} m" } } }, "day": { "displayName": "Day", "relative": { "0": "today", "1": "tomorrow", "-1": "yesterday" }, "relativeTime": { "future": { "other": "+{0} d" }, "past": { "other": "-{0} d" } } }, "hour": { "displayName": "Hour", "relativeTime": { "future": { "other": "+{0} h" }, "past": { "other": "-{0} h" } } }, "minute": { "displayName": "Minute", "relativeTime": { "future": { "other": "+{0} min" }, "past": { "other": "-{0} min" } } }, "second": { "displayName": "Second", "relative": { "0": "now" }, "relativeTime": { "future": { "other": "+{0} s" }, "past": { "other": "-{0} s" } } } } }, { "locale": "en-ER", "parentLocale": "en-001" }, { "locale": "en-FJ", "parentLocale": "en-001" }, { "locale": "en-FK", "parentLocale": "en-GB" }, { "locale": "en-FM", "parentLocale": "en-001" }, { "locale": "en-GD", "parentLocale": "en-001" }, { "locale": "en-GG", "parentLocale": "en-GB" }, { "locale": "en-GH", "parentLocale": "en-001" }, { "locale": "en-GI", "parentLocale": "en-GB" }, { "locale": "en-GM", "parentLocale": "en-001" }, { "locale": "en-GU", "parentLocale": "en" }, { "locale": "en-GY", "parentLocale": "en-001" }, { "locale": "en-HK", "parentLocale": "en-GB" }, { "locale": "en-IE", "parentLocale": "en-GB" }, { "locale": "en-IM", "parentLocale": "en-GB" }, { "locale": "en-IN", "parentLocale": "en-GB" }, { "locale": "en-IO", "parentLocale": "en-GB" }, { "locale": "en-JE", "parentLocale": "en-GB" }, { "locale": "en-JM", "parentLocale": "en-001" }, { "locale": "en-KE", "parentLocale": "en-001" }, { "locale": "en-KI", "parentLocale": "en-001" }, { "locale": "en-KN", "parentLocale": "en-001" }, { "locale": "en-KY", "parentLocale": "en-001" }, { "locale": "en-LC", "parentLocale": "en-001" }, { "locale": "en-LR", "parentLocale": "en-001" }, { "locale": "en-LS", "parentLocale": "en-001" }, { "locale": "en-MG", "parentLocale": "en-001" }, { "locale": "en-MH", "parentLocale": "en" }, { "locale": "en-MO", "parentLocale": "en-GB" }, { "locale": "en-MP", "parentLocale": "en" }, { "locale": "en-MS", "parentLocale": "en-001" }, { "locale": "en-MT", "parentLocale": "en-GB" }, { "locale": "en-MU", "parentLocale": "en-001" }, { "locale": "en-MW", "parentLocale": "en-001" }, { "locale": "en-MY", "parentLocale": "en-001" }, { "locale": "en-NA", "parentLocale": "en-001" }, { "locale": "en-NF", "parentLocale": "en-001" }, { "locale": "en-NG", "parentLocale": "en-001" }, { "locale": "en-NR", "parentLocale": "en-001" }, { "locale": "en-NU", "parentLocale": "en-001" }, { "locale": "en-NZ", "parentLocale": "en-GB" }, { "locale": "en-PG", "parentLocale": "en-001" }, { "locale": "en-PH", "parentLocale": "en-001" }, { "locale": "en-PK", "parentLocale": "en-GB" }, { "locale": "en-PN", "parentLocale": "en-001" }, { "locale": "en-PR", "parentLocale": "en" }, { "locale": "en-PW", "parentLocale": "en-001" }, { "locale": "en-RW", "parentLocale": "en-001" }, { "locale": "en-SB", "parentLocale": "en-001" }, { "locale": "en-SC", "parentLocale": "en-001" }, { "locale": "en-SD", "parentLocale": "en-001" }, { "locale": "en-SG", "parentLocale": "en-GB" }, { "locale": "en-SH", "parentLocale": "en-GB" }, { "locale": "en-SL", "parentLocale": "en-001" }, { "locale": "en-SS", "parentLocale": "en-001" }, { "locale": "en-SX", "parentLocale": "en-001" }, { "locale": "en-SZ", "parentLocale": "en-001" }, { "locale": "en-TC", "parentLocale": "en-001" }, { "locale": "en-TK", "parentLocale": "en-001" }, { "locale": "en-TO", "parentLocale": "en-001" }, { "locale": "en-TT", "parentLocale": "en-001" }, { "locale": "en-TV", "parentLocale": "en-001" }, { "locale": "en-TZ", "parentLocale": "en-001" }, { "locale": "en-UG", "parentLocale": "en-001" }, { "locale": "en-UM", "parentLocale": "en" }, { "locale": "en-US", "parentLocale": "en" }, { "locale": "en-US-POSIX", "parentLocale": "en-US" }, { "locale": "en-VC", "parentLocale": "en-001" }, { "locale": "en-VG", "parentLocale": "en-GB" }, { "locale": "en-VI", "parentLocale": "en" }, { "locale": "en-VU", "parentLocale": "en-001" }, { "locale": "en-WS", "parentLocale": "en-001" }, { "locale": "en-ZA", "parentLocale": "en-001" }, { "locale": "en-ZM", "parentLocale": "en-001" }, { "locale": "en-ZW", "parentLocale": "en-001" }];
|
||||
module.exports = exports["default"];
|
||||
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
Ссылка в новой задаче
Block a user