diff --git a/apps/common/mobile/lib/view/About.jsx b/apps/common/mobile/lib/view/About.jsx
index f553ab95c..8d61d482b 100644
--- a/apps/common/mobile/lib/view/About.jsx
+++ b/apps/common/mobile/lib/view/About.jsx
@@ -52,7 +52,7 @@ const PageAbout = props => {
{addressCustomer && addressCustomer.length ? (
- {addressCustomer}
+ {addressCustomer}
) : null}
{mailCustomer && mailCustomer.length ? (
@@ -63,7 +63,7 @@ const PageAbout = props => {
) : null}
{urlCustomer && urlCustomer.length ? (
-
{urlCustomer}
@@ -82,7 +82,7 @@ const PageAbout = props => {
{publisherName}
- {publisherPrintUrl}
+ {publisherPrintUrl}
@@ -110,7 +110,7 @@ const PageAbout = props => {
{__PUBLISHER_PHONE__}
- {publisherPrintUrl}
+ {publisherPrintUrl}
diff --git a/apps/common/mobile/lib/view/collaboration/Collaboration.jsx b/apps/common/mobile/lib/view/collaboration/Collaboration.jsx
index b2cc1b013..c7e183169 100644
--- a/apps/common/mobile/lib/view/collaboration/Collaboration.jsx
+++ b/apps/common/mobile/lib/view/collaboration/Collaboration.jsx
@@ -25,7 +25,6 @@ const PageUsers = inject("users")(observer(props => {
}
- {_t.textEditUser}
{storeUsers.editUsers.map((user, i) => (
1 ? ` (${user.count})` : '')} key={i}>
diff --git a/apps/common/mobile/lib/view/collaboration/Comments.jsx b/apps/common/mobile/lib/view/collaboration/Comments.jsx
index d8927fca7..3168df6f2 100644
--- a/apps/common/mobile/lib/view/collaboration/Comments.jsx
+++ b/apps/common/mobile/lib/view/collaboration/Comments.jsx
@@ -616,7 +616,7 @@ const pickLink = (message) => {
arrayComment = arrayComment.sort(function(item1,item2){ return item1.start - item2.start; });
- let str_res = (arrayComment.length>0) ? : ;
+ let str_res = (arrayComment.length>0) ? : ;
for (var i=1; i{str_res}{Common.Utils.String.htmlEncode(message.substring(arrayComment[i-1].end, arrayComment[i].start))}{arrayComment[i].str};
diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json
index 6d6459902..8dcc852a7 100644
--- a/apps/presentationeditor/mobile/locale/en.json
+++ b/apps/presentationeditor/mobile/locale/en.json
@@ -115,12 +115,12 @@
"textReplaceSuccess": "The search has been done. Occurrences replaced: {0}",
"textYes": "Yes",
"titleLicenseExp": "License expired",
+ "warnLicenseExp": "Your license has expired. Please, update your license and refresh the page.",
"titleServerVersion": "Editor updated",
"titleUpdateVersion": "Version changed",
"txtIncorrectPwd": "Password is incorrect",
"txtProtected": "Once you enter the password and open the file, the current password to the file will be reset",
"warnLicenseExceeded": "You've reached the limit for simultaneous connections to %1 editors. This document will be opened for viewing only. Contact your administrator to learn more.",
- "warnLicenseExp": "Your license has expired. Please, update it and refresh the page.",
"warnLicenseLimitedNoAccess": "License expired. You have no access to document editing functionality. Please, contact your administrator.",
"warnLicenseLimitedRenewed": "License needs to be renewed. You have limited access to document editing functionality.
Please contact your administrator to get full access",
"warnLicenseUsersExceeded": "You've reached the user limit for %1 editors. Contact your administrator to learn more.",
diff --git a/apps/presentationeditor/mobile/src/controller/Main.jsx b/apps/presentationeditor/mobile/src/controller/Main.jsx
index d37b60bfe..405af2c66 100644
--- a/apps/presentationeditor/mobile/src/controller/Main.jsx
+++ b/apps/presentationeditor/mobile/src/controller/Main.jsx
@@ -162,8 +162,26 @@ class MainController extends Component {
const onEditorPermissions = params => {
const licType = params.asc_getLicenseType();
+ const { t } = this.props;
+ // const _t = t('Controller.Main', { returnObjects:true });
+
+ if (Asc.c_oLicenseResult.Expired === licType ||
+ Asc.c_oLicenseResult.Error === licType ||
+ Asc.c_oLicenseResult.ExpiredTrial === licType) {
- this.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
+ f7.dialog.create({
+ title: t('Controller.Main.titleLicenseExp'),
+ text: t('Controller.Main.warnLicenseExp')
+ }).open();
+
+ return;
+ }
+
+ if (Asc.c_oLicenseResult.ExpiredLimited === licType) {
+ this._state.licenseType = licType;
+ }
+
+ this.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
const storeAppOptions = this.props.storeAppOptions;
storeAppOptions.setPermissionOptions(this.document, licType, params, this.permissions, EditorUIController.isSupportEditFeature());
diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json
index 7d19d74b2..da393749d 100644
--- a/apps/spreadsheeteditor/mobile/locale/en.json
+++ b/apps/spreadsheeteditor/mobile/locale/en.json
@@ -74,6 +74,8 @@
"errorUpdateVersion": "The file version has been changed. The page will be reloaded.",
"leavePageText": "You have unsaved changes in this document. Click 'Stay on this Page' to wait for autosave. Click 'Leave this Page' to discard all the unsaved changes.",
"notcriticalErrorTitle": "Warning",
+ "titleLicenseExp": "License expired",
+ "warnLicenseExp": "Your license has expired. Please, update your license and refresh the page.",
"SDK": {
"txtAccent": "Accent",
"txtAll": "(All)",
diff --git a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
index de031d0e1..de6c16a5b 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/Main.jsx
@@ -207,6 +207,25 @@ class MainController extends Component {
const onEditorPermissions = params => {
const licType = params.asc_getLicenseType();
+ const { t } = this.props;
+ // const _t = t('Controller.Main', { returnObjects:true });
+
+ if (Asc.c_oLicenseResult.Expired === licType ||
+ Asc.c_oLicenseResult.Error === licType ||
+ Asc.c_oLicenseResult.ExpiredTrial === licType) {
+
+ f7.dialog.create({
+ title: t('Controller.Main.titleLicenseExp'),
+ text: t('Controller.Main.warnLicenseExp')
+ }).open();
+
+ return;
+ }
+
+ if (Asc.c_oLicenseResult.ExpiredLimited === licType) {
+ this._state.licenseType = licType;
+ }
+
this.appOptions.canLicense = (licType === Asc.c_oLicenseResult.Success || licType === Asc.c_oLicenseResult.SuccessLimit);
const appOptions = this.props.storeAppOptions;