소스 검색

Updates copy info with parltcipant name info if available.

master
damencho 6 년 전
부모
커밋
9bde673397
2개의 변경된 파일19개의 추가작업 그리고 4개의 파일을 삭제
  1. 3
    1
      lang/main.json
  2. 16
    3
      react/features/invite/components/info-dialog/web/InfoDialog.js

+ 3
- 1
lang/main.json 파일 보기

357
         "inviteLiveStream": "To view the live stream of this meeting, click this link: __url__",
357
         "inviteLiveStream": "To view the live stream of this meeting, click this link: __url__",
358
         "invitePhone": "One tap audio Dial In: __number__,,__conferenceID__#",
358
         "invitePhone": "One tap audio Dial In: __number__,,__conferenceID__#",
359
         "invitePhoneAlternatives": "Looking for a different dial in number? Please see: __url__",
359
         "invitePhoneAlternatives": "Looking for a different dial in number? Please see: __url__",
360
-        "inviteURL": "You are invited to join a meeting.\n__moreInfo__\nJoin meeting: __url__\n",
360
+        "inviteURLFirstPartGeneral": "You are invited to join a meeting.",
361
+        "inviteURLFirstPartPersonal": "__name__ is inviting you to a meeting.",
362
+        "inviteURLSecondPart": "\n__moreInfo__\nJoin meeting: __url__\n",
361
         "inviteURLMoreInfo": "Meeting ID: __conferenceID__#\n",
363
         "inviteURLMoreInfo": "Meeting ID: __conferenceID__#\n",
362
         "liveStreamURL": "Live stream:",
364
         "liveStreamURL": "Live stream:",
363
         "moreNumbers": "More numbers",
365
         "moreNumbers": "More numbers",

+ 16
- 3
react/features/invite/components/info-dialog/web/InfoDialog.js 파일 보기

8
 import { Dialog } from '../../../../base/dialog';
8
 import { Dialog } from '../../../../base/dialog';
9
 import { translate } from '../../../../base/i18n';
9
 import { translate } from '../../../../base/i18n';
10
 import { connect } from '../../../../base/redux';
10
 import { connect } from '../../../../base/redux';
11
-import { isLocalParticipantModerator } from '../../../../base/participants';
11
+import {
12
+    isLocalParticipantModerator,
13
+    getLocalParticipant
14
+} from '../../../../base/participants';
12
 
15
 
13
 import { _getDefaultPhoneNumber, getDialInfoPageURL } from '../../../functions';
16
 import { _getDefaultPhoneNumber, getDialInfoPageURL } from '../../../functions';
14
 import DialInNumber from './DialInNumber';
17
 import DialInNumber from './DialInNumber';
42
      */
45
      */
43
     _inviteURL: string,
46
     _inviteURL: string,
44
 
47
 
48
+    /**
49
+     * The redux representation of the local participant.
50
+     */
51
+    _localParticipant: Object,
52
+
45
     /**
53
     /**
46
      * The current location url of the conference.
54
      * The current location url of the conference.
47
      */
55
      */
293
      * @returns {string}
301
      * @returns {string}
294
      */
302
      */
295
     _getTextToCopy() {
303
     _getTextToCopy() {
296
-        const { liveStreamViewURL, t } = this.props;
304
+        const { _localParticipant, liveStreamViewURL, t } = this.props;
297
         const shouldDisplayDialIn = this._shouldDisplayDialIn();
305
         const shouldDisplayDialIn = this._shouldDisplayDialIn();
298
         const moreInfo
306
         const moreInfo
299
             = shouldDisplayDialIn
307
             = shouldDisplayDialIn
300
                 ? t('info.inviteURLMoreInfo', { conferenceID: this.props.dialIn.conferenceID })
308
                 ? t('info.inviteURLMoreInfo', { conferenceID: this.props.dialIn.conferenceID })
301
                 : '';
309
                 : '';
302
 
310
 
303
-        let invite = t('info.inviteURL', {
311
+        let invite = _localParticipant && _localParticipant.name
312
+            ? t('info.inviteURLFirstPartPersonal', { name: _localParticipant.name })
313
+            : t('info.inviteURLFirstPartGeneral');
314
+
315
+        invite += t('info.inviteURLSecondPart', {
304
             url: this.props._inviteURL,
316
             url: this.props._inviteURL,
305
             moreInfo
317
             moreInfo
306
         });
318
         });
580
         _conference: conference,
592
         _conference: conference,
581
         _conferenceName: room,
593
         _conferenceName: room,
582
         _inviteURL: getInviteURL(state),
594
         _inviteURL: getInviteURL(state),
595
+        _localParticipant: getLocalParticipant(state),
583
         _locationURL: state['features/base/connection'].locationURL,
596
         _locationURL: state['features/base/connection'].locationURL,
584
         _locked: locked,
597
         _locked: locked,
585
         _password: password
598
         _password: password

Loading…
취소
저장