From 388f498b8c81153bebc30b53a2f671531834015c Mon Sep 17 00:00:00 2001 From: ruibaby Date: Sat, 15 Sep 2018 13:10:07 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20=E7=BF=BB=E8=AF=91=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/i18n/messages_en_US.properties | 33 +++++++++++++++++++ .../resources/i18n/messages_zh_CN.properties | 33 +++++++++++++++++++ .../templates/admin/admin_attachment.ftl | 4 +-- .../admin/widget/_attachment-detail.ftl | 24 +++++++------- .../admin/widget/_attachment-select-post.ftl | 10 +++--- .../admin/widget/_attachment-select.ftl | 8 ++--- .../admin/widget/_gallery-detail.ftl | 24 +++++++------- .../templates/admin/widget/_logs-all.ftl | 12 +++---- .../templates/admin/widget/_theme-install.ftl | 12 +++---- 9 files changed, 112 insertions(+), 48 deletions(-) diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties index 40ccd605a..56559e98a 100644 --- a/src/main/resources/i18n/messages_en_US.properties +++ b/src/main/resources/i18n/messages_en_US.properties @@ -78,9 +78,27 @@ admin.index.blog-data.comments-count-text = A total of {0} comments was received admin.index.blog-data.links-count-text = A total of {0} friend chains have been added. admin.index.blog-data.views-count-text = The posts was visited {0} times in total. +# logs page +admin.logs.th.log-id = Log number +admin.logs.th.log-action = trigger event +admin.logs.th.log-result = produces result +admin.logs.th.log-datetime = Time of production + # attachments page admin.attachments.title = Attachments manage admin.attachments.btn.upload = Upload +admin.attachments.js.modal.detail-title = Attachment details +admin.attachments.modal.detail-title = Attachment details +admin.attachments.modal.form.attach-name = Attachment name: +admin.attachments.modal.form.attach-type = Attachment type: +admin.attachments.modal.form.attach-path = Attachment path: +admin.attachments.modal.form.attach-created = Upload time: +admin.attachments.modal.form.attach-storage = Attachment size: +admin.attachments.modal.form.attach-size = Size of the picture: +admin.attachments.modal.form.btn.copy-path = Copy link +admin.attachments.modal.js.copy-success = Successful copy! +admin.attachments.modal.select.tab.all-attach = All attachments +admin.attachments.modal.select.tab.upload = Local Upload # backup page admin.backup.title = Backup manage @@ -129,6 +147,13 @@ admin.pages.title = Pages manage # pages gallery page admin.pages.galleries.title = Galleries page +admin.pages.galleries.form.gallery-name = Picture name: +admin.pages.galleries.form.gallery-desc = Picture description: +admin.pages.galleries.form.gallery-date = Picture date: +admin.pages.galleries.form.gallery-location = Filming locations: +admin.pages.galleries.form.gallery-url = Picture src: +admin.pages.galleries.form.gallery-thumbnail-url = Thumbnail src: +admin.pages.galleries.modal.title = Picture details # pages link page admin.pages.links.title = Links page @@ -176,6 +201,13 @@ admin.themes.btn.activated = Activated admin.themes.bread.appearance = Appearance admin.themes.js.install-theme = Install theme admin.themes.js.theme-setting = theme setting +admin.themes.modal.install.tab.upload = Local upload +admin.themes.modal.install.tab.pull = Remote pull +admin.themes.modal.install.tips = Git must be installed to use this feature, otherwise it will not work. More topics please click +admin.themes.modal.install.form.remote-address = Remote address: +admin.themes.modal.install.form.theme-name = Theme name: +admin.themes.modal.install.btn.install = Install +admin.themes.modal.install.btn.installing = Installing... # about page admin.halo.title = About Halo @@ -242,6 +274,7 @@ common.text.tips = Tips common.text.tips.to-recycle-bin = Are you sure to move to the recycle bin? common.text.tips.to-delete = Are you sure to delete permanently?(Irreversible) common.text.tips.to-release-post = Are you sure you want to publish this article? +common.text.define-delete = Are you sure you want to delete? # js common.js.all-attachment = All attachments diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties index 81a63137a..a5814e862 100644 --- a/src/main/resources/i18n/messages_zh_CN.properties +++ b/src/main/resources/i18n/messages_zh_CN.properties @@ -78,9 +78,27 @@ admin.index.blog-data.comments-count-text = 累计获得了 {0} 条评论。 admin.index.blog-data.links-count-text = 累计添加了 {0} 个友链。 admin.index.blog-data.views-count-text = 文章总访问 {0} 次。 +# logs page +admin.logs.th.log-id = 日志编号 +admin.logs.th.log-action = 触发事件 +admin.logs.th.log-result = 产生结果 +admin.logs.th.log-datetime = 产生时间 + # 附件管理页面 admin.attachments.title = 附件管理 admin.attachments.btn.upload = 上传 +admin.attachments.js.modal.detail-title = 附件详情 +admin.attachments.modal.detail-title = 附件详情 +admin.attachments.modal.form.attach-name = 附件名： +admin.attachments.modal.form.attach-type = 附件类型： +admin.attachments.modal.form.attach-path = 附件路径： +admin.attachments.modal.form.attach-created = 上传时间： +admin.attachments.modal.form.attach-storage = 附件大小： +admin.attachments.modal.form.attach-size = 图片尺寸： +admin.attachments.modal.form.btn.copy-path = 复制链接 +admin.attachments.modal.js.copy-success = 复制成功！ +admin.attachments.modal.select.tab.all-attach = 所有附件 +admin.attachments.modal.select.tab.upload = 本地上传 # 备份管理页面 admin.backup.title = 备份管理 @@ -129,6 +147,13 @@ admin.pages.title = 页面管理 # 图库页面管理 admin.pages.galleries.title = 图库页面 +admin.pages.galleries.form.gallery-name = 图片名称： +admin.pages.galleries.form.gallery-desc = 图片描述： +admin.pages.galleries.form.gallery-date = 图片日期： +admin.pages.galleries.form.gallery-location = 拍摄地点： +admin.pages.galleries.form.gallery-url = 图片地址： +admin.pages.galleries.form.gallery-thumbnail-url = 缩略图地址： +admin.pages.galleries.modal.title = 图片详情 # 友情链接页面管理 admin.pages.links.title = 友情链接 @@ -176,6 +201,13 @@ admin.themes.btn.activated = 已启用 admin.themes.bread.appearance = 外观 admin.themes.js.install-theme = 安装主题 admin.themes.js.theme-setting = 主题设置 +admin.themes.modal.install.tab.upload = 本地上传 +admin.themes.modal.install.tab.pull = 远程拉取 +admin.themes.modal.install.tips = 使用该功能必须安装Git，否则无法使用。更多主题请点击 +admin.themes.modal.install.form.remote-address = 远程地址： +admin.themes.modal.install.form.theme-name = 主题名称： +admin.themes.modal.install.btn.install = 安装 +admin.themes.modal.install.btn.installing = 安装中... # 关于页面 admin.halo.title = 关于Halo @@ -242,6 +274,7 @@ common.text.tips = 提示 common.text.tips.to-recycle-bin = 确定移到回收站？ common.text.tips.to-delete = 确定永久删除？(不可逆) common.text.tips.to-release-post = 确定发布该文章？ +common.text.define-delete = 你确定要删除？ # js common.js.all-attachment = 所有附件 diff --git a/src/main/resources/templates/admin/admin_attachment.ftl b/src/main/resources/templates/admin/admin_attachment.ftl index b389625ca..06fe276ad 100755 --- a/src/main/resources/templates/admin/admin_attachment.ftl +++ b/src/main/resources/templates/admin/admin_attachment.ftl @@ -58,7 +58,7 @@ function openDetail(id) { layer.open({ type: 2, - title: '附件详情', + title: '<@spring.message code="admin.attachments.js.modal.detail-title" />', shadeClose: true, shade: 0.5, maxmin: true, @@ -81,7 +81,7 @@ if(data.success=="1"){ $("#uploadForm").hide(400); $.toast({ - text: "上传成功！", + text: data.message, heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', diff --git a/src/main/resources/templates/admin/widget/_attachment-detail.ftl b/src/main/resources/templates/admin/widget/_attachment-detail.ftl index cba08149f..eaa826486 100644 --- a/src/main/resources/templates/admin/widget/_attachment-detail.ftl +++ b/src/main/resources/templates/admin/widget/_attachment-detail.ftl @@ -21,50 +21,50 @@
-

详细信息

+

<@spring.message code='admin.attachments.modal.detail-title' />

- +
- +
- +
- +
- +
- +
- - + +
@@ -81,9 +81,9 @@ diff --git a/src/main/resources/templates/admin/widget/_attachment-select-post.ftl b/src/main/resources/templates/admin/widget/_attachment-select-post.ftl index 214fc22e9..d7613e304 100644 --- a/src/main/resources/templates/admin/widget/_attachment-select-post.ftl +++ b/src/main/resources/templates/admin/widget/_attachment-select-post.ftl @@ -15,10 +15,10 @@
@@ -33,7 +33,7 @@
- 第${attachments.number+1}/${attachments.totalPages}页 + <@spring.message code='admin.pageinfo.text.no' />${attachments.number+1}/${attachments.totalPages}<@spring.message code='admin.pageinfo.text.page' />
  • <@spring.message code='admin.pageinfo.btn.first' />
    • @@ -81,7 +81,7 @@ if(data.success=="1"){ $("#uploadForm").hide(400); $.toast({ - text: "上传成功！", + text: data.message, heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', @@ -102,7 +102,7 @@ var clipboard = new Clipboard('.thumbnail'); }); $('.thumbnail').click(function () { - showMsg("复制成功","success",1000) + showMsg("<@spring.message code='admin.attachments.modal.js.copy-success' />","success",1000) }) diff --git a/src/main/resources/templates/admin/widget/_attachment-select.ftl b/src/main/resources/templates/admin/widget/_attachment-select.ftl index c323a4159..0b25a6d7d 100644 --- a/src/main/resources/templates/admin/widget/_attachment-select.ftl +++ b/src/main/resources/templates/admin/widget/_attachment-select.ftl @@ -15,10 +15,10 @@
    @@ -33,7 +33,7 @@
    - 第${attachments.number+1}/${attachments.totalPages}页 + <@spring.message code='admin.pageinfo.text.no' />${attachments.number+1}/${attachments.totalPages}<@spring.message code='admin.pageinfo.text.page' />
    • <@spring.message code='admin.pageinfo.btn.first' />
      • @@ -79,7 +79,7 @@ if(data.success=="1"){ $("#uploadForm").hide(400); $.toast({ - text: "上传成功！", + text: data.message, heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', diff --git a/src/main/resources/templates/admin/widget/_gallery-detail.ftl b/src/main/resources/templates/admin/widget/_gallery-detail.ftl index 1ea816787..84ff5585c 100644 --- a/src/main/resources/templates/admin/widget/_gallery-detail.ftl +++ b/src/main/resources/templates/admin/widget/_gallery-detail.ftl @@ -21,50 +21,50 @@
      -

      详细信息

      +

      <@spring.message code='admin.pages.galleries.modal.title' />

      - +
      - +
      - +
      - +
      - +
      - +
      - +
      @@ -81,9 +81,9 @@ - diff --git a/src/main/resources/templates/admin/widget/_theme-install.ftl b/src/main/resources/templates/admin/widget/_theme-install.ftl index 0d1da7852..c14a2e6a3 100644 --- a/src/main/resources/templates/admin/widget/_theme-install.ftl +++ b/src/main/resources/templates/admin/widget/_theme-install.ftl @@ -25,10 +25,10 @@
      @@ -48,23 +48,23 @@
      - +
      - +
      - +