diff --git a/src/main/resources/i18n/messages_en_US.properties b/src/main/resources/i18n/messages_en_US.properties index 8f53b6f4f..61fb4953f 100644 --- a/src/main/resources/i18n/messages_en_US.properties +++ b/src/main/resources/i18n/messages_en_US.properties @@ -82,6 +82,15 @@ admin.backup.title = Backup manage # categories page admin.categories.title = Categories +admin.categories.bread.posts = Posts management +admin.categories.text.edit-category = Edit category +admin.categories.text.add-category = Add category +admin.categories.form.cate-name = Category name +admin.categories.form.cate-name-tips = The name displayed on the page. +admin.categories.form.cate-url = Category url +admin.categories.form.cate-url-tips = *This is the name displayed on the article path,preferably in English. +admin.categories.form.cate-desc = Category description +admin.categories.form.cate-desc-tips = *Description of the classification,some topics can be displayed. # comments page admin.comments.title = Comments manage @@ -128,6 +137,8 @@ admin.themes.btn.setting = Setting admin.themes.btn.enable = Enable admin.themes.btn.activated = Activated admin.themes.bread.appearance = Appearance +admin.themes.js.install-theme = Install theme +admin.themes.js.theme-setting = theme setting # about page admin.halo.title = About Halo @@ -141,6 +152,20 @@ common.btn.save = Save common.btn.view-all = View all common.btn.upload-image = Upload images common.btn.define = OK +common.btn.cancel = Cancel +common.btn.view = View +common.btn.edit = Edit +common.btn.recycling = Recycling +common.btn.reduction = Reduction +common.btn.delete = Delete +common.btn.release = Release +common.btn.reply = Reply +common.btn.pass = Pass +common.btn.pass-reply = Pass and Reply +common.btn.define-edit = OK +common.btn.back-to-add = Back to add +common.btn.define-add = OK +common.btn.editing = Editing common.radio.display = Display common.radio.hide = Hide @@ -158,6 +183,10 @@ common.th.tags = Tags common.th.comments = Comments common.th.views = Views common.th.control = Control +common.th.name = Name +common.th.url = Url +common.th.desc = Desc +common.th.posts-count = Posts count common.status.published = Published common.status.checking = Pending Review @@ -165,6 +194,10 @@ common.status.recycle-bin = Recycle bin common.status.draft = Draft common.text.no-data = No data +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? # 分页信息 admin.pageinfo.text.no = ( diff --git a/src/main/resources/i18n/messages_zh_CN.properties b/src/main/resources/i18n/messages_zh_CN.properties index b4f5826ed..0221ed3ca 100644 --- a/src/main/resources/i18n/messages_zh_CN.properties +++ b/src/main/resources/i18n/messages_zh_CN.properties @@ -82,6 +82,15 @@ admin.backup.title = 备份管理 # 分类管理页面 admin.categories.title = 分类目录 +admin.categories.bread.posts = 文章管理 +admin.categories.text.edit-category = 修改分类目录 +admin.categories.text.add-category = 修改分类目录 +admin.categories.form.cate-name = 名称 +admin.categories.form.cate-name-tips = 页面上所显示的名称 +admin.categories.form.cate-url = 路径名称 +admin.categories.form.cate-url-tips = *这是文章路径上显示的名称，最好为英文 +admin.categories.form.cate-desc = 描述 +admin.categories.form.cate-desc-tips = *添加描述，部分主题可显示 # 评论管理页面 admin.comments.title = 评论管理 @@ -125,6 +134,8 @@ admin.themes.btn.setting = 设置 admin.themes.btn.enable = 启用 admin.themes.btn.activated = 已启用 admin.themes.bread.appearance = 外观 +admin.themes.js.install-theme = 安装主题 +admin.themes.js.theme-setting = 主题设置 # 主题编辑页面 admin.themes.edit.title = 主题编辑 @@ -141,6 +152,21 @@ common.btn.save = 保存 common.btn.view-all = 查看所有 common.btn.upload-image = 上传图片 common.btn.define = 确定 +common.btn.cancel = 取消 +common.btn.view = 查看 +common.btn.edit = 编辑 +common.btn.recycling = 丢弃 +common.btn.reduction = 还原 +common.btn.delete = 永久删除 +common.btn.release = 发布 +common.btn.reply = 回复 +common.btn.pass = 通过 +common.btn.pass-reply = 通过并回复 +common.btn.define-edit = 确定修改 +common.btn.back-to-add = 返回添加 +common.btn.define-add = 确定添加 +common.btn.editing = 正在修改 + common.radio.display = 显示 common.radio.hide = 隐藏 @@ -158,6 +184,10 @@ common.th.tags = 标签 common.th.comments = 评论 common.th.views = 访问量 common.th.control = 操作 +common.th.name = 名称 +common.th.url = 路径 +common.th.desc = 描述 +common.th.posts-count = 文章数 common.status.published = 已发布 @@ -166,6 +196,10 @@ common.status.recycle-bin = 回收站 common.status.draft = 草 稿 common.text.no-data = 暂无数据 +common.text.tips = 提示 +common.text.tips.to-recycle-bin = 确定移到回收站？ +common.text.tips.to-delete = 确定永久删除？(不可逆) +common.text.tips.to-release-post = 确定发布该文章？ # 分页信息 admin.pageinfo.text.no = 第 diff --git a/src/main/resources/templates/admin/admin_attachment.ftl b/src/main/resources/templates/admin/admin_attachment.ftl index a76fd45f6..b389625ca 100755 --- a/src/main/resources/templates/admin/admin_attachment.ftl +++ b/src/main/resources/templates/admin/admin_attachment.ftl @@ -82,7 +82,7 @@ $("#uploadForm").hide(400); $.toast({ text: "上传成功！", - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', allowToastClose: true, diff --git a/src/main/resources/templates/admin/admin_backup.ftl b/src/main/resources/templates/admin/admin_backup.ftl index 2eebfe352..94e87d634 100644 --- a/src/main/resources/templates/admin/admin_backup.ftl +++ b/src/main/resources/templates/admin/admin_backup.ftl @@ -14,7 +14,7 @@

<@spring.message code='admin.backup.title' />

  1. - 首页 + <@spring.message code='admin.index.bread.index' />
  2. 设置
  3. 备份管理
    4. @@ -95,7 +95,7 @@ if(data.code==1){ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', allowToastClose: true, @@ -112,7 +112,7 @@ }else{ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'error', showHideTransition: 'fade', allowToastClose: true, @@ -147,7 +147,7 @@ if(data.code==1){ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', allowToastClose: true, @@ -161,7 +161,7 @@ }else{ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'error', showHideTransition: 'fade', allowToastClose: true, @@ -193,7 +193,7 @@ if(data.code==1){ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', allowToastClose: true, @@ -210,7 +210,7 @@ }else{ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'error', showHideTransition: 'fade', allowToastClose: true, diff --git a/src/main/resources/templates/admin/admin_category.ftl b/src/main/resources/templates/admin/admin_category.ftl index bf5282c24..00e1cee22 100755 --- a/src/main/resources/templates/admin/admin_category.ftl +++ b/src/main/resources/templates/admin/admin_category.ftl @@ -15,10 +15,10 @@
    1. - 首页 + <@spring.message code='admin.index.bread.index' />
      2. -
    2. 文章管理
      3. -
    3. 分类目录
      4. +
    4. <@spring.message code='admin.categories.bread.posts' />
      5. +
    5. <@spring.message code='admin.categories.title' />
    @@ -27,56 +27,56 @@
    <#if updateCategory??>
    -

    修改分类目录<#if updateCategory??>[${updateCategory.cateName}]

    +

    <@spring.message code='admin.categories.text.edit-category' /> <#if updateCategory??>[${updateCategory.cateName}]

    - + - 页面上所显示的名称 + <@spring.message code='admin.categories.form.cate-name-tips' />
    - + - *这是文章路径上显示的名称，最好为英文 + <@spring.message code='admin.categories.form.cate-url-tips' />
    - + - *添加描述，部分主题可显示 + <@spring.message code='admin.categories.form.cate-url-tips' />
    - - 返回添加 + + <@spring.message code='common.btn.back-to-add' />
    <#else >
    -

    添加分类目录

    +

    <@spring.message code='admin.categories.text.add-category' />

    - + - 页面上所显示的名称 + <@spring.message code='admin.categories.form.cate-name-tips' />
    - + - *这是文章路径上显示的名称，最好为英文 + <@spring.message code='admin.categories.form.cate-url-tips' />
    - + - *添加描述，部分主题可显示 + <@spring.message code='admin.categories.form.cate-url-tips' />
    - +
    @@ -91,11 +91,11 @@ - - - - - + + + + + @@ -111,7 +111,7 @@ @@ -80,7 +80,7 @@ <#else > - + @@ -107,15 +107,15 @@
    -

    提示信息

    +

    <@spring.message code="common.text.tips" />

    - - 确定 + + <@spring.message code="common.btn.define" />
    @@ -137,8 +137,8 @@ - - + + diff --git a/src/main/resources/templates/admin/admin_option.ftl b/src/main/resources/templates/admin/admin_option.ftl index 0362a3685..b08a9da5a 100755 --- a/src/main/resources/templates/admin/admin_option.ftl +++ b/src/main/resources/templates/admin/admin_option.ftl @@ -739,7 +739,7 @@ }else{ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: icon, showHideTransition: 'fade', allowToastClose: true, diff --git a/src/main/resources/templates/admin/admin_page_md_editor.ftl b/src/main/resources/templates/admin/admin_page_md_editor.ftl index 69ad7e568..02374ebf3 100755 --- a/src/main/resources/templates/admin/admin_page_md_editor.ftl +++ b/src/main/resources/templates/admin/admin_page_md_editor.ftl @@ -244,7 +244,7 @@ if(data.code==1){ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', allowToastClose: true, @@ -261,7 +261,7 @@ }else{ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'error', showHideTransition: 'fade', allowToastClose: true, diff --git a/src/main/resources/templates/admin/admin_post.ftl b/src/main/resources/templates/admin/admin_post.ftl index afd8d58cd..535657555 100755 --- a/src/main/resources/templates/admin/admin_post.ftl +++ b/src/main/resources/templates/admin/admin_post.ftl @@ -93,19 +93,19 @@ @@ -113,7 +113,7 @@ <#else> - + @@ -140,15 +140,15 @@
    -

    提示信息

    +

    <@spring.message code='common.text.tips' />

    - - 确定 + + <@spring.message code='common.btn.define' />
    diff --git a/src/main/resources/templates/admin/admin_post_md_editor.ftl b/src/main/resources/templates/admin/admin_post_md_editor.ftl index cdac88cb8..3930e7b00 100755 --- a/src/main/resources/templates/admin/admin_post_md_editor.ftl +++ b/src/main/resources/templates/admin/admin_post_md_editor.ftl @@ -339,7 +339,7 @@ if(data.code==1){ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', allowToastClose: true, @@ -356,7 +356,7 @@ }else{ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'error', showHideTransition: 'fade', allowToastClose: true, diff --git a/src/main/resources/templates/admin/admin_profile.ftl b/src/main/resources/templates/admin/admin_profile.ftl index d76a74169..587a5050b 100644 --- a/src/main/resources/templates/admin/admin_profile.ftl +++ b/src/main/resources/templates/admin/admin_profile.ftl @@ -158,7 +158,7 @@ if(data.code==1){ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', allowToastClose: true, @@ -199,7 +199,7 @@ if(data.code==1){ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', allowToastClose: true, diff --git a/src/main/resources/templates/admin/admin_theme-editor.ftl b/src/main/resources/templates/admin/admin_theme-editor.ftl index eabc2af1c..e07a5e1db 100644 --- a/src/main/resources/templates/admin/admin_theme-editor.ftl +++ b/src/main/resources/templates/admin/admin_theme-editor.ftl @@ -149,7 +149,7 @@ if(data.code==1){ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', allowToastClose: true, @@ -163,7 +163,7 @@ }else{ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'error', showHideTransition: 'fade', allowToastClose: true, diff --git a/src/main/resources/templates/admin/admin_theme.ftl b/src/main/resources/templates/admin/admin_theme.ftl index 7d205944f..262ff8f2e 100755 --- a/src/main/resources/templates/admin/admin_theme.ftl +++ b/src/main/resources/templates/admin/admin_theme.ftl @@ -130,7 +130,7 @@ function openThemeInstall() { layer.open({ type: 2, - title: '安装主题', + title: '<@spring.message code="admin.themes.js.install-theme" />', shadeClose: true, shade: 0.5, maxmin: true, @@ -155,7 +155,7 @@ if(data.code==1){ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'success', showHideTransition: 'fade', allowToastClose: true, @@ -172,7 +172,7 @@ }else{ $.toast({ text: data.msg, - heading: '提示', + heading: '<@spring.message code="common.text.tips" />', icon: 'error', showHideTransition: 'fade', allowToastClose: true, @@ -196,7 +196,7 @@ function openSetting(theme,hasUpdate) { layer.open({ type: 2, - title: theme+'主题设置', + title: theme+' <@spring.message code="admin.themes.js.theme-setting" />', shadeClose: true, shade: 0.5, maxmin: true,
    名称路径描述文章数操作<@spring.message code='common.th.name' /><@spring.message code='common.th.url' /><@spring.message code='common.th.desc' /><@spring.message code='common.th.posts-count' /><@spring.message code='common.th.control' />
    <#if updateCategory?? && updateCategory.cateId?c==cate.cateId?c> - 正在修改 + <@spring.message code='common.btn.editing' /> <#else > 修改 @@ -134,15 +134,15 @@
    -

    提示信息

    +

    <@spring.message code='common.text.tips' />

    -

    您确认要删除吗？

    +

    <@spring.message code='common.text.tips.to-delete' />

    - - 确定 + + <@spring.message code='common.btn.define' />
    diff --git a/src/main/resources/templates/admin/admin_comment.ftl b/src/main/resources/templates/admin/admin_comment.ftl index 4afad7fa8..a2bfd5143 100755 --- a/src/main/resources/templates/admin/admin_comment.ftl +++ b/src/main/resources/templates/admin/admin_comment.ftl @@ -62,17 +62,17 @@     		<#switch comment.commentStatus> <#case 0> - - + + <#break > <#case 1> - 通过 - - + <@spring.message code="common.btn.pass" /> + + <#break > <#case 2> - 还原 - + <@spring.message code="common.btn.reduction" /> + <#break >
    暂无评论<@spring.message code="common.text.no-data" />
    <#switch post.postStatus> <#case 0> - 查看 - 编辑 - + <@spring.message code='common.btn.view' /> + <@spring.message code='common.btn.edit' /> + <#break > <#case 1> 编辑 - - + class="btn btn-info btn-xs "><@spring.message code="common.btn.edit" /> + + <#break > <#case 2> - 还原 - + <@spring.message code='common.btn.reduction' /> + <#break >
    暂无文章<@spring.message code='common.text.no-data' />