Change dialog button property keys

react/features/base/dialog/components/web/StatelessDialog.js

@@ -239,7 +239,7 @@ class StatelessDialog extends Component<Props> {
                 key = 'cancel'
                 onClick = { this._onCancel }
                 type = 'button'>
-                { t(this.props.cancelTitleKey || 'dialog.Cancel') }
+                { t(this.props.cancelKey || 'dialog.Cancel') }
             </Button>
         );
     }
@@ -268,7 +268,7 @@ class StatelessDialog extends Component<Props> {
                 key = 'submit'
                 onClick = { this._onSubmit }
                 type = 'button'>
-                { t(this.props.okTitleKey || 'dialog.Ok') }
+                { t(this.props.okKey || 'dialog.Ok') }
             </Button>
         );
     }

react/features/base/dialog/constants.js

@@ -10,7 +10,7 @@ export type DialogProps = {
     /**
      * Optional i18n key to change the cancel button title.
      */
-    cancelTitleKey: string,
+    cancelKey: string,
 
     /**
      * The React {@code Component} children which represents the dialog's body.
@@ -25,7 +25,7 @@ export type DialogProps = {
     /**
      * Optional i18n key to change the ok button title.
      */
-    okTitleKey: string,
+    okKey: string,
 
     /**
      * The handler for onCancel event.

react/features/desktop-picker/components/DesktopPicker.js

@@ -189,7 +189,7 @@ class DesktopPicker extends PureComponent<Props, State> {
             <Dialog
                 isModal = { false }
                 okDisabled = { Boolean(!this.state.selectedSource.id) }
-                okTitleKey = 'dialog.Share'
+                okKey = 'dialog.Share'
                 onCancel = { this._onCloseModal }
                 onSubmit = { this._onSubmit }
                 titleKey = 'dialog.shareYourScreen'

react/features/feedback/components/FeedbackDialog.web.js

@@ -228,7 +228,7 @@ class FeedbackDialog extends Component<Props, State> {
 
         return (
             <Dialog
-                okTitleKey = 'dialog.Submit'
+                okKey = 'dialog.Submit'
                 onCancel = { this._onCancel }
                 onSubmit = { this._onSubmit }
                 titleKey = 'feedback.rateExperience'>

react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js

@@ -176,7 +176,7 @@ class AddPeopleDialog extends AbstractAddPeopleDialog<Props, State> {
         return (
             <Dialog
                 okDisabled = { this._isAddDisabled() }
-                okTitleKey = 'addPeople.add'
+                okKey = 'addPeople.add'
                 onSubmit = { this._onSubmit }
                 titleKey = 'addPeople.title'
                 width = 'medium'>

react/features/keyboard-shortcuts/components/KeyboardShortcutsDialog.web.js

@@ -42,7 +42,7 @@ class KeyboardShortcutsDialog extends Component<Props> {
 
         return (
             <Dialog
-                cancelTitleKey = { 'dialog.close' }
+                cancelKey = { 'dialog.close' }
                 submitDisabled = { true }
                 titleKey = 'keyboardShortcuts.keyboardShortcuts'
                 width = 'small'>

react/features/local-recording/components/LocalRecordingInfoDialog.js

@@ -149,7 +149,7 @@ class LocalRecordingInfoDialog extends Component<Props, State> {
 
         return (
             <Dialog
-                cancelTitleKey = { 'dialog.close' }
+                cancelKey = { 'dialog.close' }
                 submitDisabled = { true }
                 titleKey = 'localRecording.dialogTitle'>
                 <div className = 'localrec-control'>

react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js

@@ -47,7 +47,7 @@ class StartLiveStreamDialog extends AbstractStartLiveStreamDialog<Props> {
     render() {
         return (
             <CustomSubmitDialog
-                okTitleKey = 'dialog.startLiveStreaming'
+                okKey = 'dialog.startLiveStreaming'
                 onCancel = { this._onCancel }
                 onSubmit = { this._onSubmit } >
                 <View style = { styles.startDialogWrapper }>

react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js

@@ -87,8 +87,8 @@ class StartLiveStreamDialog
 
         return (
             <Dialog
-                cancelTitleKey = 'dialog.Cancel'
-                okTitleKey = 'dialog.startLiveStreaming'
+                cancelKey = 'dialog.Cancel'
+                okKey = 'dialog.startLiveStreaming'
                 onCancel = { this._onCancel }
                 onSubmit = { this._onSubmit }
                 titleKey = 'liveStreaming.start'

react/features/recording/components/LiveStream/web/StopLiveStreamDialog.js

@@ -27,7 +27,7 @@ class StopLiveStreamDialog extends AbstractStopLiveStreamDialog {
     render() {
         return (
             <Dialog
-                okTitleKey = 'dialog.stopLiveStreaming'
+                okKey = 'dialog.stopLiveStreaming'
                 onSubmit = { this._onSubmit }
                 titleKey = 'dialog.liveStreaming'
                 width = 'small'>

react/features/recording/components/Recording/web/StartRecordingDialog.js

@@ -30,7 +30,7 @@ class StartRecordingDialog extends AbstractStartRecordingDialog {
         return (
             <Dialog
                 okDisabled = { !isTokenValid && _isDropboxEnabled }
-                okTitleKey = 'dialog.confirm'
+                okKey = 'dialog.confirm'
                 onSubmit = { this._onSubmit }
                 titleKey = 'dialog.recording'
                 width = 'small'>

react/features/recording/components/Recording/web/StopRecordingDialog.js

@@ -29,7 +29,7 @@ class StopRecordingDialog extends AbstractStopRecordingDialog<Props> {
 
         return (
             <Dialog
-                okTitleKey = 'dialog.confirm'
+                okKey = 'dialog.confirm'
                 onSubmit = { this._onSubmit }
                 titleKey = 'dialog.recording'
                 width = 'small'>

react/features/remote-control/components/RemoteControlAuthorizationDialog.js

@@ -63,7 +63,7 @@ class RemoteControlAuthorizationDialog extends Component<Props> {
     render() {
         return (
             <Dialog
-                okTitleKey = { 'dialog.allow' }
+                okKey = { 'dialog.allow' }
                 onCancel = { this._onCancel }
                 onSubmit = { this._onSubmit }
                 titleKey = 'dialog.remoteControlTitle'

react/features/remote-video-menu/components/web/KickRemoteParticipantDialog.js

@@ -22,7 +22,7 @@ class KickRemoteParticipantDialog extends AbstractKickRemoteParticipantDialog {
     render() {
         return (
             <Dialog
-                okTitleKey = 'dialog.kickParticipantButton'
+                okKey = 'dialog.kickParticipantButton'
                 onSubmit = { this._onSubmit }
                 titleKey = 'dialog.kickParticipantTitle'
                 width = 'small'>

react/features/remote-video-menu/components/web/MuteRemoteParticipantDialog.js

@@ -25,7 +25,7 @@ class MuteRemoteParticipantDialog extends AbstractMuteRemoteParticipantDialog {
     render() {
         return (
             <Dialog
-                okTitleKey = 'dialog.muteParticipantButton'
+                okKey = 'dialog.muteParticipantButton'
                 onSubmit = { this._onSubmit }
                 titleKey = 'dialog.muteParticipantTitle'
                 width = 'small'>

react/features/speaker-stats/components/SpeakerStats.js

@@ -99,7 +99,7 @@ class SpeakerStats extends Component<Props, State> {
 
         return (
             <Dialog
-                cancelTitleKey = { 'dialog.close' }
+                cancelKey = { 'dialog.close' }
                 submitDisabled = { true }
                 titleKey = 'speakerStats.speakerStats'>
                 <div className = 'speaker-stats'>

react/features/video-quality/components/VideoQualityDialog.web.js

@@ -21,7 +21,7 @@ export default class VideoQualityDialog extends Component {
         return (
             <Dialog
                 hideCancelButton = { true }
-                okTitleKey = 'dialog.done'
+                okKey = 'dialog.done'
                 titleKey = 'videoStatus.callQuality'
                 width = 'small'>
                 <VideoQualitySlider />