github
/
halo
mirror of https://github.com/halo-dev/halo
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed message args problem

pull/137/head
ruibaby 2019-03-15 14:40:30 +08:00
parent 3ff6dcecb4
commit f11b3ca65a
4 changed files with 31 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/resources/i18n/messages.properties
View File

@ -75,19 +75,13 @@ admin.index.widgets.logs-lastest = 最新日志
admin.index.widgets.btn.clear-logs = 清空日志
admin.index.widgets.text.all-logs = 所有日志
admin.index.blog-data.title = 博客数据
admin.index.blog-data.days-count-before = 已经运行
admin.index.blog-data.days-count-after = 天了。
admin.index.blog-data.days-count = 已经运行 <span id="blogStartDay">{0}</span> 天了。
admin.index.blog-data.during = 在此期间：
admin.index.blog-data.posts-count-before = 累计发表了
admin.index.blog-data.posts-count-after = 篇文章。
admin.index.blog-data.tags-count-before = 累计创建了
admin.index.blog-data.tags-count-after = 个标签。
admin.index.blog-data.comments-count-before = 累计获得了
admin.index.blog-data.comments-count-after = 条评论。
admin.index.blog-data.links-count-before = 累计添加了
admin.index.blog-data.links-count-after = 个友链。
admin.index.blog-data.views-count-before = 文章总访问
admin.index.blog-data.views-count-after = 次。
admin.index.blog-data.posts-count = 累计发表了 {0} 篇文章。
admin.index.blog-data.tags-count = 累计创建了 {0} 个标签。
admin.index.blog-data.comments-count = 累计获得了 {0} 条评论。
admin.index.blog-data.links-count = 累计添加了 {0} 个友链。
admin.index.blog-data.views-count = 文章总访问 {0} 次。
# logs page
admin.logs.th.log-id = 日志编号

18
src/main/resources/i18n/messages_en_US.properties
View File

@ -75,19 +75,13 @@ admin.index.widgets.logs-lastest = Newest logs
admin.index.widgets.btn.clear-logs = Clear logs
admin.index.widgets.text.all-logs = All logs
admin.index.blog-data.title = Blog data
admin.index.blog-data.days-count-before = Has been running for 5 days
admin.index.blog-data.days-count-after = days.
admin.index.blog-data.days-count = Has been running for <span id="blogStartDay">{0}</span> days
admin.index.blog-data.during = During this period:
admin.index.blog-data.posts-count-before = Accumulated
admin.index.blog-data.posts-count-after = articles.
admin.index.blog-data.tags-count-before = Cumulatively created
admin.index.blog-data.tags-count-after = tags.
admin.index.blog-data.comments-count-before = Accumulated
admin.index.blog-data.comments-count-after = comments.
admin.index.blog-data.links-count-before = Added
admin.index.blog-data.links-count-after = links cumulatively.
admin.index.blog-data.views-count-before = Article received
admin.index.blog-data.views-count-after = total visits.
admin.index.blog-data.posts-count = Accumulated {0} articles.
admin.index.blog-data.tags-count = Cumulatively created {0} tags.
admin.index.blog-data.comments-count = Accumulated {0} comments.
admin.index.blog-data.links-count = Added {0} links cumulatively.
admin.index.blog-data.views-count = Article received {0} total visits.
# logs page
admin.logs.th.log-id = Log number

18
src/main/resources/i18n/messages_zh_CN.properties
View File

@ -75,19 +75,13 @@ admin.index.widgets.logs-lastest = 最新日志
admin.index.widgets.btn.clear-logs = 清空日志
admin.index.widgets.text.all-logs = 所有日志
admin.index.blog-data.title = 博客数据
admin.index.blog-data.days-count-before = 已经运行
admin.index.blog-data.days-count-after = 天了。
admin.index.blog-data.days-count = 已经运行 <span id="blogStartDay">{0}</span> 天了。
admin.index.blog-data.during = 在此期间：
admin.index.blog-data.posts-count-before = 累计发表了
admin.index.blog-data.posts-count-after = 篇文章。
admin.index.blog-data.tags-count-before = 累计创建了
admin.index.blog-data.tags-count-after = 个标签。
admin.index.blog-data.comments-count-before = 累计获得了
admin.index.blog-data.comments-count-after = 条评论。
admin.index.blog-data.links-count-before = 累计添加了
admin.index.blog-data.links-count-after = 个友链。
admin.index.blog-data.views-count-before = 文章总访问
admin.index.blog-data.views-count-after = 次。
admin.index.blog-data.posts-count = 累计发表了 {0} 篇文章。
admin.index.blog-data.tags-count = 累计创建了 {0} 个标签。
admin.index.blog-data.comments-count = 累计获得了 {0} 条评论。
admin.index.blog-data.links-count = 累计添加了 {0} 个友链。
admin.index.blog-data.views-count = 文章总访问 {0} 次。
# logs page
admin.logs.th.log-id = 日志编号

21
src/main/resources/templates/admin/admin_index.ftl
View File

@ -355,15 +355,20 @@
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="blog-data"><@spring.message code='admin.index.blog-data.title' /></h4>
</div>
<#assign daysArgs = ['${hadDays!}'] />
<#assign postsArgs= ['${postsCount!0}'] />
<#assign tagsArgs= [1] />
<#assign commentsArgs= ['${commentsCount!}'] />
<#assign linksArgs= [1] />
<#assign viewsArgs= ['${postViewsSum}'] />
<div class="modal-body">
<#--<p>「${options.blog_title!}」<@spring.message code='admin.index.blog-data.days-count-before' /><span id="blogStartDay">${hadDays!}</span><@spring.message code='admin.index.blog-data.days-count-after' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.during' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.posts-count-before' />&nbsp;${postsCount!0}&nbsp;<@spring.message code='admin.index.blog-data.posts-count-after' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.tags-count-before' />&nbsp;<@commonTag method="tags">${tags?size}</@commonTag>&nbsp;<@spring.message code='admin.index.blog-data.tags-count-after' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.comments-count-before' />&nbsp;${commentsCount!}&nbsp;<@spring.message code='admin.index.blog-data.comments-count-after' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.links-count-before' />&nbsp;<@commonTag method="links">${links?size}</@commonTag>&nbsp;<@spring.message code='admin.index.blog-data.links-count-after' /></p>-->
<#--<p><@spring.message code='admin.index.blog-data.views-count-before' />&nbsp;${postViewsSum!0}&nbsp;<@spring.message code='admin.index.blog-data.views-count-after' /></p>-->
开发中...
<p>「${options.blog_title!}」<@spring.message 'admin.index.blog-data.days-count' daysArgs/></p>
<p><@spring.message 'admin.index.blog-data.during' /></p>
<p><@spring.message 'admin.index.blog-data.posts-count' postsArgs/></p>
<p><@spring.message 'admin.index.blog-data.tags-count' tagsArgs/></p>
<p><@spring.message 'admin.index.blog-data.comments-count' commentsArgs/></p>
<p><@spring.message 'admin.index.blog-data.links-count' linksArgs/></p>
<p><@spring.message 'admin.index.blog-data.views-count' viewsArgs/></p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-primary" data-dismiss="modal"><@spring.message code='common.btn.define' /></button>