From d0dfda45e19dfcb07762eb2d969ec62c5f184c2f Mon Sep 17 00:00:00 2001 From: "Lex. Huang" <531971909@qq.com> Date: Thu, 29 Mar 2018 17:22:01 +0800 Subject: [PATCH] fix(AudioSettingsAlert): change incorrect docwrittings --- dev-server/brandConfig.js | 1 + src/components/AudioSettingsAlert/i18n/de-DE.js | 7 ------- src/components/AudioSettingsAlert/i18n/en-AU.js | 7 ------- src/components/AudioSettingsAlert/i18n/en-GB.js | 7 ------- src/components/AudioSettingsAlert/i18n/en-US.js | 2 +- src/components/AudioSettingsAlert/i18n/es-419.js | 7 ------- src/components/AudioSettingsAlert/i18n/es-ES.js | 7 ------- src/components/AudioSettingsAlert/i18n/fr-CA.js | 7 ------- src/components/AudioSettingsAlert/i18n/fr-FR.js | 7 ------- src/components/AudioSettingsAlert/i18n/it-IT.js | 7 ------- src/components/AudioSettingsAlert/i18n/ja-JP.js | 7 ------- src/components/AudioSettingsAlert/i18n/pt-BR.js | 7 ------- src/components/AudioSettingsAlert/index.js | 6 +++--- src/containers/AlertContainer/index.js | 2 +- test/state.json | 5 +++-- test/webphoneBadge/index.spec.js | 6 +++--- 16 files changed, 12 insertions(+), 80 deletions(-) delete mode 100644 src/components/AudioSettingsAlert/i18n/de-DE.js delete mode 100644 src/components/AudioSettingsAlert/i18n/en-AU.js delete mode 100644 src/components/AudioSettingsAlert/i18n/en-GB.js delete mode 100644 src/components/AudioSettingsAlert/i18n/es-419.js delete mode 100644 src/components/AudioSettingsAlert/i18n/es-ES.js delete mode 100644 src/components/AudioSettingsAlert/i18n/fr-CA.js delete mode 100644 src/components/AudioSettingsAlert/i18n/fr-FR.js delete mode 100644 src/components/AudioSettingsAlert/i18n/it-IT.js delete mode 100644 src/components/AudioSettingsAlert/i18n/ja-JP.js delete mode 100644 src/components/AudioSettingsAlert/i18n/pt-BR.js diff --git a/dev-server/brandConfig.js b/dev-server/brandConfig.js index 3da747cc82..43ded984b0 100644 --- a/dev-server/brandConfig.js +++ b/dev-server/brandConfig.js @@ -5,4 +5,5 @@ export default { name: 'RingCentral', appName: 'RingCentral Widgets', fullName: 'RingCentral', + application: 'RingCentral Widgets' }; diff --git a/src/components/AudioSettingsAlert/i18n/de-DE.js b/src/components/AudioSettingsAlert/i18n/de-DE.js deleted file mode 100644 index ee5281f887..0000000000 --- a/src/components/AudioSettingsAlert/i18n/de-DE.js +++ /dev/null @@ -1,7 +0,0 @@ -import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; - -export default { - [audioSettingsErrors.userMediaPermission]: 'Lassen Sie für {brandName} zu, dass Google auf Ihre Audiofunktionen zugreift.', -}; - -// @key: @#@"[audioSettingsErrors.userMediaPermission]"@#@ @source: @#@"Please grant {brandName} for Google to access your audio."@#@ diff --git a/src/components/AudioSettingsAlert/i18n/en-AU.js b/src/components/AudioSettingsAlert/i18n/en-AU.js deleted file mode 100644 index f8c68e078a..0000000000 --- a/src/components/AudioSettingsAlert/i18n/en-AU.js +++ /dev/null @@ -1,7 +0,0 @@ -import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; - -export default { - [audioSettingsErrors.userMediaPermission]: 'Please grant {brandName} for Google to access your audio.', -}; - -// @key: @#@"[audioSettingsErrors.userMediaPermission]"@#@ @source: @#@"Please grant {brandName} for Google to access your audio."@#@ diff --git a/src/components/AudioSettingsAlert/i18n/en-GB.js b/src/components/AudioSettingsAlert/i18n/en-GB.js deleted file mode 100644 index f8c68e078a..0000000000 --- a/src/components/AudioSettingsAlert/i18n/en-GB.js +++ /dev/null @@ -1,7 +0,0 @@ -import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; - -export default { - [audioSettingsErrors.userMediaPermission]: 'Please grant {brandName} for Google to access your audio.', -}; - -// @key: @#@"[audioSettingsErrors.userMediaPermission]"@#@ @source: @#@"Please grant {brandName} for Google to access your audio."@#@ diff --git a/src/components/AudioSettingsAlert/i18n/en-US.js b/src/components/AudioSettingsAlert/i18n/en-US.js index adc3243d41..8618890fa0 100644 --- a/src/components/AudioSettingsAlert/i18n/en-US.js +++ b/src/components/AudioSettingsAlert/i18n/en-US.js @@ -1,5 +1,5 @@ import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; export default { - [audioSettingsErrors.userMediaPermission]: 'Please grant {brandName} for Google to access your audio.', + [audioSettingsErrors.userMediaPermission]: 'Please grant {application} to access your audio.', }; diff --git a/src/components/AudioSettingsAlert/i18n/es-419.js b/src/components/AudioSettingsAlert/i18n/es-419.js deleted file mode 100644 index 30b135569d..0000000000 --- a/src/components/AudioSettingsAlert/i18n/es-419.js +++ /dev/null @@ -1,7 +0,0 @@ -import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; - -export default { - [audioSettingsErrors.userMediaPermission]: 'Conceda acceso al audio a {brandName} para Google.', -}; - -// @key: @#@"[audioSettingsErrors.userMediaPermission]"@#@ @source: @#@"Please grant {brandName} for Google to access your audio."@#@ diff --git a/src/components/AudioSettingsAlert/i18n/es-ES.js b/src/components/AudioSettingsAlert/i18n/es-ES.js deleted file mode 100644 index 30b135569d..0000000000 --- a/src/components/AudioSettingsAlert/i18n/es-ES.js +++ /dev/null @@ -1,7 +0,0 @@ -import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; - -export default { - [audioSettingsErrors.userMediaPermission]: 'Conceda acceso al audio a {brandName} para Google.', -}; - -// @key: @#@"[audioSettingsErrors.userMediaPermission]"@#@ @source: @#@"Please grant {brandName} for Google to access your audio."@#@ diff --git a/src/components/AudioSettingsAlert/i18n/fr-CA.js b/src/components/AudioSettingsAlert/i18n/fr-CA.js deleted file mode 100644 index e7a292d7fd..0000000000 --- a/src/components/AudioSettingsAlert/i18n/fr-CA.js +++ /dev/null @@ -1,7 +0,0 @@ -import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; - -export default { - [audioSettingsErrors.userMediaPermission]: 'Veuillez autoriser {brandName} pour Google à accéder à votre son.', -}; - -// @key: @#@"[audioSettingsErrors.userMediaPermission]"@#@ @source: @#@"Please grant {brandName} for Google to access your audio."@#@ diff --git a/src/components/AudioSettingsAlert/i18n/fr-FR.js b/src/components/AudioSettingsAlert/i18n/fr-FR.js deleted file mode 100644 index 1b52a06aba..0000000000 --- a/src/components/AudioSettingsAlert/i18n/fr-FR.js +++ /dev/null @@ -1,7 +0,0 @@ -import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; - -export default { - [audioSettingsErrors.userMediaPermission]: 'Veuillez autoriser {brandName} for Google à accéder à votre audio.', -}; - -// @key: @#@"[audioSettingsErrors.userMediaPermission]"@#@ @source: @#@"Please grant {brandName} for Google to access your audio."@#@ diff --git a/src/components/AudioSettingsAlert/i18n/it-IT.js b/src/components/AudioSettingsAlert/i18n/it-IT.js deleted file mode 100644 index 4b723e5ffc..0000000000 --- a/src/components/AudioSettingsAlert/i18n/it-IT.js +++ /dev/null @@ -1,7 +0,0 @@ -import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; - -export default { - [audioSettingsErrors.userMediaPermission]: 'Autorizza {brandName} per Google ad accedere al tuo audio.', -}; - -// @key: @#@"[audioSettingsErrors.userMediaPermission]"@#@ @source: @#@"Please grant {brandName} for Google to access your audio."@#@ diff --git a/src/components/AudioSettingsAlert/i18n/ja-JP.js b/src/components/AudioSettingsAlert/i18n/ja-JP.js deleted file mode 100644 index f4b01eb98e..0000000000 --- a/src/components/AudioSettingsAlert/i18n/ja-JP.js +++ /dev/null @@ -1,7 +0,0 @@ -import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; - -export default { - [audioSettingsErrors.userMediaPermission]: 'オーディオへのアクセスを{brandName} for Googleに許可してください\u3002', -}; - -// @key: @#@"[audioSettingsErrors.userMediaPermission]"@#@ @source: @#@"Please grant {brandName} for Google to access your audio."@#@ diff --git a/src/components/AudioSettingsAlert/i18n/pt-BR.js b/src/components/AudioSettingsAlert/i18n/pt-BR.js deleted file mode 100644 index b3b6d157cf..0000000000 --- a/src/components/AudioSettingsAlert/i18n/pt-BR.js +++ /dev/null @@ -1,7 +0,0 @@ -import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/audioSettingsErrors'; - -export default { - [audioSettingsErrors.userMediaPermission]: 'Conceda a {brandName} para Google o acesso ao áudio.', -}; - -// @key: @#@"[audioSettingsErrors.userMediaPermission]"@#@ @source: @#@"Please grant {brandName} for Google to access your audio."@#@ diff --git a/src/components/AudioSettingsAlert/index.js b/src/components/AudioSettingsAlert/index.js index 6d4e5653a3..5594eb5808 100644 --- a/src/components/AudioSettingsAlert/index.js +++ b/src/components/AudioSettingsAlert/index.js @@ -4,11 +4,11 @@ import audioSettingsErrors from 'ringcentral-integration/modules/AudioSettings/a import FormattedMessage from '../FormattedMessage'; import i18n from './i18n'; -export default function AudioSettingsAlert({ brand, currentLocale, message }) { +export default function AudioSettingsAlert({ application, currentLocale, message }) { const view = ( ); return ( @@ -17,7 +17,7 @@ export default function AudioSettingsAlert({ brand, currentLocale, message }) { } AudioSettingsAlert.propTypes = { - brand: PropTypes.object.isRequired, + application: PropTypes.string.isRequired, currentLocale: PropTypes.string.isRequired, message: PropTypes.shape({ message: PropTypes.string.isRequired, diff --git a/src/containers/AlertContainer/index.js b/src/containers/AlertContainer/index.js index 4ad79dba47..861204698d 100644 --- a/src/containers/AlertContainer/index.js +++ b/src/containers/AlertContainer/index.js @@ -141,7 +141,7 @@ function getDefaultRenderer({ return props => ( ); } diff --git a/test/state.json b/test/state.json index 654e8a09f3..624a7c3efb 100644 --- a/test/state.json +++ b/test/state.json @@ -6,7 +6,8 @@ "id": "1210", "name": "RingCentral", "fullName": "RingCentral", - "code": "rc" + "code": "rc", + "application": "RingCentral Widgets" }, "softphone": null, "locale": { @@ -6030,4 +6031,4 @@ "lastAction": { "type": "rc-widget-contactSearchActionTypes-prepareSearch" } -} +} \ No newline at end of file diff --git a/test/webphoneBadge/index.spec.js b/test/webphoneBadge/index.spec.js index fc222324c9..d2636f7671 100644 --- a/test/webphoneBadge/index.spec.js +++ b/test/webphoneBadge/index.spec.js @@ -15,8 +15,8 @@ beforeEach(async () => { store = wrapper.props().phone.store; phone = wrapper.props().phone; phone.webphone._createWebphone(); - phone.webphone._removeWebphone = () => {}; - phone.webphone._connect = () => {}; + phone.webphone._removeWebphone = () => { }; + phone.webphone._connect = () => { }; }); describe('Webphone warning badge', () => { @@ -99,7 +99,7 @@ describe('Webphone warning badge', () => { wrapper.update(); assert({ type: 'audio', - msg: 'Please grant RingCentral for Google to access your audio.' + msg: `Please grant ${phone.brand.application} to access your audio.` }); }); });