diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index 1c3e16466..88c5d5b66 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -56,7 +56,8 @@ "textStartAt": "Start At", "textTable": "Table", "textTableSize": "Table Size", - "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"" + "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", + "textOk": "Ok" }, "Common": { "Collaboration": { @@ -304,7 +305,8 @@ "textTopAndBottom": "Top and Bottom", "textTotalRow": "Total Row", "textType": "Type", - "textWrap": "Wrap" + "textWrap": "Wrap", + "textOk": "Ok" }, "Error": { "convertationTimeoutText": "Conversion timeout exceeded.", diff --git a/apps/documenteditor/mobile/src/controller/add/AddLink.jsx b/apps/documenteditor/mobile/src/controller/add/AddLink.jsx index 3a6ea52a5..ba1b1f882 100644 --- a/apps/documenteditor/mobile/src/controller/add/AddLink.jsx +++ b/apps/documenteditor/mobile/src/controller/add/AddLink.jsx @@ -34,7 +34,15 @@ class AddLinkController extends Component { const isEmail = (urltype == 2); if (urltype < 1) { - f7.dialog.alert(_t.txtNotUrl, _t.notcriticalErrorTitle); + f7.dialog.create({ + title: _t.notcriticalErrorTitle, + text: _t.txtNotUrl, + buttons: [ + { + text: t('Add.textOk') + } + ] + }).open(); return; } diff --git a/apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx b/apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx index cfb79fed1..39e0a7ad3 100644 --- a/apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx +++ b/apps/documenteditor/mobile/src/controller/edit/EditHyperlink.jsx @@ -28,7 +28,17 @@ class EditHyperlinkController extends Component { const isEmail = (urltype == 2); if (urltype < 1) { const { t } = this.props; - f7.dialog.alert(t('Edit.textNotUrl'), t('Edit.notcriticalErrorTitle')); + + f7.dialog.create({ + title: t('Edit.notcriticalErrorTitle'), + text: t('Edit.textNotUrl'), + buttons: [ + { + text: t('Edit.textOk') + } + ] + }).open(); + return; } let url = link.replace(/^\s+|\s+$/g,''); diff --git a/apps/presentationeditor/mobile/locale/en.json b/apps/presentationeditor/mobile/locale/en.json index 24a328345..3803ef688 100644 --- a/apps/presentationeditor/mobile/locale/en.json +++ b/apps/presentationeditor/mobile/locale/en.json @@ -237,7 +237,8 @@ "textSlideNumber": "Slide Number", "textTable": "Table", "textTableSize": "Table Size", - "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"" + "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", + "textOk": "Ok" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -385,7 +386,8 @@ "textZoom": "Zoom", "textZoomIn": "Zoom In", "textZoomOut": "Zoom Out", - "textZoomRotate": "Zoom and Rotate" + "textZoomRotate": "Zoom and Rotate", + "textOk": "Ok" }, "Settings": { "mniSlideStandard": "Standard (4:3)", diff --git a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx index 1c054a041..554ebc187 100644 --- a/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx +++ b/apps/presentationeditor/mobile/src/controller/add/AddLink.jsx @@ -42,7 +42,15 @@ class AddLinkController extends Component { const urltype = api.asc_getUrlType(url.trim()); const isEmail = (urltype == 2); if (urltype < 1) { - f7.dialog.alert(_t.txtNotUrl, _t.notcriticalErrorTitle); + f7.dialog.create({ + title: _t.notcriticalErrorTitle, + text: _t.txtNotUrl, + buttons: [ + { + text: t('View.Add.textOk') + } + ] + }).open(); return; } diff --git a/apps/presentationeditor/mobile/src/controller/edit/EditLink.jsx b/apps/presentationeditor/mobile/src/controller/edit/EditLink.jsx index 756545b16..037916bd7 100644 --- a/apps/presentationeditor/mobile/src/controller/edit/EditLink.jsx +++ b/apps/presentationeditor/mobile/src/controller/edit/EditLink.jsx @@ -99,7 +99,16 @@ class EditLinkController extends Component { const urltype = api.asc_getUrlType(url.trim()); const isEmail = (urltype == 2); if (urltype < 1) { - f7.dialog.alert(_t.textNotUrl, _t.notcriticalErrorTitle); + f7.dialog.create({ + title: t('View.Edit.notcriticalErrorTitle'), + text: t('View.Edit.textNotUrl'), + buttons: [ + { + text: t('View.Edit.textOk') + } + ] + }).open(); + return; } diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 5762f154d..7e57ed1d9 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -351,7 +351,8 @@ "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSorting": "Sorting", "txtSortSelected": "Sort selected", - "txtYes": "Yes" + "txtYes": "Yes", + "textOk": "Ok" }, "Edit": { "notcriticalErrorTitle": "Warning", @@ -531,7 +532,8 @@ "textYen": "Yen", "txtNotUrl": "This field should be a URL in the format \"http://www.example.com\"", "txtSortHigh2Low": "Sort Highest to Lowest", - "txtSortLow2High": "Sort Lowest to Highest" + "txtSortLow2High": "Sort Lowest to Highest", + "textOk": "Ok" }, "Settings": { "advCSVOptions": "Choose CSV options", diff --git a/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx b/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx index 683964fc1..ebb52d369 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/add/AddLink.jsx @@ -58,7 +58,15 @@ class AddLinkController extends Component { const isEmail = (urltype == 2); if (urltype < 1) { - f7.dialog.alert(_t.txtNotUrl, _t.notcriticalErrorTitle); + f7.dialog.create({ + title: _t.notcriticalErrorTitle, + text: _t.txtNotUrl, + buttons: [ + { + text: t('View.Add.textOk') + } + ] + }).open(); return; } diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx index 0f3d1c44a..523739b7c 100644 --- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx +++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditLink.jsx @@ -83,7 +83,16 @@ class EditLinkController extends Component { let urlType = api.asc_getUrlType(url.trim()); if (urlType < 1) { - f7.dialog.alert(_t.txtNotUrl, _t.notcriticalErrorTitle); + f7.dialog.create({ + title: t('View.Edit.notcriticalErrorTitle'), + text: t('View.Edit.textNotUrl'), + buttons: [ + { + text: t('View.Edit.textOk') + } + ] + }).open(); + return; }