From c54ef2a08b1f25c2b8b063b013ef938aab45c70d Mon Sep 17 00:00:00 2001 From: BJRambo Date: Wed, 19 Sep 2018 17:51:02 +0900 Subject: [PATCH] =?UTF-8?q?=EB=9D=BC=EC=9D=B4=EB=AF=B9=EC=8A=A4=20?= =?UTF-8?q?=EC=BD=94=EC=96=B4=EC=9D=98=20=EC=96=B8=EC=96=B4=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=EB=A5=BC=20=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/ncenterlite/ncenterlite.model.php | 40 +++++++++++------------ 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/modules/ncenterlite/ncenterlite.model.php b/modules/ncenterlite/ncenterlite.model.php index 0284a90a3..06f0cdb4b 100644 --- a/modules/ncenterlite/ncenterlite.model.php +++ b/modules/ncenterlite/ncenterlite.model.php @@ -407,29 +407,27 @@ class ncenterliteModel extends ncenterlite */ public function getNotificationText($notification) { - global $lang; - // Get the type of notification. switch ($notification->type) { // Document. case 'D': - $type = $lang->ncenterlite_document; + $type = lang('ncenterlite_document'); break; // Comment. case 'C': - $type = $lang->ncenterlite_comment; + $type = lang('ncenterlite_comment'); break; // Message. case 'E': - $type = $lang->ncenterlite_type_message; + $type = lang('ncenterlite_type_message'); break; // Test. case 'T': - $type = $lang->ncenterlite_type_test; + $type = lang('ncenterlite_type_test'); break; // Custom string. @@ -438,16 +436,16 @@ class ncenterliteModel extends ncenterlite // Insert member case 'I': - $type = $lang->cmd_signup; + $type = lang('cmd_signup'); break; // Custom language. case 'Y': - return $lang->{$notification->target_body}; + return lang($notification->target_body); // Custom language with string interpolation. case 'Z': - return vsprintf($lang->{$notification->target_body}, array( + return vsprintf(lang($notification->target_body), array( $notification->target_member_srl, // %1$d $notification->target_nick_name, // %2$s $notification->target_user_id, // %3$s @@ -468,63 +466,63 @@ class ncenterliteModel extends ncenterlite { // Comment on your document. case 'C': - $str = sprintf($lang->ncenterlite_commented, $notification->target_nick_name, $type, $notification->target_summary); + $str = sprintf(lang('ncenterlite_commented'), $notification->target_nick_name, $type, $notification->target_summary); break; // Comment on a board. case 'A': - $str = sprintf($lang->ncenterlite_commented_board, $notification->target_nick_name, $notification->target_browser, $notification->target_summary); + $str = sprintf(lang('ncenterlite_commented_board'), $notification->target_nick_name, $notification->target_browser, $notification->target_summary); break; // Mentioned. case 'M': - $str = sprintf($lang->ncenterlite_mentioned, $notification->target_nick_name, $notification->target_browser, $notification->target_summary, $type); + $str = sprintf(lang('ncenterlite_mentioned'), $notification->target_nick_name, $notification->target_browser, $notification->target_summary, $type); break; // Message arrived. case 'E': - $str = sprintf($lang->ncenterlite_message_mention, $notification->target_nick_name, $notification->target_summary); + $str = sprintf(lang('ncenterlite_message_mention'), $notification->target_nick_name, $notification->target_summary); break; // Test notification. case 'T': - $str = sprintf($lang->ncenterlite_test_noti, $notification->target_nick_name); + $str = sprintf(lang('ncenterlite_test_noti'), $notification->target_nick_name); break; // New document on a board. case 'P': - $str = sprintf($lang->ncenterlite_board, $notification->target_nick_name, $notification->target_browser, $notification->target_summary); + $str = sprintf(lang('ncenterlite_board'), $notification->target_nick_name, $notification->target_browser, $notification->target_summary); break; // New document. case 'S': if($notification->target_browser) { - $str = sprintf($lang->ncenterlite_board, $notification->target_nick_name, $notification->target_browser, $notification->target_summary); + $str = sprintf(lang('ncenterlite_board'), $notification->target_nick_name, $notification->target_browser, $notification->target_summary); } else { - $str = sprintf($lang->ncenterlite_article, $notification->target_nick_name, $notification->target_summary); + $str = sprintf(lang('ncenterlite_article'), $notification->target_nick_name, $notification->target_summary); } break; // Voted. case 'V': - $str = sprintf($lang->ncenterlite_vote, $notification->target_nick_name, $notification->target_summary, $type); + $str = sprintf(lang('ncenterlite_vote'), $notification->target_nick_name, $notification->target_summary, $type); break; // Admin notification. case 'B': - $str = sprintf($lang->ncenterlite_admin_content_message, $notification->target_nick_name, $notification->target_browser, $notification->target_summary); + $str = sprintf(lang('ncenterlite_admin_content_message'), $notification->target_nick_name, $notification->target_browser, $notification->target_summary); break; case 'I': - $str = sprintf($lang->ncenterlite_insert_member_message, $notification->target_nick_name); + $str = sprintf(lang('ncenterlite_insert_member_message'), $notification->target_nick_name); break; // Other. default: - $str = $lang->ncenterlite; + $str = lang('ncenterlite'); } return $str;