From 54a74c3038e133506849ac140b604e508c0f03a3 Mon Sep 17 00:00:00 2001 From: piaip Date: Tue, 4 Mar 2008 12:29:15 +0000 Subject: - msg update: prevent using "illegal/invalid" confusing terms, and other minor msgs. git-svn-id: http://opensvn.csie.org/pttbbs/trunk/pttbbs@3963 63ad8ddf-47c3-0310-b6dd-a9e9d9715204 --- include/common.h | 2 +- mbbsd/assess.c | 2 +- mbbsd/user.c | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/common.h b/include/common.h index 25ef4185..f03eb38d 100644 --- a/include/common.h +++ b/include/common.h @@ -84,7 +84,7 @@ #define ERR_BID "你搞錯了啦！沒有這個板喔！" #define ERR_UID "這裡沒有這個人啦！" #define ERR_PASSWD "密碼不對喔！你有沒有冒用人家的名字啊？" -#define ERR_FILENAME "檔名不合法！" +#define ERR_FILENAME "檔名不正確！" #define STR_AUTHOR1 "作者:" #define STR_AUTHOR2 "發信人:" diff --git a/mbbsd/assess.c b/mbbsd/assess.c index e3c68bf1..e4bcc231 100644 --- a/mbbsd/assess.c +++ b/mbbsd/assess.c @@ -80,7 +80,7 @@ u_fixgoodpost(void) stand_title("自動優文修正程式"); outs("開始修正優文之前，有些功\課要麻煩您先查好：\n\n" - "請先找到你所有的優文文章的看版與" AID_DISPLAYNAME "\n" + "請先找到你所有的優文文章的看板與" AID_DISPLAYNAME "\n" AID_DISPLAYNAME "的查詢方法是在該篇文章前面按下大寫 Q 。\n" "查好後請把這些資料放在手邊，等下會請您輸入。\n" "另外，若有多重登入請先關閉其它連線。\n" diff --git a/mbbsd/user.c b/mbbsd/user.c index 91f5f0cf..a44e500e 100644 --- a/mbbsd/user.c +++ b/mbbsd/user.c @@ -1495,7 +1495,7 @@ toregister(char *email, char *phone, char *career, } else { move(15, 0); clrtobot(); move(17, 0); - outs("指定的手機號碼不合法," + outs("指定的手機號碼不正確," "若您無手機門號請選擇其他方式認證"); } @@ -1529,7 +1529,7 @@ toregister(char *email, char *phone, char *career, } else { move(15, 0); clrtobot(); move(17, 0); - outs("指定的 E-Mail 不合法, 若您無 E-Mail 請輸入 x 由站長手動認證\n"); + outs("指定的 E-Mail 不正確, 若您無 E-Mail 請輸入 x 由站長手動認證\n"); outs("但注意手動認證通常會花上數週以上的時間。\n"); } } @@ -1652,8 +1652,9 @@ char *isvalidaddr(char *addr) const char *rejectstr[] = {"地球", "銀河", "火星", NULL}; - if (!removespace(addr) || addr[0] > 0 || strlen(addr) < 15) - return "這個地址並不合法"; + // addr[0] > 0: check if address is starting by Chinese. + if (!removespace(addr) || strlen(addr) < 15) + return "這個地址似乎並不完整"; if (strstr(addr, "信箱") != NULL || strstr(addr, "郵政") != NULL) return "抱歉我們不接受郵政信箱"; if ((strstr(addr, "市") == NULL && strstr(addr, "巿") == NULL && @@ -1666,7 +1667,7 @@ char *isvalidaddr(char *addr) strcmp(&addr[strlen(addr) - 2], "區") == 0 || strcmp(&addr[strlen(addr) - 2], "市") == 0 || strcmp(&addr[strlen(addr) - 2], "街") == 0 ) - return "這個地址並不合法"; + return "這個地址似乎並不完整"; return NULL; } @@ -1680,7 +1681,7 @@ static char *isvalidphone(char *phone) strlen(phone) < 9 || strstr(phone, "00000000") != NULL || strstr(phone, "22222222") != NULL ) { - return "這個電話號碼並不合法(請含區碼)" ; + return "這個電話號碼並不正確(請含區碼)" ; } return NULL; } @@ -1783,6 +1784,8 @@ u_register(void) goto REGFORM; } + // getregcode(regcode); + // XXX why check by year? // birthday is moved to earlier, so let's check email instead. if (cuser.email[0] && // cuser.year != 0 && /* 已經第一次填過了~ ^^" */ -- cgit v1.2.3