Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dev-server/containers/AppView/styles.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import 'normalize-css/normalize.css';
@import '~normalize-css/normalize.css';
@import '../../../src/lib/commonStyles/full-size.scss';
@import '../../../src/lib/commonStyles/colors.scss';

Expand Down
4 changes: 2 additions & 2 deletions src/components/ActiveCallItem/i18n/fr-CA.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export default {
missedCall: 'Manqué',
inboundCall: 'Entrant',
outboundCall: 'Sortant',
from: 'De',
to: 'À',
from: 'De ',
to: 'À ',
hangup: 'Raccrocher',
accept: 'Accepter',
toVoicemail: 'Envoyer vers la messagerie vocale',
Expand Down
4 changes: 2 additions & 2 deletions src/components/ActiveCallItem/i18n/fr-FR.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export default {
missedCall: 'Manqué',
inboundCall: 'Entrant',
outboundCall: 'Sortant',
from: 'De',
to: 'À',
from: 'De ',
to: 'À ',
hangup: 'Raccrocher',
accept: 'Accepter',
toVoicemail: 'Envoyer vers la messagerie vocale',
Expand Down
4 changes: 2 additions & 2 deletions src/components/ActiveCallPad/i18n/fr-CA.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default {
unmute: 'Désactiver\nle mode discrétion',
mute: 'Activer\nle mode discrétion',
unmute: 'Désac. mode disc.',
mute: 'Act. mode disc.',
keypad: 'Clavier',
hold: 'Mettre\nen attente',
onHold: 'En attente',
Expand Down
1 change: 1 addition & 0 deletions src/components/CallAlert/i18n/en-CA.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export default {
// @key: @#@"[callErrors.internalError]"@#@ @source: @#@"Cannot connect due to internal errors. Please try again later."@#@
// @key: @#@"[callErrors.notAnExtension]"@#@ @source: @#@"The extension number does not exist."@#@
// @key: @#@"[callErrors.networkError]"@#@ @source: @#@"Cannot connect due to network issues. Please try again later."@#@
// @key: @#@"[callErrors.noInternational]"@#@ @source: @#@"You don't have permissions to make international calls. Please contact your {brand} account administrator for an upgrade."@#@
// @key: @#@"[callErrors.noRingoutEnable]"@#@ @source: @#@"Your extension is allowed to make calls with desktop app.\n If you wish to switch to other calling options\n please contact your account administrator for an upgrade."@#@
// @key: @#@"areaCode"@#@ @source: @#@"area code"@#@
// @key: @#@"telus911"@#@ @source: @#@"Emergency dialing is not supported."@#@
2 changes: 1 addition & 1 deletion src/components/CallAlert/i18n/fr-CA.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import callErrors from 'ringcentral-integration/modules/Call/callErrors';

export default {
[callErrors.noToNumber]: 'Veuillez entrer un numéro de téléphone valide.',
[callErrors.noAreaCode]: 'Veuillez configurer {areaCodeLink} pour utiliser des numéros de téléphone locaux à 7\xA0chiffres.',
[callErrors.noAreaCode]: 'Veuillez configurer l\'{areaCodeLink} pour utiliser des numéros de téléphone locaux à 7\xA0chiffres.',
[callErrors.specialNumber]: 'La composition de numéros d\'urgence ou renvoyant à des services spéciaux n\'est pas prise en charge.',
[callErrors.connectFailed]: 'Échec de la connexion. Veuillez réessayer plus tard.',
[callErrors.internalError]: 'Connexion impossible en raison d\'erreurs internes. Veuillez réessayer plus tard.',
Expand Down
4 changes: 2 additions & 2 deletions src/components/CallingSettingsPanel/i18n/fr-CA.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ export default {
[callingOptions.browser]: 'Navigateur',
save: 'Sauvegarder',
[`${callingOptions.browser}Tooltip`]: 'Utilisez cette option pour faire et recevoir des appels au moyen du microphone et du haut-parleur de votre ordinateur.',
[`${callingOptions.softphone}Tooltip`]: 'Utilisez cette option pour faire et recevoir des appels au moyen de votre application {brand} pour bureau.',
[`${callingOptions.softphone}Tooltip`]: 'Utilisez cette option pour faire et recevoir des appels au moyen de votre application {brand} pour ordinateur de bureau.',
[`${callingOptions.myphone}Tooltip`]: 'Utilisez cette option pour faire des appels en utilisant votre téléphone {brand}.',
[`${callingOptions.myphone}Tooltip1`]: 'Pour l\'appel en cours, votre téléphone {brand} sonnera d\'abord, puis celui de la personne appelée.',
[`${callingOptions.otherphone}Tooltip`]: 'Utilisez cette option pour faire des appels en utilisant vos autres téléphones, comme celui de votre domicile ou des téléphones cellulaires que vous avez ajoutés dans votre extension {brand}.',
[`${callingOptions.otherphone}Tooltip`]: 'Utilisez cette option pour faire des appels en utilisant vos autres téléphones, comme celui de votre domicile ou des téléphones cellulaires que vous avez ajoutés dans votre poste {brand}.',
[`${callingOptions.otherphone}Tooltip1`]: 'Pour l\'appel en cours, ce téléphone sonnera d\'abord, puis celui de la personne appelée.',
[`${callingOptions.customphone}Tooltip`]: 'Utilisez cette option pour faire des appels en utilisant n\'importe quel téléphone. Entrez un numéro de téléphone valide dans le champ ci-dessous.',
[`${callingOptions.customphone}Tooltip1`]: 'Pour l\'appel en cours, ce téléphone sonnera d\'abord, puis celui de la personne appelée.',
Expand Down
2 changes: 1 addition & 1 deletion src/components/CallsListPanel/i18n/en-CA.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ export default {
// @key: @#@"currentCall"@#@ @source: @#@"Current Call"@#@
// @key: @#@"ringCall"@#@ @source: @#@"Ringing Call"@#@
// @key: @#@"onHoldCall"@#@ @source: @#@"Call on Hold"@#@
// @key: @#@"historyCalls"@#@ @source: @#@"Last Calls"@#@
// @key: @#@"historyCalls"@#@ @source: @#@"Past Calls"@#@
// @key: @#@"otherDeviceCall"@#@ @source: @#@"Ongoing calls on my other devices"@#@
4 changes: 2 additions & 2 deletions src/components/ComposeTextPanel/i18n/fr-CA.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default {
from: 'De',
to: 'À',
from: 'De ',
to: 'À ',
enterNameOrNumber: 'Saisir le numéro ou le nom',
typeMessage: 'Entrer le message...',
send: 'Envoyer',
Expand Down
4 changes: 2 additions & 2 deletions src/components/ComposeTextPanel/i18n/fr-FR.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
export default {
from: 'De',
to: 'À',
from: 'De ',
to: 'À ',
enterNameOrNumber: 'Saisir le numéro ou le nom',
typeMessage: 'Saisie du message...',
send: 'Envoyer',
Expand Down
19 changes: 17 additions & 2 deletions src/components/ComposeTextPanel/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ import FromField from '../FromField';
class ComposeTextPanel extends Component {
constructor(props) {
super(props);
this.state = {
messageText: props.messageText,
};

this.onSenderChange = (value) => {
this.props.updateSenderNumber(value);
Expand All @@ -35,6 +38,9 @@ class ComposeTextPanel extends Component {

this.onTextChange = (e) => {
const value = e.currentTarget.value;
this.setState({
messageText: value,
});
this.props.updateMessageText(value);
};

Expand All @@ -51,6 +57,13 @@ class ComposeTextPanel extends Component {
console.debug('send message ...');
};
}
componentWillReceiveProps(nextProps) {
if (nextProps.messageText !== this.state.messageText) {
this.setState({
messageText: nextProps.messageText,
});
}
}

hasSenderNumbers() {
return this.props.senderNumbers.length > 0;
Expand Down Expand Up @@ -88,7 +101,7 @@ class ComposeTextPanel extends Component {
contactInfoRenderer={this.props.recipientsContactInfoRenderer}
contactPhoneRenderer={this.props.recipientsContactPhoneRenderer}
titleEnabled
autoFocus
autoFocus={this.props.autoFocus}
multiple
/>
<div className={styles.senderField}>
Expand All @@ -106,7 +119,7 @@ class ComposeTextPanel extends Component {
<div className={styles.textField}>
<textarea
placeholder={i18n.getString('typeMessage', this.props.currentLocale)}
value={this.props.messageText}
value={this.state.messageText}
maxLength="1000"
onChange={this.onTextChange}
onKeyPressCapture={this.onTextAreaKeyDown}
Expand Down Expand Up @@ -163,6 +176,7 @@ ComposeTextPanel.propTypes = {
phoneTypeRenderer: PropTypes.func,
recipientsContactInfoRenderer: PropTypes.func,
recipientsContactPhoneRenderer: PropTypes.func,
autoFocus: PropTypes.bool,
};

ComposeTextPanel.defaultProps = {
Expand All @@ -176,6 +190,7 @@ ComposeTextPanel.defaultProps = {
phoneTypeRenderer: undefined,
recipientsContactInfoRenderer: undefined,
recipientsContactPhoneRenderer: undefined,
autoFocus: false,
};

export default ComposeTextPanel;
4 changes: 2 additions & 2 deletions src/components/ConferenceCommands/i18n/fr-CA.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ export default {
starSharp3Title: 'Quitter la conférence',
starSharp3Body: 'Permet à l\'animateur de raccrocher et de mettre fin à l\'appel',
starSharp4Title: 'Menu',
starSharp4Body: 'Permet d\'écouter la liste de commandes du téléphone à clavier',
starSharp4Body: 'Permet d\'écouter la liste de commandes au clavier',
starSharp5Title: 'Définir les modes d\'écoute',
starSharp5Body: 'Faire la commande une fois pour\xA0: Activer le mode discrétion sur la ligne des appelants. Ces derniers peuvent le désactiver en appuyant sur les touches *, # et 6\r\nFaire la commande deux fois pour\xA0: Activer le mode discrétion sur la ligne des appelants afin d\'écouter uniquement Aucune option de désactivation du mode discrétion\r\nFaire la commande trois fois pour\xA0: Désactiver le mode discrétion sur la ligne des appelants, leur ligne est donc rouverte.',
starSharp5Body: 'Faire la commande une fois pour\xA0: Activer le mode discrétion sur la ligne des appelants. Ces derniers peuvent le désactiver en appuyant sur les touches *, # et 6\r\nFaire la commande deux fois pour\xA0: Activer le mode discrétion sur la ligne des appelants afin d\'écouter uniquement. Aucune option de désactivation du mode discrétion.\r\nFaire la commande trois fois pour\xA0: Désactiver le mode discrétion sur la ligne des appelants, leur ligne est donc rouverte.',
starSharp6Title: 'Activer le mode discrétion sur la ligne de l\'animateur',
starSharp6Body: 'Appuyer une fois pour activer le mode discrétion\r\nAppuyer une deuxième fois pour désactiver le mode discrétion',
starSharp7Title: 'Sécuriser la conférence',
Expand Down
5 changes: 4 additions & 1 deletion src/components/ConferencePanel/i18n/de-DE.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ export default {
// @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
// @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
// @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
5 changes: 4 additions & 1 deletion src/components/ConferencePanel/i18n/en-CA.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ export default {
// @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
// @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
// @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
5 changes: 4 additions & 1 deletion src/components/ConferencePanel/i18n/en-GB.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ export default {
// @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
// @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
// @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
5 changes: 4 additions & 1 deletion src/components/ConferencePanel/i18n/es-419.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ export default {
// @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
// @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
// @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
5 changes: 4 additions & 1 deletion src/components/ConferencePanel/i18n/es-ES.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,7 @@ export default {
// @key: @#@"inviteWithText"@#@ @source: @#@"Invite with Text"@#@
// @key: @#@"joinAsHost"@#@ @source: @#@"Join as Host"@#@
// @key: @#@"internationalNumber"@#@ @source: @#@"International Dial-in Numbers:"@#@
// @key: @#@"inviteText"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Numbers: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_att"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_bt"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
// @key: @#@"inviteText_rc"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nNeed an international dial-in phone number? Please visit {dialInNumbersLinks} \n\nThis conference call is brought to you by {brandName} Conferencing."@#@
// @key: @#@"inviteText_telus"@#@ @source: @#@"Please join the {brandName} conference.\n\nDial-In Number: {formattedDialInNumber} \n{additionalNumbersSection} \nParticipant Access: {participantCode} \n\nAdditional dial-in numbers {dialInNumbersLinks}"@#@
Loading