Merge branch 'dev' of https://github.com/abpframework/abp into dev

5 years ago · 9dcf335b09
14 changed files with 5 additions and 15 deletions
--- a/docs/en/SMS-Sending.md
+++ b/docs/en/SMS-Sending.md
@ -82,7 +82,7 @@ The given `SendAsync` method in the example is an extension method to send an SM

 `NullSmsSender` is a the default implementation of the `ISmsSender`. It writes SMS content to the [standard logler](Logging.md), rather than actually sending the SMS.

-This class can be useful especially in development time where you generally don't want to send real SMS. **However, if you want to actually send SMS, you should implement the `IsSmsSender` in your application code.**
+This class can be useful especially in development time where you generally don't want to send real SMS. **However, if you want to actually send SMS, you should implement the `ISmsSender` in your application code.**

 ## Implementing the ISmsSender

@ -108,4 +108,4 @@ namespace AbpDemo

 ## More

-[ABP Commercial](https://commercial.abp.io/) provides Twilio integration package to send SMS over [Twilio service](https://docs.abp.io/en/commercial/latest/modules/twilio-sms).
+[ABP Commercial](https://commercial.abp.io/) provides Twilio integration package to send SMS over [Twilio service](https://docs.abp.io/en/commercial/latest/modules/twilio-sms).
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml
@ -42,7 +42,7 @@
 }

 <abp-card>
-    <abp-card-header title="@L["Update"].Value"></abp-card-header>
+    <abp-card-header title="@L["Edit"].Value"></abp-card-header>
    <abp-card-body>

        <div class="form-group">
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/index.js
@ -44,7 +44,6 @@ $(function () {
                                blogsService
                                    .delete(data.record.id)
                                    .then(function () {
-                                        abp.notify.info(l("SuccessfullyDeleted"));
                                        dataTable.ajax.reload();
                                    });
                            }
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/UpdateModal.cshtml
@ -13,7 +13,7 @@

 <abp-dynamic-form abp-model="ViewModel" asp-page="/CmsKit/Blogs/UpdateModal">
    <abp-modal>
-        <abp-modal-header title="@L["Update"].Value"></abp-modal-header>
+        <abp-modal-header title="@L["Edit"].Value"></abp-modal-header>
        <abp-modal-body>
            <abp-input asp-for="Id" />
            <abp-form-content />
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Blogs/index.js
@ -49,7 +49,6 @@ $(function () {
                                blogsService
                                    .delete(data.record.id)
                                    .then(function () {
-                                        abp.notify.info(l("SuccessfullyDeleted"));
                                        dataTable.ajax.reload();
                                    });
                            }
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/details.js
@ -73,7 +73,6 @@
                                commentsService
                                    .delete(data.record.id)
                                    .then(function () {
-                                        abp.notify.info(l("SuccessfullyDeleted"));
                                        _dataTable.ajax.reload();
                                    });
                            }
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Comments/index.js
@ -73,7 +73,6 @@
                                commentsService
                                    .delete(data.record.id)
                                    .then(function () {
-                                        abp.notify.info(l("SuccessfullyDeleted"));
                                        _dataTable.ajax.reload();
                                    });
                            }
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/index.js
@ -43,7 +43,6 @@
                                pagesService
                                    .delete(data.record.id)
                                    .then(function () {
-                                        abp.notify.info(l("SuccessfullyDeleted"));
                                        _dataTable.ajax.reload();
                                    });
                            }
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/EditModal.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/EditModal.cshtml
@ -14,7 +14,7 @@

 <abp-dynamic-form abp-model="ViewModel" asp-page="/CmsKit/Tags/EditModal">
    <abp-modal>
-        <abp-modal-header title="@L["Update"].Value"></abp-modal-header>
+        <abp-modal-header title="@L["Edit"].Value"></abp-modal-header>
        <abp-modal-body>
            <abp-input asp-for="Id" />
            <abp-form-content />
--- a/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Index.js
+++ b/modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Tags/Index.js
@ -44,7 +44,6 @@
                                service
                                    .delete(data.record.id)
                                    .then(function () {
-                                        abp.notify.info(l("SuccessfullyDeleted"));
                                        dataTable.ajax.reload(null, false);
                                    });
                            }
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/en.json
@ -112,7 +112,6 @@
    "SubjectPlaceholder": "Please type a subject",
    "Submit": "Submit",
    "Subscribe": "Subscribe",
-    "SuccessfullyDeleted": "Successfully deleted!",
    "SuccessfullySaved": "Successfully saved!",
    "TagDeletionConfirmationMessage": "Are you sure to delete '{0}' tag?",
    "Tags": "Tags",
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/tr.json
@ -102,7 +102,6 @@
    "SubjectPlaceholder": "Lütfen bir konu yazınız",
    "Submit": "Kaydet",
    "Subscribe": "Abone ol",
-    "SuccessfullyDeleted": "Başarıyla silindi!",
    "SuccessfullySaved": "Başarıyla kaydedildi!",
    "TagDeletionConfirmationMessage": "'{0}' etiketini silmek istediğinize emin misiniz?",
    "Tags": "Etiketler",
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hans.json
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hans.json
@ -101,7 +101,6 @@
    "SubjectPlaceholder": "请输入主题",
    "Submit": "提交",
    "Subscribe": "订阅",
-    "SuccessfullyDeleted": "删除成功!",
    "SuccessfullySaved": "保存成功!",
    "TagDeletionConfirmationMessage": "你确定删除 '{0}' 标签吗?",
    "Tags": "标签",
--- a/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hant.json
+++ b/modules/cms-kit/src/Volo.CmsKit.Domain.Shared/Volo/CmsKit/Localization/Resources/zh-Hant.json
@ -102,7 +102,6 @@
    "SubjectPlaceholder": "請輸入主題",
    "Submit": "提交",
    "Subscribe": "訂閱",
-    "SuccessfullyDeleted": "刪除成功!",
    "SuccessfullySaved": "保存成功!",
    "TagDeletionConfirmationMessage": "你確定刪除 '{0}' 標籤嗎?",
    "Tags": "標籤",