From 5a901f172ecacd3914cd473667cbd4dc10b8445a Mon Sep 17 00:00:00 2001
From: piaip <piaip@63ad8ddf-47c3-0310-b6dd-a9e9d9715204>
Date: Sun, 16 Dec 2007 05:22:03 +0000
Subject: - ignore bottom for recommending in special modes - general message
 fix

git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3689 63ad8ddf-47c3-0310-b6dd-a9e9d9715204
---
 mbbsd/bbs.c  | 9 +++++----
 mbbsd/user.c | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mbbsd/bbs.c b/mbbsd/bbs.c
index 4e171012..784ca75c 100644
--- a/mbbsd/bbs.c
+++ b/mbbsd/bbs.c
@@ -2744,15 +2744,16 @@ recommend(int ent, fileheader_t * fhdr, const char *direct)
     // warn if in non-standard mode
     {
 	char *p = strrchr(direct, '/');
-	if (!p || strcmp(p+1, FN_DIR) != 0)
+	// allow .DIR or .DIR.bottom
+	if (!p || strncmp(p+1, FN_DIR, strlen(FN_DIR)) != 0)
 	{
 	    ymsg --;
 	    move(ymsg--, 0); clrtoeol();
-	    outs(ANSI_COLOR(1;31) 
-	    "◆您正在特殊列表模式(搜尋、系列、...)，"
+	    outs(ANSI_COLOR(1;33) 
+	    "◆您正在搜尋(標題、作者...)或其它特殊列表模式，"
 	    "推文計數與修改記錄將會分開計算。" 
 	    ANSI_RESET "\n"
-	    "  若想正常計數請先退回一般列表模式。\n");
+	    "  若想正常計數請先左鍵退回正常列表模式。\n");
 	}
     }
 
diff --git a/mbbsd/user.c b/mbbsd/user.c
index 05289ef6..cf676f88 100644
--- a/mbbsd/user.c
+++ b/mbbsd/user.c
@@ -346,7 +346,7 @@ void Customize(void)
 	"改用色彩代替修改符號 (+)",
 #ifdef DBCSAWARE
 	"自動偵測雙位元字集(如全型中文)",
-	"禁止插入雙位元的色碼(一字雙色)",
+	"禁止在雙位元中使用色碼(去一字雙色)",
 #endif
 	0,
     };
-- 
cgit v1.2.3