🌐 清理无用的多语言配置项

src/main/java/org/b3log/solo/service/DataModelService.java

@@ -1047,8 +1047,6 @@ public class DataModelService {
             topBarModel.put(Common.ONLINE_VISITOR_CNT, StatisticQueryService.getOnlineVisitorCount());
             if (null == currentUser) {
                 topBarModel.put(Common.LOGIN_URL, userQueryService.getLoginURL(Common.ADMIN_INDEX_URI));
-                topBarModel.put("loginLabel", langPropsService.get("loginLabel"));
-                topBarModel.put("registerLabel", langPropsService.get("registerLabel"));
                 topBarModel.put("startToUseLabel", langPropsService.get("startToUseLabel"));
                 topBarTemplate.process(topBarModel, stringWriter);
 

src/main/resources/lang_en_US.properties

@@ -135,8 +135,6 @@ timeZoneId1Label=Time Zone:
 adminLabel=Admin
 roleLabel=Role
 administratorLabel=Administrator
-loginLabel=Login
-loginFailLabel=Login Fail :-(
 logoutLabel=Logout
 initLabel=Initial
 popTagsLabel=Popular Tags
@@ -228,8 +226,6 @@ selectDateLabel=Select Date
 selectDate1Label=Select Date: 
 selectLabel=Select
 importLabel=Import
-chooseBlog1Label=Choose Blog:
-blogArticleImportLabel=Article Import
 userNameLabel=Username
 userName1Label=Username:
 userLabel=User
@@ -269,9 +265,6 @@ saveLabel=Save
 autoSaveLabel=Auto Save
 tagLabel=Tag
 tagsLabel=Tags
-importedLabel=Imported
-captcha1Label=Captcha:
-captchaLabel=Captcha
 indexLabel=Index
 nextArticle1Label=Next:
 previousArticle1Label=Previous:
@@ -337,7 +330,6 @@ unPulbishSuccLabel=Un Publish Successfully
 unPulbishFailLabel=Un Publish Fail
 removeSuccLabel=Remove Successfully
 removeFailLabel=Remove Fail
-removeUserFailSkinNeedMulUsersLabel=Remove Fail, the current skin need multiple users!
 putTopSuccLabel=Put Top Successfully
 putTopFailLabel=Put Top Fail
 cancelTopSuccLabel=Cancel Top Successfully
@@ -346,18 +338,13 @@ addSuccLabel=Add Successfully
 addFailLabel=Add Fail
 updateSuccLabel=Update Successfully
 updateFailLabel=Update Fail
-updatePreferenceFailNeedMulUsersLabel=Update Fail, the selected skin need multiple users!
 setFailLabel=Set Fail
 setSuccLabel=Set Successfully
 getFailLabel=Get Fail
 getSuccLabel=Get Successfully
-importSuccLabel=Import Successfully :-)
-importFailLabel=Some Import Fail %>_<%
 noCommentLabel=No Comment
-captchaErrorLabel=Captcha Error
 inputErrorLabel=Input Error!
 gotoLabel=Go
-nameEmptyLabel=Username is empty
 passwordNotMatchLabel=Password Not Match 
 notAllowCommentLabel=Not allow comment!
 nameTooLongLabel=Sorry, your username must be between 2 and 20 characters long.
@@ -365,7 +352,6 @@ categoryTooLongLabel=Sorry, category name must be between 2 and 32 characters lo
 urlInvalidLabel=URL is invalid
 nonNegativeIntegerOnlyLabel=Non-Negative integer only
 commentContentCannotEmptyLabel=Sorry, your content must be between 2 and 500 characters long.
-captchaCannotEmptyLabel=Captcha is empty
 loadingLabel=Loading....
 titleEmptyLabel=Title is empty
 contentEmptyLabel=Content is empty
@@ -381,8 +367,6 @@ duplicatedUserNameLabel=Duplicated username!
 refreshAndRetryLabel=Please refresh and try again!
 editorLeaveLabel=Content is not null, Do you leave?
 editorPostLabel=Content is not null, Do you clear?
-registerSoloUserLabel=Register Solo User
-registerLabel=Register
 changeRoleLabel=Change Role
 ####
 confirmRemoveLabel=Are You Remove

src/main/resources/lang_zh_CN.properties

@@ -135,8 +135,6 @@ timeZoneId1Label=\u65F6\u533A\uFF1A
 adminLabel=\u7BA1\u7406
 roleLabel=\u89D2\u8272
 administratorLabel=\u7BA1\u7406\u5458
-loginLabel=\u767B\u5F55
-loginFailLabel=\u767B\u5F55\u5931\u8D25 :-(
 logoutLabel=\u767B\u51FA
 initLabel=\u521D\u59CB\u5316
 popTagsLabel=\u5206\u7C7B\u6807\u7B7E
@@ -228,8 +226,6 @@ selectDateLabel=\u9009\u62E9\u65E5\u671F
 selectDate1Label=\u9009\u62E9\u65E5\u671F\uFF1A
 selectLabel=\u9009\u62E9
 importLabel=\u5BFC\u5165
-chooseBlog1Label=\u8BF7\u9009\u62E9\u9700\u8981\u7BA1\u7406\u7684\u535A\u5BA2\uFF1A
-blogArticleImportLabel=\u6587\u7AE0\u5BFC\u5165
 userNameLabel=\u7528\u6237\u540D
 userName1Label=\u7528\u6237\u540D\uFF1A
 userLabel=\u7528\u6237
@@ -269,9 +265,6 @@ saveLabel=\u4FDD\u5B58
 autoSaveLabel=\u81EA\u52A8\u4FDD\u5B58
 tagLabel=\u6807\u7B7E
 tagsLabel=\u6807\u7B7E
-importedLabel=\u5DF2\u5BFC\u5165
-captcha1Label=\u9A8C\u8BC1\u7801\uFF1A
-captchaLabel=\u9A8C\u8BC1\u7801
 indexLabel=\u9996\u9875
 nextArticle1Label=\u65B0\u4E00\u7BC7\uFF1A
 previousArticle1Label=\u65E7\u4E00\u7BC7\uFF1A
@@ -337,7 +330,6 @@ unPulbishSuccLabel=\u53D6\u6D88\u53D1\u5E03\u6210\u529F
 unPulbishFailLabel=\u53D6\u6D88\u53D1\u5E03\u5931\u8D25
 removeSuccLabel=\u5220\u9664\u6210\u529F
 removeFailLabel=\u5220\u9664\u5931\u8D25
-removeUserFailSkinNeedMulUsersLabel=\u5220\u9664\u5931\u8D25\uFF0C\u5F53\u524D\u4F7F\u7528\u7684\u76AE\u80A4\u9700\u8981\u591A\u7528\u6237\u652F\u6301
 putTopSuccLabel=\u7F6E\u9876\u6210\u529F
 putTopFailLabel=\u7F6E\u9876\u5931\u8D25
 cancelTopSuccLabel=\u53D6\u6D88\u7F6E\u9876\u6210\u529F
@@ -346,18 +338,13 @@ addSuccLabel=\u6DFB\u52A0\u6210\u529F
 addFailLabel=\u6DFB\u52A0\u5931\u8D25
 updateSuccLabel=\u66F4\u65B0\u6210\u529F
 updateFailLabel=\u66F4\u65B0\u5931\u8D25
-updatePreferenceFailNeedMulUsersLabel=\u66F4\u65B0\u5931\u8D25\uFF0C\u9700\u8981\u591A\u7528\u6237\u624D\u80FD\u4F7F\u7528\u9009\u62E9\u7684\u76AE\u80A4
 setFailLabel=\u8BBE\u7F6E\u5931\u8D25
 setSuccLabel=\u8BBE\u7F6E\u6210\u529F
 getFailLabel=\u83B7\u53D6\u5931\u8D25
 getSuccLabel=\u83B7\u53D6\u6210\u529F
-importSuccLabel=\u5BFC\u5165\u6210\u529F :-)
-importFailLabel=\u90E8\u5206\u5BFC\u5165\u5931\u8D25 %>_<%
 noCommentLabel=\u6682\u65E0\u8BC4\u8BBA
-captchaErrorLabel=\u9A8C\u8BC1\u7801\u9519\u8BEF
 inputErrorLabel=\u8F93\u5165\u9519\u8BEF\uFF01
 gotoLabel=\u8DF3\u8F6C
-nameEmptyLabel=\u59D3\u540D\u4E0D\u80FD\u4E3A\u7A7A\uFF01
 passwordNotMatchLabel=\u5BC6\u7801\u4E0D\u5339\u914D\uFF01
 notAllowCommentLabel=\u4E0D\u5141\u8BB8\u8BC4\u8BBA\uFF01
 nameTooLongLabel=\u59D3\u540D\u53EA\u80FD\u4E3A 2 \u5230 20 \u4E2A\u5B57\u7B26\uFF01
@@ -365,7 +352,6 @@ categoryTooLongLabel=\u5206\u7C7B\u540D\u79F0\u53EA\u80FD\u4E3A 2 \u5230 32 \u4E
 urlInvalidLabel=\u94FE\u63A5\u683C\u5F0F\u4E0D\u6B63\u786E\uFF01
 nonNegativeIntegerOnlyLabel=\u53EA\u80FD\u4E3A\u975E\u8D1F\u6574\u6570\uFF01
 commentContentCannotEmptyLabel=\u8BC4\u8BBA\u5185\u5BB9\u53EA\u80FD\u4E3A 2 \u5230 500 \u4E2A\u5B57\u7B26\uFF01
-captchaCannotEmptyLabel=\u9A8C\u8BC1\u7801\u4E0D\u80FD\u4E3A\u7A7A\uFF01
 loadingLabel=\u8F7D\u5165\u4E2D....
 titleEmptyLabel=\u6807\u9898\u4E0D\u80FD\u4E3A\u7A7A\uFF01
 contentEmptyLabel=\u5185\u5BB9\u4E0D\u80FD\u4E3A\u7A7A\uFF01
@@ -381,8 +367,6 @@ duplicatedUserNameLabel=\u7528\u6237\u540D\u91CD\u590D\uFF01
 refreshAndRetryLabel=\u8BF7\u5237\u65B0\u91CD\u8BD5\uFF01
 editorLeaveLabel=\u7F16\u8F91\u5668\u4E2D\u8FD8\u6709\u5185\u5BB9\uFF0C\u662F\u5426\u79BB\u5F00\uFF1F
 editorPostLabel=\u7F16\u8F91\u5668\u4E2D\u8FD8\u6709\u5185\u5BB9\uFF0C\u662F\u5426\u6E05\u7A7A\uFF1F
-registerSoloUserLabel=\u6CE8\u518C Solo \u7528\u6237
-registerLabel=\u6CE8\u518C
 changeRoleLabel=\u6539\u53D8\u89D2\u8272
 ####
 confirmRemoveLabel=\u662F\u5426\u5220\u9664

src/main/resources/local.properties

@@ -23,18 +23,18 @@
 #
 
 #### H2 runtime ####
-runtimeDatabase=H2
-jdbc.username=root
-jdbc.password=
-jdbc.driver=org.h2.Driver
-jdbc.URL=jdbc:h2:~/solo_h2/db
+#runtimeDatabase=H2
+#jdbc.username=root
+#jdbc.password=
+#jdbc.driver=org.h2.Driver
+#jdbc.URL=jdbc:h2:~/solo_h2/db
 
 #### MySQL runtime ####
-#runtimeDatabase=MYSQL
-#jdbc.username=root
-#jdbc.password=123456
-#jdbc.driver=com.mysql.cj.jdbc.Driver
-#jdbc.URL=jdbc:mysql://localhost:3306/solo?useUnicode=yes&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
+runtimeDatabase=MYSQL
+jdbc.username=root
+jdbc.password=123456
+jdbc.driver=com.mysql.cj.jdbc.Driver
+jdbc.URL=jdbc:mysql://localhost:3306/solo?useUnicode=yes&characterEncoding=UTF-8&useSSL=false&serverTimezone=UTC
 
 # The minConnCnt MUST larger or equal to 3
 jdbc.minConnCnt=5

src/main/webapp/admin/admin-label.ftl

@@ -83,9 +83,7 @@
         "administratorLabel": "${administratorLabel}",
         "sumLabel": "${sumLabel}",
         "countLabel": "${countLabel}",
-        "importSuccLabel": "${importSuccLabel}",
         "categoryLabel": "${categoryLabel}",
-        "importedLabel": "${importedLabel}",
         "tagsEmptyLabel": "${tagsEmptyLabel}",
         "abstractEmptyLabel": "${abstractEmptyLabel}",
         "commonUserLabel": "${commonUserLabel}",