fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 01:01:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix some English translations and pluralizations

Browse source
This commit is contained in:
Kijin Sung 2016-05-15 15:06:55 +09:00
parent 51c36d68f9
commit b76d6660ee
5 changed files with 44 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

44
modules/ncenterlite/lang/en.php
View file

@ -6,10 +6,10 @@ $lang->ncenterlite_document = 'document';
$lang->ncenterlite_comment = 'comment';
$lang->ncenterlite_type_message = 'message';
$lang->ncenterlite_sender = 'Sender';
$lang->ncenterlite_addressee = 'Addressee';
$lang->ncenterlite_addressee = 'Recipient';
$lang->ncenterlite_noti_contents = 'Contents';
$lang->ncenterlite_read = 'Have read';
$lang->ncenterlite_read_y = 'Have read';
$lang->ncenterlite_read_y = 'Read';
$lang->ncenterlite_read_n = 'Not read';
$lang->ncenterlite_no_target = 'no target';
$lang->ncenterlite_my_list = 'My notification list';
@ -26,26 +26,27 @@ $lang->ncenterlite_message_noti_about = 'Get notice of a message after someone s
$lang->ncenterlite_activate = 'Activate';
$lang->ncenterlite_inactivate = 'Inactivate';
$lang->ncenterlite_userconfig_about_warning = 'Watch out! You are controlling other user\'s settings via this page.';
$lang->ncenterlite_article = '<strong>%1$s</strong> wrote an article as "%2$s".';
$lang->ncenterlite_board = '<strong>%1$s</strong> wrote "%3$s" on %2$s.';
$lang->ncenterlite_commented = '<strong>%1$s</strong> commented as "%3$s" on your %2$s.';
$lang->ncenterlite_commented_board = '<strong>%1$s</strong> commented as "%3$s" on the board %2$s.';
$lang->ncenterlite_mentioned = '<strong>%s</strong> mentioned you on <strong>"%s"board</strong> to <strong>"%s"</strong> .';
$lang->ncenterlite_message_string = 'You have <strong>%d</strong> new <strong>message(s)</strong>.';
$lang->ncenterlite_message_mention = '<strong>%1$s</strong> sent a message as <strong>"%2$s"</strong>.';
$lang->ncenterlite_test_noti = '<strong>%s</strong>! Skin test notification has been done.';
$lang->ncenterlite_vote = '<strong>%1$s</strong> marked the article "%2$s" with a recommendation.';
$lang->ncenterlite_admin_content_message = '<strong>%1$s</strong> wrote "%3$s" on %2$s.';
$lang->ncenterlite_article = '<strong>%1$s</strong> wrote "%2$s".';
$lang->ncenterlite_board = '<strong>%1$s</strong> wrote "%3$s" on <strong>%2$s</strong>.';
$lang->ncenterlite_commented = '<strong>%1$s</strong> commented "%3$s" on your %2$s.';
$lang->ncenterlite_commented_board = '<strong>%1$s</strong> commented "%3$s" on <strong>%2$s</strong>.';
$lang->ncenterlite_mentioned = '<strong>%1$s</strong> mentioned you in a %4$s, "%3$s", on <strong>"%2$s"</strong>.';
$lang->ncenterlite_message_string = 'You have <strong>%d</strong> unread message.';
$lang->ncenterlite_message_string_plural = 'You have <strong>%d</strong> unread messages.';
$lang->ncenterlite_message_mention = '<strong>%1$s</strong> sent you a message, "%2$s".';
$lang->ncenterlite_test_noti = 'Hello, <strong>%s</strong>! This is a test notification.';
$lang->ncenterlite_vote = '<strong>%1$s</strong> upvoted your %3$s, "%2$s".';
$lang->ncenterlite_admin_content_message = '<strong>%1$s</strong> wrote "%3$s" on <strong>%2$s</strong>.';
$lang->ncenterlite_ago = 'ago';
$lang->ncenterlite_date['0'] = 'Year';
$lang->ncenterlite_date['1'] = 'Month';
$lang->ncenterlite_date['2'] = 'Day';
$lang->ncenterlite_date['3'] = 'Hour';
$lang->ncenterlite_date['4'] = 'Minute';
$lang->ncenterlite_date['5'] = 'Second';
$lang->ncenterlite_date['0'] = 'year';
$lang->ncenterlite_date['1'] = 'month';
$lang->ncenterlite_date['2'] = 'day';
$lang->ncenterlite_date['3'] = 'hour';
$lang->ncenterlite_date['4'] = 'minute';
$lang->ncenterlite_date['5'] = 'second';
$lang->ncenterlite_sir = ' ';
$lang->ncenterlite_message = 'You have <strong class="num">%s</strong> notification.';
$lang->ncenterlite_messages = 'you have <strong class="num">%s</strong> notifications.';
$lang->ncenterlite_message = 'You have <strong class="num">%s</strong> new notification.';
$lang->ncenterlite_messages = 'You have <strong class="num">%s</strong> new notifications.';
$lang->ncenterlite_thisistest = '[*] This is a test notice.';
$lang->ncenterlite_delete_all = 'delete all';
$lang->ncenterlite_more = 'More';
@ -89,3 +90,6 @@ $lang->ncenterlite_commnet_event_noti_all = 'Notice every comments to the author
$lang->ncenterlite_commnet_event_noti_some = 'Notice only direct replies to the author';
$lang->ncenterlite_message_event = 'Notify message';
$lang->ncenterlite_message_event_about = 'Do not notify message (Use XE Core message notification system).';
$lang->ncenterlite_all_delete = 'Delete all';
$lang->ncenterlite_month_before_delete = 'Delete older than 1 month';
$lang->dont_check_notify_delete = 'Unread notifications will be deleted, too.';

10
modules/ncenterlite/lang/ko.php
View file

@ -8,6 +8,7 @@ $lang->ncenterlite_mention = '멘션';
$lang->ncenterlite_cmd_vote = '추천';
$lang->ncenterlite_comment_comment = '대댓글';
$lang->ncenterlite_type_message = '쪽지';
$lang->ncenterlite_type_test = '테스트';
$lang->ncenterlite_sender = '보낸 사람';
$lang->ncenterlite_addressee = '받는 사람';
$lang->ncenterlite_noti_contents = '내용';
@ -39,8 +40,9 @@ $lang->ncenterlite_article = '<strong>%1$s</strong>님이 <strong>"%2$s"</strong
$lang->ncenterlite_board = '<strong>%1$s</strong>님이 <strong>"%2$s"</strong> 게시판에 <strong>"%3$s"</strong>라고 글을 남겼습니다.';
$lang->ncenterlite_commented = '<strong>%1$s</strong>님이 회원님의 %2$s에 <strong>"%3$s"</strong>라고 댓글을 남겼습니다.';
$lang->ncenterlite_commented_board = '<strong>%1$s</strong>님이 <strong>"%2$s"</strong>게시판에 <strong>"%3$s"</strong>라고 댓글을 남겼습니다.';
$lang->ncenterlite_mentioned = '<strong>%s</strong>님이 <strong>"%s"</strong> 게시판의 <strong>"%s" </strong> %s에서 회원님을 언급하였습니다.';
$lang->ncenterlite_mentioned = '<strong>%s</strong>님이 <strong>"%s"</strong> 게시판의 <strong>"%s"</strong> %s에서 회원님을 언급하였습니다.';
$lang->ncenterlite_message_string = '<strong>%d</strong>개의 읽지 않은 <strong>메시지</strong>가 있습니다.';
$lang->ncenterlite_message_string_plural = '<strong>%d</strong>개의 읽지 않은 <strong>메시지</strong>가 있습니다.';
$lang->ncenterlite_message_mention = '<strong>%s</strong>님이 <strong>"%s"</strong>라고 메시지를 보내셨습니다.';
$lang->ncenterlite_test_noti = '<strong>%s</strong>님! 테스트 알림입니다.';
$lang->ncenterlite_vote = '<strong>%s</strong>님이 회원님의 <strong>"%s"</strong> %s을 추천하였습니다.';
@ -107,12 +109,6 @@ $lang->ncenterlite_no_notify = '알림 내역이 없습니다.';
$lang->ncenterlite_all_delete = '전체 삭제';
$lang->ncenterlite_month_before_delete = '한 달 이전의 알림 삭제';
$lang->dont_check_notify_delete = '회원이 확인하지 않은 알림도 삭제됩니다.';
$lang->send_member = '보낸 사람';
$lang->resiver_member = '받는 사람';
$lang->notify_content = '알림 내용';
$lang->notify_read_check = '알림 읽음 여부';
$lang->notify_readed = '읽음';
$lang->notify_dont_readed = '읽지않음';
$lang->anonymous_nick_name_setting = '익명 닉네임 대체';
$lang->about_anonymous_nick_name = '익명 게시판에서 발생한 알림에 표시할 이름을 지정합니다.';
$lang->mention_suffixes = '멘션 접미사';

1
modules/ncenterlite/ncenterlite.controller.php
View file

@ -735,6 +735,7 @@ class ncenterliteController extends ncenterlite
Context::set('ncenterlite_list', $_output->data);
Context::set('ncenterlite_page_navigation', $_output->page_navigation);
Context::set('_ncenterlite_num', $_output->page_navigation->total_count);
if(Mobile::isFromMobilePhone())
{

12
modules/ncenterlite/ncenterlite.model.php
View file

@ -323,10 +323,15 @@ class ncenterliteModel extends ncenterlite
$type = $lang->ncenterlite_type_message;
break;
// Test.
case 'T':
$type = $lang->ncenterlite_type_test;
break;
// Other.
case 'U':
default:
return $this->getNotifyTypeString($notification->notify_type, unserialize($notification->target_body));
return $this->getNotifyTypeString($notification->notify_type, unserialize($notification->target_body)) ?: $lang->ncenterlite;
}
// Get the notification text.
@ -402,9 +407,8 @@ class ncenterliteModel extends ncenterlite
global $lang;
$lang_type = Context::getLangType();
$display = $lang->ncenterlite_date; // array('Year', 'Month', 'Day', 'Hour', 'Minute', 'Second')
$ago = $lang->ncenterlite_ago; // 'Ago'
$display = $lang->ncenterlite_date;
$ago = $lang->ncenterlite_ago;
$date = getdate(strtotime(zdate($datetime, 'Y-m-d H:i:s')));

16
modules/ncenterlite/tpl/ncenter_list.html
View file

@ -2,7 +2,7 @@
<include target="header.html" />
<section class="section">
<h1>알림 목록</h1>
<h1>{$lang->ncenterlite_notice_list}</h1>
<p class="x_well x_well-small" cond="!$ncenterlite_list">{$lang->ncenterlite_no_notify}</p>
@ -22,10 +22,10 @@
<table class="x_table x_table-striped x_table-hover" style="margin-top:20px;">
<thead>
<tr>
<th scope="col" class="nowr" style="width:100px;">{$lang->send_member}</th>
<th scope="col" style="width:100px;">{$lang->resiver_member}</th>
<th scope="col" style="width:500px;">{$lang->notify_content}</th>
<th scope="col" style="width:50px;">{$lang->notify_read_check}</th>
<th scope="col" class="nowr" style="width:100px;">{$lang->ncenterlite_sender}</th>
<th scope="col" style="width:100px;">{$lang->ncenterlite_addressee}</th>
<th scope="col" style="width:500px;">{$lang->ncenterlite_noti_contents}</th>
<th scope="col" style="width:50px;">{$lang->ncenterlite_read}</th>
<th scope="col" style="width:100px;">{$lang->date}</th>
</tr>
</thead>
@ -40,8 +40,8 @@
<td cond="$member_info->member_srl">{$member_info->nick_name}</td> <td cond="!$member_info->member_srl">타겟없음</td>
<td><a href="{$val->target_url}">{$val->text}</a></td>
<td>
<span cond="$val->readed == 'Y'" style="color:#8582E6">{$lang->notify_readed}</span>
<span cond="$val->readed != 'Y'" style="color:#FF2828">{$lang->notify_dont_readed}</span>
<span cond="$val->readed == 'Y'" style="color:#8582E6">{$lang->ncenterlite_read_y}</span>
<span cond="$val->readed != 'Y'" style="color:#FF2828">{$lang->ncenterlite_read_n}</span>
</td>
<td>
{zdate($val->regdate,"Y-m-d")}
@ -67,4 +67,4 @@
</ul>
</div>
</block>
</section>
</section>