fix(ccfinder): solve conflict

Tencent · Aug 14, 2018 · 94d8039 · 94d8039
1 parent 0d78574
commit 94d8039
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/bin/tsw/runtime/CCFinder.js b/bin/tsw/runtime/CCFinder.js
@@ -242,7 +242,7 @@ this.check = function (req, res) {
         + `<p><strong>${lang.__('mail.serverIP')}：</strong>${serverInfo.intranetIp}</p>`
         + `<p><strong>${lang.__('mail.maliciousIP')}：</strong></p>`
         + blackIPListText
-        + `<p><strong>${lang.__('mail.autoIntoBlackList')}：</strong>` + (config.CCIPLimitAutoBlock ? `${'mail.yes'}` : `${'mail.no'}`) + '</p>'
+        + `<p><strong>${lang.__('mail.autoIntoBlackList')}：</strong>` + (config.CCIPLimitAutoBlock ? `${lang.__('mail.yes')}` : `${lang.__('mail.no')}`) + '</p>'
         + `<p><strong>${lang.__('mail.IPAggregationDegree')}：</strong>${cache.ipCacheLast.StdX10}%</p>`
         + `<p><strong>${lang.__('mail.warningThreshold')}：</strong>${CCIPLimit}</p>`
         + `<p><strong>${lang.__('mail.normalValue')}：</strong>5-50</p>`