From ebdcbe122a8050b4715f14fa3194472162b27543 Mon Sep 17 00:00:00 2001
From: Bettenbuk Zoltan <zoltan.bettenbuk@gmail.com>
Date: Wed, 6 Mar 2019 18:23:53 +0100
Subject: [PATCH] Change dialog button property keys

---
 react/features/base/dialog/components/web/StatelessDialog.js  | 4 ++--
 react/features/base/dialog/constants.js                       | 4 ++--
 react/features/desktop-picker/components/DesktopPicker.js     | 2 +-
 react/features/feedback/components/FeedbackDialog.web.js      | 2 +-
 .../components/add-people-dialog/web/AddPeopleDialog.js       | 2 +-
 .../components/KeyboardShortcutsDialog.web.js                 | 2 +-
 .../local-recording/components/LocalRecordingInfoDialog.js    | 2 +-
 .../components/LiveStream/native/StartLiveStreamDialog.js     | 2 +-
 .../components/LiveStream/web/StartLiveStreamDialog.js        | 4 ++--
 .../components/LiveStream/web/StopLiveStreamDialog.js         | 2 +-
 .../components/Recording/web/StartRecordingDialog.js          | 2 +-
 .../recording/components/Recording/web/StopRecordingDialog.js | 2 +-
 .../components/RemoteControlAuthorizationDialog.js            | 2 +-
 .../components/web/KickRemoteParticipantDialog.js             | 2 +-
 .../components/web/MuteRemoteParticipantDialog.js             | 2 +-
 react/features/speaker-stats/components/SpeakerStats.js       | 2 +-
 .../video-quality/components/VideoQualityDialog.web.js        | 2 +-
 17 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/react/features/base/dialog/components/web/StatelessDialog.js b/react/features/base/dialog/components/web/StatelessDialog.js
index 0d49d2673..5b6de4f01 100644
--- a/react/features/base/dialog/components/web/StatelessDialog.js
+++ b/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>
         );
     }
diff --git a/react/features/base/dialog/constants.js b/react/features/base/dialog/constants.js
index d771ea3a6..51ade888b 100644
--- a/react/features/base/dialog/constants.js
+++ b/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.
diff --git a/react/features/desktop-picker/components/DesktopPicker.js b/react/features/desktop-picker/components/DesktopPicker.js
index 6f190a974..2b7f051f3 100644
--- a/react/features/desktop-picker/components/DesktopPicker.js
+++ b/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'
diff --git a/react/features/feedback/components/FeedbackDialog.web.js b/react/features/feedback/components/FeedbackDialog.web.js
index d9bbcd5e1..2138c01db 100644
--- a/react/features/feedback/components/FeedbackDialog.web.js
+++ b/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'>
diff --git a/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js b/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js
index c0b93e7be..912d85d6d 100644
--- a/react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js
+++ b/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'>
diff --git a/react/features/keyboard-shortcuts/components/KeyboardShortcutsDialog.web.js b/react/features/keyboard-shortcuts/components/KeyboardShortcutsDialog.web.js
index 25ab96ae4..72711d9ff 100644
--- a/react/features/keyboard-shortcuts/components/KeyboardShortcutsDialog.web.js
+++ b/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'>
diff --git a/react/features/local-recording/components/LocalRecordingInfoDialog.js b/react/features/local-recording/components/LocalRecordingInfoDialog.js
index d40f72b65..47813f916 100644
--- a/react/features/local-recording/components/LocalRecordingInfoDialog.js
+++ b/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'>
diff --git a/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js b/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js
index 01ff6e7cd..93ac3f3f9 100644
--- a/react/features/recording/components/LiveStream/native/StartLiveStreamDialog.js
+++ b/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 }>
diff --git a/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js b/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js
index c8294e235..b2adc6562 100644
--- a/react/features/recording/components/LiveStream/web/StartLiveStreamDialog.js
+++ b/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'
diff --git a/react/features/recording/components/LiveStream/web/StopLiveStreamDialog.js b/react/features/recording/components/LiveStream/web/StopLiveStreamDialog.js
index b877c7072..c5b34e56e 100644
--- a/react/features/recording/components/LiveStream/web/StopLiveStreamDialog.js
+++ b/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'>
diff --git a/react/features/recording/components/Recording/web/StartRecordingDialog.js b/react/features/recording/components/Recording/web/StartRecordingDialog.js
index 367536c64..776773374 100644
--- a/react/features/recording/components/Recording/web/StartRecordingDialog.js
+++ b/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'>
diff --git a/react/features/recording/components/Recording/web/StopRecordingDialog.js b/react/features/recording/components/Recording/web/StopRecordingDialog.js
index e309a9b8d..cc7760926 100644
--- a/react/features/recording/components/Recording/web/StopRecordingDialog.js
+++ b/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'>
diff --git a/react/features/remote-control/components/RemoteControlAuthorizationDialog.js b/react/features/remote-control/components/RemoteControlAuthorizationDialog.js
index 494b4a38f..d6ca5f01f 100644
--- a/react/features/remote-control/components/RemoteControlAuthorizationDialog.js
+++ b/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'
diff --git a/react/features/remote-video-menu/components/web/KickRemoteParticipantDialog.js b/react/features/remote-video-menu/components/web/KickRemoteParticipantDialog.js
index c5b17dbd1..2f7bf7f1a 100644
--- a/react/features/remote-video-menu/components/web/KickRemoteParticipantDialog.js
+++ b/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'>
diff --git a/react/features/remote-video-menu/components/web/MuteRemoteParticipantDialog.js b/react/features/remote-video-menu/components/web/MuteRemoteParticipantDialog.js
index 46f9a7114..0e6a8896b 100644
--- a/react/features/remote-video-menu/components/web/MuteRemoteParticipantDialog.js
+++ b/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'>
diff --git a/react/features/speaker-stats/components/SpeakerStats.js b/react/features/speaker-stats/components/SpeakerStats.js
index 56f565929..a966e9b4b 100644
--- a/react/features/speaker-stats/components/SpeakerStats.js
+++ b/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'>
diff --git a/react/features/video-quality/components/VideoQualityDialog.web.js b/react/features/video-quality/components/VideoQualityDialog.web.js
index c1b2d4209..1fb7ef161 100644
--- a/react/features/video-quality/components/VideoQualityDialog.web.js
+++ b/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 />