diff --git a/andrea/footer.ftl b/andrea/footer.ftl index e83e343..f754099 100644 --- a/andrea/footer.ftl +++ b/andrea/footer.ftl @@ -15,8 +15,6 @@ }; var Label = { - "clearAllCacheLabel": "${clearAllCacheLabel}", - "clearCacheLabel": "${clearCacheLabel}", "adminLabel": "${adminLabel}", "logoutLabel": "${logoutLabel}", "skinDirName": "${skinDirName}", diff --git a/andrea/lang/lang_en_US.properties b/andrea/lang/lang_en_US.properties index 2860965..8a1ab4f 100644 --- a/andrea/lang/lang_en_US.properties +++ b/andrea/lang/lang_en_US.properties @@ -169,8 +169,6 @@ tagsLabel=Tags importedLabel=Imported captcha1Label=Captcha: captchaLabel=Captcha -clearAllCacheLabel=Clear all cache -clearCacheLabel=Clear cache indexLabel=Index nextArticle1Label=Next: previousArticle1Label=Previous: diff --git a/andrea/lang/lang_zh_CN.properties b/andrea/lang/lang_zh_CN.properties index 0cedee0..2d1c583 100644 --- a/andrea/lang/lang_zh_CN.properties +++ b/andrea/lang/lang_zh_CN.properties @@ -169,8 +169,6 @@ tagsLabel=\u6807\u7b7e importedLabel=\u5df2\u5bfc\u5165 captcha1Label=\u9a8c\u8bc1\u7801\uff1a captchaLabel=\u9a8c\u8bc1\u7801 -clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58 -clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58 indexLabel=\u9996\u9875 nextArticle1Label=\u65b0\u4e00\u7bc7\uff1a previousArticle1Label=\u65e7\u4e00\u7bc7\uff1a diff --git a/andrea/macro-comments.ftl b/andrea/macro-comments.ftl index be7373b..9808efd 100644 --- a/andrea/macro-comments.ftl +++ b/andrea/macro-comments.ftl @@ -38,6 +38,7 @@ <#if article.commentable>
${commentNameLabel} @@ -62,6 +63,7 @@ | |
---|---|
${commentEmotionsLabel} @@ -92,6 +94,7 @@ | |
${captchaLabel}
@@ -101,6 +104,7 @@
| |
diff --git a/classic/lang/lang_en_US.properties b/classic/lang/lang_en_US.properties index 8a33020..8c4e838 100644 --- a/classic/lang/lang_en_US.properties +++ b/classic/lang/lang_en_US.properties @@ -164,8 +164,6 @@ tagsLabel=Tags importedLabel=Imported captcha1Label=Captcha: captchaLabel=Captcha -clearAllCacheLabel=Clear all cache -clearCacheLabel=Clear cache indexLabel=Index nextArticle1Label=Next: previousArticle1Label=Previous: diff --git a/classic/lang/lang_zh_CN.properties b/classic/lang/lang_zh_CN.properties index d5ccf2b..96c8551 100644 --- a/classic/lang/lang_zh_CN.properties +++ b/classic/lang/lang_zh_CN.properties @@ -170,8 +170,6 @@ tagsLabel=\u6807\u7b7e importedLabel=\u5df2\u5bfc\u5165 captcha1Label=\u9a8c\u8bc1\u7801\uff1a captchaLabel=\u9a8c\u8bc1\u7801 -clearAllCacheLabel=\u6e05\u9664\u6240\u6709\u9875\u9762\u7f13\u5b58 -clearCacheLabel=\u6e05\u9664\u672c\u9875\u7f13\u5b58 indexLabel=\u9996\u9875 nextArticle1Label=\u65b0\u4e00\u7bc7\uff1a previousArticle1Label=\u65e7\u4e00\u7bc7\uff1a diff --git a/classic/macro-comments.ftl b/classic/macro-comments.ftl index 0f16a18..c4555b5 100644 --- a/classic/macro-comments.ftl +++ b/classic/macro-comments.ftl @@ -49,6 +49,7 @@ |
${postCommentsLabel}
+ <#if !isLoggedIn>@@ -62,17 +63,18 @@
- + #if>