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

Merge branch 'develop' of https://github.com/rhymix/rhymix into pr/communication

Browse source 
# Conflicts:
#	modules/communication/communication.controller.php
This commit is contained in:
conory 2016-03-06 17:23:19 +09:00
commit 65dc36f661
189 changed files with 842 additions and 1120 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/communication/communication.controller.php
View file

@ -837,7 +837,7 @@ class communicationController extends communication
$new_message_count = (int) trim(FileHandler::readFile($flag_file));
if($new_message_count > 0)
{
$text = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
$text = preg_replace('@\r?\n@', '\\n', addslashes(lang('alert_new_message_arrived')));
Context::addHtmlFooter("<script>jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>");
Context::loadFile(array('./modules/communication/tpl/js/member_communication.js'), true);
}

1
modules/communication/lang/es.php
View file

@ -1,5 +1,4 @@
<?php
$lang->about_communication = '회원간의 쪽지나 친구 관리 등 커뮤니케이션 기능을 수행합니다';
$lang->allow_message = 'Permitir la recepción del mensaje';
$lang->allow_message_type['Y'] = 'Recibir todo';
$lang->allow_message_type['N'] = 'Rechazar';

2
modules/communication/skins/default/common_header.html
View file

@ -3,6 +3,6 @@
<section class="xc">
<ul class="nav nav-tabs" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
<li loop="$logged_info->menu_list => $key,$val" class="active"|cond="$key==$act">
<a href="{getUrl('act',$key)}">{Context::getLang($val)}</a>
<a href="{getUrl('act',$key)}">{lang($val)}</a>
</li>
</ul>