From fab11bfd391e466af97b347cefd8af6d70c90df3 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sun, 17 May 2020 20:46:14 +0900 Subject: [PATCH] Fix #1285 display comment status properly in list --- modules/comment/lang/en.php | 10 ++++++++++ modules/comment/lang/ko.php | 14 ++++++++++++-- modules/comment/tpl/comment_list.html | 4 ++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/modules/comment/lang/en.php b/modules/comment/lang/en.php index f7afb1f63..3e5b2041e 100644 --- a/modules/comment/lang/en.php +++ b/modules/comment/lang/en.php @@ -28,6 +28,16 @@ $lang->search_target_list['is_secret'] = 'Status'; $lang->no_text_comment = 'No text in this comment.'; $lang->secret_name_list['Y'] = 'Secret'; $lang->secret_name_list['N'] = 'Public'; +$lang->published_name_list[0] = 'Waiting'; +$lang->published_name_list[1] = 'Published'; +$lang->published_name_list[2] = 'Secret'; +$lang->published_name_list[3] = 'Embargo'; +$lang->published_name_list[4] = 'Trash'; +$lang->published_name_list[5] = 'Blocked'; +$lang->published_name_list[6] = 'Blocked'; +$lang->published_name_list[7] = 'Deleted'; +$lang->published_name_list[8] = 'Deleted'; +$lang->published_name_list[9] = 'Other'; $lang->published_name_list['Y'] = 'Published'; $lang->published_name_list['N'] = 'Unpublished'; $lang->comment_manager = 'Manage Selected Comment'; diff --git a/modules/comment/lang/ko.php b/modules/comment/lang/ko.php index 47356ea05..24d7d208f 100644 --- a/modules/comment/lang/ko.php +++ b/modules/comment/lang/ko.php @@ -28,8 +28,18 @@ $lang->search_target_list['is_secret'] = '상태'; $lang->no_text_comment = '글자가 없는 댓글입니다.'; $lang->secret_name_list['Y'] = '비밀'; $lang->secret_name_list['N'] = '공개'; -$lang->published_name_list['Y'] = '발행완료'; -$lang->published_name_list['N'] = '발행대기'; +$lang->published_name_list[0] = '대기'; +$lang->published_name_list[1] = '발행'; +$lang->published_name_list[2] = '비밀'; +$lang->published_name_list[3] = '엠바고'; +$lang->published_name_list[4] = '휴지통'; +$lang->published_name_list[5] = '차단됨'; +$lang->published_name_list[6] = '차단됨'; +$lang->published_name_list[7] = '삭제됨'; +$lang->published_name_list[8] = '삭제됨'; +$lang->published_name_list[9] = '기타'; +$lang->published_name_list['Y'] = '발행'; +$lang->published_name_list['N'] = '대기'; $lang->comment_manager = '선택한 댓글 관리'; $lang->selected_comment = '선택한 댓글'; $lang->cmd_comment_validation = '승인 후 공개'; diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html index 77f8aedc2..f7abc67d0 100644 --- a/modules/comment/tpl/comment_list.html +++ b/modules/comment/tpl/comment_list.html @@ -68,8 +68,8 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}'; {$val->getRegdate($val->getRegdateTime() > time() - 86400 ? 'H:i' : 'm-d')} {$val->ipaddress} - {$secret_name_list['Y']}{$secret_name_list['N']} - {$lang->published_name_list['Y']}{$lang->published_name_list['N']} + {$secret_name_list[$val->isSecret() ? 'Y' : 'N']} + {$lang->published_name_list[$val->status]}