merge devel

package.json

@@ -1,7 +1,7 @@
 {
   "name": "tinode-webapp",
   "description": "Tinode messenger for the web",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "repository": {
     "type": "git",
     "url": "https://github.com/tinode/example-react-js.git"

src/i18n/de.json

@@ -1634,11 +1634,18 @@
     "missing": true,
     "obsolete": false
   },
-  "change_phonel": {
+  "change_phone": {
     "translation": "",
     "defaultMessage": "Change phone number",
     "description": "Prompt to change current phone number",
     "missing": true,
     "obsolete": false
+  },
+  "call_busy": {
+    "translation": "besetzt",
+    "defaultMessage": "busy",
+    "description": "Label for busy call line",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/en.json

@@ -1634,11 +1634,18 @@
     "missing": false,
     "obsolete": false
   },
-  "change_phonel": {
+  "change_phone": {
     "translation": "Change phone number",
     "defaultMessage": "Change phone number",
     "description": "Prompt to change current phone number",
     "missing": false,
     "obsolete": false
+  },
+  "call_busy": {
+    "translation": "busy",
+    "defaultMessage": "busy",
+    "description": "Label for busy call line",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/es.json

@@ -1634,11 +1634,18 @@
     "missing": true,
     "obsolete": false
   },
-  "change_phonel": {
+  "change_phone": {
     "translation": "",
     "defaultMessage": "Change phone number",
     "description": "Prompt to change current phone number",
     "missing": true,
     "obsolete": false
+  },
+  "call_busy": {
+    "translation": "ocupado",
+    "defaultMessage": "busy",
+    "description": "Label for busy call line",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/ex/base-en.json

@@ -119,6 +119,10 @@
     "defaultMessage": "Update",
     "description": "Button [Update]"
   },
+  "call_busy": {
+    "defaultMessage": "busy",
+    "description": "Label for busy call line"
+  },
   "call_cancelled": {
     "defaultMessage": "cancelled",
     "description": "Label for cancelled outgoing call"
@@ -159,7 +163,7 @@
     "defaultMessage": "Change email",
     "description": "Prompt to change current email"
   },
-  "change_phonel": {
+  "change_phone": {
     "defaultMessage": "Change phone number",
     "description": "Prompt to change current phone number"
   },

src/i18n/fr.json

@@ -1634,11 +1634,18 @@
     "missing": true,
     "obsolete": false
   },
-  "change_phonel": {
+  "change_phone": {
     "translation": "",
     "defaultMessage": "Change phone number",
     "description": "Prompt to change current phone number",
     "missing": true,
     "obsolete": false
+  },
+  "call_busy": {
+    "translation": "occupé",
+    "defaultMessage": "busy",
+    "description": "Label for busy call line",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/ko.json

@@ -1634,11 +1634,18 @@
     "missing": true,
     "obsolete": false
   },
-  "change_phonel": {
+  "change_phone": {
     "translation": "",
     "defaultMessage": "Change phone number",
     "description": "Prompt to change current phone number",
     "missing": true,
     "obsolete": false
+  },
+  "call_busy": {
+    "translation": "바쁘다",
+    "defaultMessage": "busy",
+    "description": "Label for busy call line",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/ro.json

@@ -1634,11 +1634,18 @@
     "missing": true,
     "obsolete": false
   },
-  "change_phonel": {
+  "change_phone": {
     "translation": "",
     "defaultMessage": "Change phone number",
     "description": "Prompt to change current phone number",
     "missing": true,
     "obsolete": false
+  },
+  "call_busy": {
+    "translation": "ocupat",
+    "defaultMessage": "busy",
+    "description": "Label for busy call line",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/ru.json

@@ -1634,11 +1634,18 @@
     "missing": true,
     "obsolete": false
   },
-  "change_phonel": {
+  "change_phone": {
     "translation": "",
     "defaultMessage": "Change phone number",
     "description": "Prompt to change current phone number",
     "missing": true,
     "obsolete": false
+  },
+  "call_busy": {
+    "translation": "занято",
+    "defaultMessage": "busy",
+    "description": "Label for busy call line",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/zh-TW.json

@@ -1634,11 +1634,18 @@
     "missing": true,
     "obsolete": false
   },
-  "change_phonel": {
+  "change_phone": {
     "translation": "",
     "defaultMessage": "Change phone number",
     "description": "Prompt to change current phone number",
     "missing": true,
     "obsolete": false
+  },
+  "call_busy": {
+    "translation": "忙碌的",
+    "defaultMessage": "busy",
+    "description": "Label for busy call line",
+    "missing": false,
+    "obsolete": false
   }
 }

src/i18n/zh.json

@@ -1634,11 +1634,18 @@
     "missing": true,
     "obsolete": false
   },
-  "change_phonel": {
+  "change_phone": {
     "translation": "",
     "defaultMessage": "Change phone number",
     "description": "Prompt to change current phone number",
     "missing": true,
     "obsolete": false
+  },
+  "call_busy": {
+    "translation": "忙碌的",
+    "defaultMessage": "busy",
+    "description": "Label for busy call line",
+    "missing": false,
+    "obsolete": false
   }
 }

src/version.js

@@ -1,3 +1,3 @@
 // This is a generated file. Don't edit.
 
-export const PACKAGE_VERSION = "0.21.0";
+export const PACKAGE_VERSION = "0.21.1";

src/widgets/call-message.jsx

@@ -7,7 +7,7 @@ import { secondsToTime } from '../lib/strformat.js';
 
 export default class CallMessage extends React.PureComponent {
   render() {
-    const isCallDropped = ['declined', 'disconnected', 'missed'].includes(this.props.callState);
+    const isCallDropped = ['busy', 'declined', 'disconnected', 'missed'].includes(this.props.callState);
     const successClass = 'material-icons medium ' + (isCallDropped ? 'red' : 'green');
     const callIcon = this.props.incoming ?
       (isCallDropped ? 'call_missed' : 'call_received') :
@@ -15,6 +15,9 @@ export default class CallMessage extends React.PureComponent {
     let duration;
     if (isCallDropped) {
       switch (this.props.callState) {
+        case 'busy':
+          duration = <FormattedMessage id="call_busy" defaultMessage="busy" description="Label for busy call line" />;
+          break;
         case 'declined':
           duration = <FormattedMessage id="call_declined" defaultMessage="declined" description="Label for declined call" />;
           break;

src/widgets/call-status.jsx

@@ -9,13 +9,16 @@ import { secondsToTime } from '../lib/strformat.js';
 //  success: true | false.
 export default class CallStatus extends React.PureComponent {
   render() {
-    const isCallDropped = ['declined', 'disconnected', 'missed'].includes(this.props.callState);
+    const isCallDropped = ['busy', 'declined', 'disconnected', 'missed'].includes(this.props.callState);
     const icon2 = this.props.incoming ?
       (isCallDropped ? 'call_missed' : 'call_received') :
       (isCallDropped ? 'call_missed_outgoing' : 'call_made');
     let duration;
     if (isCallDropped) {
       switch (this.props.callState) {
+        case 'busy':
+          duration = <FormattedMessage id="call_busy" defaultMessage="busy" description="Label for busy call line" />;
+          break;
         case 'declined':
           duration = <FormattedMessage id="call_declined" defaultMessage="declined" description="Label for declined call" />;
           break;

src/widgets/credential-edit.jsx

@@ -84,7 +84,7 @@ class CredentialEdit extends React.PureComponent {
 
     const changePhone = (
       <><div className="panel-form-row">
-      <label className="large"><FormattedMessage id="change_phonel" defaultMessage="Change phone number"
+      <label className="large"><FormattedMessage id="change_phone" defaultMessage="Change phone number"
         description="Prompt to change current phone number"/></label>
       </div>
       <div className="group">

umd/index.dev.js

@@ -3579,7 +3579,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "PACKAGE_VERSION": () => (/* binding */ PACKAGE_VERSION)
 /* harmony export */ });
-const PACKAGE_VERSION = "0.21.0";
+const PACKAGE_VERSION = "0.21.1";
 
 /***/ }),
 
@@ -10179,12 +10179,21 @@ __webpack_require__.r(__webpack_exports__);
 
 class CallMessage extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComponent) {
   render() {
-    const isCallDropped = ['declined', 'disconnected', 'missed'].includes(this.props.callState);
+    const isCallDropped = ['busy', 'declined', 'disconnected', 'missed'].includes(this.props.callState);
     const successClass = 'material-icons medium ' + (isCallDropped ? 'red' : 'green');
     const callIcon = this.props.incoming ? isCallDropped ? 'call_missed' : 'call_received' : isCallDropped ? 'call_missed_outgoing' : 'call_made';
     let duration;
     if (isCallDropped) {
       switch (this.props.callState) {
+        case 'busy':
+          duration = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
+            id: "call_busy",
+            defaultMessage: [{
+              "type": 0,
+              "value": "busy"
+            }]
+          });
+          break;
         case 'declined':
           duration = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
             id: "call_declined",
@@ -10866,11 +10875,20 @@ __webpack_require__.r(__webpack_exports__);
 
 class CallStatus extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureComponent) {
   render() {
-    const isCallDropped = ['declined', 'disconnected', 'missed'].includes(this.props.callState);
+    const isCallDropped = ['busy', 'declined', 'disconnected', 'missed'].includes(this.props.callState);
     const icon2 = this.props.incoming ? isCallDropped ? 'call_missed' : 'call_received' : isCallDropped ? 'call_missed_outgoing' : 'call_made';
     let duration;
     if (isCallDropped) {
       switch (this.props.callState) {
+        case 'busy':
+          duration = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
+            id: "call_busy",
+            defaultMessage: [{
+              "type": 0,
+              "value": "busy"
+            }]
+          });
+          break;
         case 'declined':
           duration = react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
             id: "call_declined",

umd/src_views_account-settings-view_jsx.dev.js

@@ -351,7 +351,7 @@ class CredentialEdit extends (react__WEBPACK_IMPORTED_MODULE_0___default().PureC
     }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
       className: "large"
     }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
-      id: "change_phonel",
+      id: "change_phone",
       defaultMessage: [{
         "type": 0,
         "value": "Change phone number"

version.js

@@ -1,3 +1,3 @@
 // This is a generated file. Don't edit.
 
-const PACKAGE_VERSION = "0.21.0";
+const PACKAGE_VERSION = "0.21.1";