fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-04 17:21:39 +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

1
.gitignore vendored
View file

@ -22,4 +22,5 @@ composer.phar
*.sublime-workspace
*.sublime-project
.codeintel
error_log

14
addons/captcha/captcha.addon.php
View file

@ -62,7 +62,7 @@ if(!class_exists('AddonCaptcha', false))
{
Context::loadLang(_XE_PATH_ . 'addons/captcha/lang');
$_SESSION['XE_VALIDATOR_ERROR'] = -1;
$_SESSION['XE_VALIDATOR_MESSAGE'] = Context::getLang('captcha_denied');
$_SESSION['XE_VALIDATOR_MESSAGE'] = lang('captcha_denied');
$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
$ModuleHandler->_setInputValueToSession();
@ -113,7 +113,7 @@ if(!class_exists('AddonCaptcha', false))
// Generate keywords
$this->createKeyword();
$target = Context::getLang('target_captcha');
$target = lang('target_captcha');
header("Content-Type: text/xml; charset=UTF-8");
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@ -121,11 +121,11 @@ if(!class_exists('AddonCaptcha', false))
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
printf("<response>\r\n <error>0</error>\r\n <message>success</message>\r\n <about_captcha><![CDATA[%s]]></about_captcha>\r\n <captcha_reload><![CDATA[%s]]></captcha_reload>\r\n <captcha_play><![CDATA[%s]]></captcha_play>\r\n <cmd_input><![CDATA[%s]]></cmd_input>\r\n <cmd_cancel><![CDATA[%s]]></cmd_cancel>\r\n </response>"
, Context::getLang('about_captcha')
, Context::getLang('captcha_reload')
, Context::getLang('captcha_play')
, Context::getLang('cmd_input')
, Context::getLang('cmd_cancel')
, lang('about_captcha')
, lang('captcha_reload')
, lang('captcha_play')
, lang('cmd_input')
, lang('cmd_cancel')
);
Context::close();
exit();

14
addons/captcha_member/captcha_member.addon.php
View file

@ -73,7 +73,7 @@ if(!class_exists('AddonMemberCaptcha', false))
{
Context::loadLang(_XE_PATH_ . 'addons/captcha_member/lang');
$_SESSION['XE_VALIDATOR_ERROR'] = -1;
$_SESSION['XE_VALIDATOR_MESSAGE'] = Context::getLang('captcha_denied');
$_SESSION['XE_VALIDATOR_MESSAGE'] = lang('captcha_denied');
$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
$_SESSION['XE_VALIDATOR_RETURN_URL'] = Context::get('error_return_url');
$ModuleHandler->_setInputValueToSession();
@ -124,7 +124,7 @@ if(!class_exists('AddonMemberCaptcha', false))
// Generate keywords
$this->createKeyword();
$target = Context::getLang('target_captcha');
$target = lang('target_captcha');
header("Content-Type: text/xml; charset=UTF-8");
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
@ -132,11 +132,11 @@ if(!class_exists('AddonMemberCaptcha', false))
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
printf("<response>\r\n <error>0</error>\r\n <message>success</message>\r\n <about_captcha><![CDATA[%s]]></about_captcha>\r\n <captcha_reload><![CDATA[%s]]></captcha_reload>\r\n <captcha_play><![CDATA[%s]]></captcha_play>\r\n <cmd_input><![CDATA[%s]]></cmd_input>\r\n <cmd_cancel><![CDATA[%s]]></cmd_cancel>\r\n </response>"
, Context::getLang('about_captcha')
, Context::getLang('captcha_reload')
, Context::getLang('captcha_play')
, Context::getLang('cmd_input')
, Context::getLang('cmd_cancel')
, lang('about_captcha')
, lang('captcha_reload')
, lang('captcha_play')
, lang('cmd_input')
, lang('cmd_cancel')
);
Context::close();
exit();

2
addons/mobile/classes/hdml.class.php
View file

@ -55,7 +55,7 @@ class wap extends mobileXE {
foreach($this->getChilds() as $key => $val)
{
if(!$val['link']) continue;
printf('<ce task=go label="%s" dest="%s">%s%s',Context::getLang('cmd_select'), $val['href'], $val['text'], "\n");
printf('<ce task=go label="%s" dest="%s">%s%s',lang('cmd_select'), $val['href'], $val['text'], "\n");
}
}
else

4
addons/mobile/classes/mhtml.class.php
View file

@ -71,11 +71,11 @@ class wap extends mobileXE
if(!parent::isLangChange())
{
$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.lang('select_lang'), "\n");
}
else
{
printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), Context::getLang('lang_return'), "\n");
printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), lang('lang_return'), "\n");
}
if($this->upperUrl)
{

18
addons/mobile/classes/mobile.class.php
View file

@ -168,12 +168,12 @@ class mobileXE
if($parent_srl && $listed_items[$parent_srl])
{
$parent_item = $listed_items[$parent_srl];
if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), Context::getLang('cmd_go_upper'));
if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), lang('cmd_go_upper'));
}
}
elseif (!$this->isNavigationMode())
{
$this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), Context::getLang('cmd_view_sitemap'));
$this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), lang('cmd_view_sitemap'));
}
}
@ -247,14 +247,14 @@ class mobileXE
if($this->mobilePage>1)
{
$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
$text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
$text = sprintf('%s (%d/%d)', lang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
$this->setPrevUrl($url, $text);
}
if($this->mobilePage<$this->totalPage)
{
$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
$text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
$text = sprintf('%s (%d/%d)', lang('cmd_next'), $this->mobilePage+1, $this->totalPage);
$this->setNextUrl($url, $text);
}
}
@ -353,14 +353,14 @@ class mobileXE
if($this->mobilePage>1)
{
$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
$text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
$text = sprintf('%s (%d/%d)', lang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
$this->setPrevUrl($url, $text);
}
if($this->mobilePage<$this->totalPage)
{
$url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
$text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
$text = sprintf('%s (%d/%d)', lang('cmd_next'), $this->mobilePage+1, $this->totalPage);
$this->setNextUrl($url, $text);
}
@ -442,7 +442,7 @@ class mobileXE
function display()
{
// Home button assignments
$this->setHomeUrl(getUrl(), Context::getLang('cmd_go_home'));
$this->setHomeUrl(getUrl(), lang('cmd_go_home'));
// Specify the title
if(!$this->title) $this->setTitle(Context::getBrowserTitle());
@ -520,7 +520,7 @@ class mobileXE
$cur_item = $this->listed_items[$this->cmid];
$upper_srl = $cur_item['parent_srl'];;
$list = $cur_item['list'];;
$this->setUpperUrl(getUrl('cmid',$upper_srl), Context::getLang('cmd_go_upper'));
$this->setUpperUrl(getUrl('cmid',$upper_srl), lang('cmd_go_upper'));
if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $cur_item['url']))
{
$obj = array();
@ -575,7 +575,7 @@ class mobileXE
$lang_supported = Context::get('lang_supported');
$lang_type = Context::getLangType();
$obj = array();
$obj['link'] = $obj['text'] = Context::getLang('president_lang').' : '.$lang_supported[$lang_type];
$obj['link'] = $obj['text'] = lang('president_lang').' : '.$lang_supported[$lang_type];
$obj['href'] = getUrl('sel_lang',$lang_type);
$childs[] = $obj;

4
addons/mobile/classes/wml.class.php
View file

@ -87,11 +87,11 @@ class wap extends mobileXE
if(!parent::isLangChange())
{
$url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.lang('select_lang'), $url, "\n");
}
else
{
printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', Context::getLang('lang_return'), Context::get('return_uri'), "\n");
printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', lang('lang_return'), Context::get('return_uri'), "\n");
}
if($this->homeUrl)
{

4
addons/point_level_icon/point_level_icon.lib.php
View file

@ -70,8 +70,8 @@ function pointLevelIconTrans($matches, $addon_info)
}
}
$title = sprintf('%s:%s%s%s, %s:%s/%s', Context::getLang('point'), $point, $config->point_name, $per ? ' (' . $per . ')' : '', Context::getLang('level'), $level, $config->max_level);
$alt = sprintf('[%s:%s]', Context::getLang('level'), $level);
$title = sprintf('%s:%s%s%s, %s:%s/%s', lang('point'), $point, $config->point_name, $per ? ' (' . $per . ')' : '', lang('level'), $level, $config->max_level);
$alt = sprintf('[%s:%s]', lang('level'), $level);
$GLOBALS['_pointLevelIcon'][$member_srl] = sprintf('<img src="%s" alt="%s" title="%s" class="xe_point_level_icon" style="vertical-align:middle;margin-right:3px;" />', $level_icon, $alt, $title);
}

26
classes/display/DisplayHandler.class.php
View file

@ -149,6 +149,27 @@ class DisplayHandler extends Handler
{
case 'panel':
$data = Rhymix\Framework\Debug::getDebugData();
$display_content = array_fill_keys(config('debug.display_content'), true);
if (count($display_content) && !isset($display_content['entries']))
{
$data->entries = null;
}
if (count($display_content) && !isset($display_content['queries']))
{
unset($data->queries);
}
if (count($display_content) && !isset($display_content['slow_queries']))
{
unset($data->slow_queries);
}
if (count($display_content) && !isset($display_content['slow_triggers']))
{
unset($data->slow_triggers);
}
if (count($display_content) && !isset($display_content['slow_widgets']))
{
unset($data->slow_widgets);
}
if ($data->entries)
{
foreach ($data->entries as &$entry)
@ -206,8 +227,9 @@ class DisplayHandler extends Handler
}
ob_start();
$data = Rhymix\Framework\Debug::getDebugData();
$display_content = array_fill_keys(config('debug.display_content'), true);
include RX_BASEDIR . 'common/tpl/debug_comment.html';
$content = ob_get_clean();
$content = preg_replace('/\n{2,}/', "\n\n", trim(ob_get_clean())) . PHP_EOL;
if ($display_type === 'file')
{
$log_filename = config('debug.log_filename') ?: 'files/debug/YYYYMMDD.php';
@ -226,7 +248,7 @@ class DisplayHandler extends Handler
{
$phpheader = '';
}
FileHandler::writeFile($log_filename, $phpheader . $content, 'a');
FileHandler::writeFile($log_filename, $phpheader . $content . PHP_EOL, 'a');
return '';
}
else

2
classes/extravar/Extravar.class.php
View file

@ -445,7 +445,7 @@ class ExtraItem
$buff[] = '<input type="hidden" name="' . $column_name . '" value="' . $value . '" />';
$buff[] = '<input type="text" id="date_' . $column_name . '" value="' . zdate($value, 'Y-m-d') . '" class="date" />';
$buff[] = '<input type="button" value="' . Context::getLang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
$buff[] = '<input type="button" value="' . lang('cmd_delete') . '" class="btn" id="dateRemover_' . $column_name . '" />';
$buff[] = '<script type="text/javascript">';
$buff[] = '//<![CDATA[';
$buff[] = '(function($){';

2
classes/module/ModuleHandler.class.php
View file

@ -86,7 +86,7 @@ class ModuleHandler extends Handler
if($isInvalid)
{
htmlHeader();
echo Context::getLang("msg_invalid_request");
echo lang("msg_invalid_request");
htmlFooter();
Context::close();
exit;

2
classes/object/Object.class.php
View file

@ -96,7 +96,7 @@ class Object
*/
function setMessage($message = 'success', $type = NULL)
{
if($str = Context::getLang($message))
if($str = lang($message))
{
$this->message = $str;
}

4
classes/validator/Validator.class.php
View file

@ -467,7 +467,7 @@ class Validator
}
else
{
$lang_filter = Context::getLang('filter');
$lang_filter = lang('filter');
$msg = isset($lang_filter->{$msg}) ? $lang_filter->{$msg} : $lang_filter->invalid;
}
@ -477,7 +477,7 @@ class Validator
}
else
{
$fieldName = Context::getLang($field);
$fieldName = lang($field);
}
$msg = sprintf($msg, $fieldName);

3
common/defaults/blacklist.php
View file

@ -6,6 +6,9 @@
* Copyright (c) Rhymix Developers and Contributors
*/
return array(
'autolang' => true,
'errorlogger' => true,
'fix_mysql_utf8' => true,
'member_communication' => true,
'smartphone' => true,
'zipperupper' => true,

3
common/defaults/config.php
View file

@ -87,13 +87,12 @@ return array(
),
'debug' => array(
'enabled' => true,
'log_errors' => true,
'log_queries' => false,
'log_slow_queries' => 0,
'log_slow_triggers' => 0,
'log_slow_widgets' => 0,
'log_filename' => null,
'display_type' => 'comment',
'display_content' => array(),
'display_to' => 'admin',
'allow' => array(),
),

8
common/framework/debug.php
View file

@ -404,14 +404,14 @@ class Debug
}
// Localize the error title.
$title = \Context::getLang('msg_server_error');
$title = lang('msg_server_error');
if ($title === 'msg_server_error')
{
$message = 'Server Error';
}
// Localize the error message.
$message = ini_get('display_errors') ? $message : \Context::getLang('msg_server_error_see_log');
$message = ini_get('display_errors') ? $message : lang('msg_server_error_see_log');
if ($message === 'msg_server_error_see_log')
{
$message = 'Your server is configured to hide error messages. Please see your server\'s error log for details.';
@ -496,8 +496,8 @@ class Debug
'trans' => sprintf('%0.4f sec', $GLOBALS['__trans_content_elapsed__']),
),
'entries' => self::$_entries,
'errors' => config('debug.log_errors') ? self::$_errors : null,
'queries' => config('debug.log_queries') ? self::$_queries : null,
'errors' => self::$_errors,
'queries' => self::$_queries,
'slow_queries' => self::$_slow_queries,
'slow_triggers' => self::$_slow_triggers,
'slow_widgets' => self::$_slow_widgets,

185
common/framework/lang.php
View file

@ -50,6 +50,16 @@ class Lang
$this->_loaded_plugins['_custom_'] = new \stdClass();
}
/**
* Return language type.
*
* @return string
*/
public function langType()
{
return $this->_language;
}
/**
* Load translations from a plugin (module, addon).
*
@ -85,6 +95,7 @@ class Lang
* Load translations from a directory.
*
* @param string $dir
* @param string $plugin_name
* @return bool
*/
public function loadDirectory($dir, $plugin_name = null)
@ -97,32 +108,17 @@ class Lang
return true;
}
// Look for language files.
if (file_exists($dir . '/' . $this->_language . '.php'))
// Load the language file.
$lang = $this->getPluginLang($dir);
// Load the default language file.
if ($this->_language !== 'en')
{
$filename = $dir . '/' . $this->_language . '.php';
}
elseif (($hyphen = strpos($this->_language, '-')) !== false)
{
if (file_exists($dir . '/' . substr($this->_language, 0, $hyphen) . '.php'))
{
$filename = $dir . '/' . substr($this->_language, 0, $hyphen) . '.php';
}
}
elseif (file_exists("$dir/lang.xml"))
{
$filename = Compat\LangParser::compileXMLtoPHP("$dir/lang.xml", $this->_language === 'ja' ? 'jp' : $this->_language);
}
elseif (file_exists($dir . '/' . ($this->_language === 'ja' ? 'jp' : $this->_language) . '.lang.php'))
{
$filename = $dir . '/' . ($this->_language === 'ja' ? 'jp' : $this->_language) . '.lang.php';
self::getInstance('en')->loadDirectory($dir, $plugin_name);
}
// Load the language file.
if ($filename)
if (!empty($lang))
{
$lang = new \stdClass;
include $filename;
$this->_loaded_directories[$dir] = true;
$this->_loaded_plugins[$plugin_name] = $lang;
array_unshift($this->_search_priority, $plugin_name);
@ -136,6 +132,48 @@ class Lang
}
}
/**
* Get the language file from plugin.
*
* @param string $dir
* @param string $language
* @return object
*/
public function getPluginLang($dir, $language = null)
{
if (!$language)
{
$language = $this->_language;
}
if (file_exists($dir . '/' . $language . '.php'))
{
$filename = $dir . '/' . $language . '.php';
}
elseif (($hyphen = strpos($language, '-')) !== false && file_exists($dir . '/' . substr($language, 0, $hyphen) . '.php'))
{
$filename = $dir . '/' . substr($language, 0, $hyphen) . '.php';
}
elseif (file_exists("$dir/lang.xml"))
{
$filename = Compat\LangParser::compileXMLtoPHP("$dir/lang.xml", $language === 'ja' ? 'jp' : $language);
}
elseif (file_exists($dir . '/' . ($language === 'ja' ? 'jp' : $language) . '.lang.php'))
{
$filename = $dir . '/' . ($language === 'ja' ? 'jp' : $language) . '.lang.php';
}
if (!$filename)
{
return new \stdClass;
}
$lang = new \stdClass;
include $filename;
return $lang;
}
/**
* Get the list of supported languages.
*
@ -159,6 +197,18 @@ class Lang
return $this->__call($key, $args);
}
/**
* Generic setter.
*
* @param string $key
* @param string $value
* @return void
*/
public function set($key, $value)
{
$this->__set($key, $value);
}
/**
* Magic method for translations without arguments.
*
@ -167,51 +217,80 @@ class Lang
*/
public function __get($key)
{
// Get default language
if ($this->_language !== 'en')
{
$lang_en = self::getInstance('en')->{$key};
}
// Separate the plugin name from the key.
if (preg_match('/^[a-z0-9_.-]+$/i', $key) && ($keys = explode('.', $key, 2)) && count($keys) === 2)
{
list($plugin_name, $key) = $keys;
list($plugin_name, $lang_key) = $keys;
if (!isset($this->_loaded_plugins[$plugin_name]))
{
$this->loadPlugin($plugin_name);
}
if (isset($this->_loaded_plugins[$plugin_name]->{$key}))
if (isset($this->_loaded_plugins[$plugin_name]->{$lang_key}))
{
return $this->_loaded_plugins[$plugin_name]->{$key};
}
else
{
return $key;
}
}
// Search custom translations first.
if (isset($this->_loaded_plugins['_custom_']->{$key}))
{
if (is_array($this->_loaded_plugins['_custom_']->{$key}))
{
return new \ArrayObject($this->_loaded_plugins['_custom_']->{$key}, 3);
}
else
{
return $this->_loaded_plugins['_custom_']->{$key};
}
}
// Search other plugins.
foreach ($this->_search_priority as $plugin_name)
{
if (isset($this->_loaded_plugins[$plugin_name]->{$key}))
{
if (is_array($this->_loaded_plugins[$plugin_name]->{$key}))
$lang = $this->_loaded_plugins[$plugin_name]->{$lang_key};
if (is_array($lang) && is_array($lang_en) && count($lang_en, COUNT_RECURSIVE) > count($lang, COUNT_RECURSIVE))
{
return new \ArrayObject($this->_loaded_plugins[$plugin_name]->{$key}, 3);
return $lang_en;
}
return $lang;
}
}
else
{
// Search custom translations first.
if (isset($this->_loaded_plugins['_custom_']->{$key}))
{
$lang = $this->_loaded_plugins['_custom_']->{$key};
if (is_array($lang))
{
if (is_array($lang_en) && count($lang_en, COUNT_RECURSIVE) > count($lang, COUNT_RECURSIVE))
{
return new \ArrayObject($lang_en, 3);
}
return new \ArrayObject($lang, 3);
}
else
{
return $this->_loaded_plugins[$plugin_name]->{$key};
return $lang;
}
}
// Search other plugins.
foreach ($this->_search_priority as $plugin_name)
{
if (isset($this->_loaded_plugins[$plugin_name]->{$key}))
{
$lang = $this->_loaded_plugins[$plugin_name]->{$key};
if (is_array($lang))
{
if (is_array($lang_en) && count($lang_en, COUNT_RECURSIVE) > count($lang, COUNT_RECURSIVE))
{
return new \ArrayObject($lang_en, 3);
}
return new \ArrayObject($lang, 3);
}
else
{
return $lang;
}
}
}
}
// Search other language.
if (isset($lang_en))
{
return $lang_en;
}
// If no translation is found, return the key.

29
common/functions.php
View file

@ -25,6 +25,35 @@ function config($key, $value = null)
}
}
/**
* Get or set lang variable.
*
* @param string $code Lang variable name
* @param string $value `$code`s value
* @return mixed
*/
function lang($code = null, $value = null)
{
if (!$GLOBALS['lang'] instanceof Rhymix\Framework\Lang)
{
$GLOBALS['lang'] = Rhymix\Framework\Lang::getInstance(Context::getLangType() ?: config('locale.default_lang') ?: 'ko');
$GLOBALS['lang']->loadDirectory(RX_BASEDIR . 'common/lang', 'common');
}
if ($code !== null && $value === null)
{
return $GLOBALS['lang']->get($code);
}
else if ($code !== null && $value !== null)
{
$GLOBALS['lang']->set($code, $value);
}
else
{
return $GLOBALS['lang']->langType();
}
}
/**
* Get the first value of an array.
*

1
common/lang/de.php
View file

@ -280,7 +280,6 @@ $lang->filter['invalid_korean_number'] = 'Das Format von% s ist ungültig. Bitte
$lang->filter['invalid_alpha'] = 'Das Format von% s ist ungültig. Bitte nur Alphabete eingeben.';
$lang->filter['invalid_alpha_number'] = 'Das Format von% s ist ungültig. Bitte nur Alphabete oder Zahlen eingeben.';
$lang->filter['invalid_number'] = 'Das Format von% s ist ungültig. Bitte nur Zahlen eingeben.';
$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
$lang->security_warning_embed = 'Aus Sicherheitsgründen ist es nicht erlaubt, dass der Administrator den eingebetteten Teil sehen. Wenn Sie das sehen möchten, loggen Sie sich mit einem anderen ID ein.';
$lang->msg_pc_to_mobile = 'Möchten Sie Mobile-Look?';
$lang->cmd_yes = 'Ja';

1
common/lang/en.php
View file

@ -298,7 +298,6 @@ $lang->filter['invalid_alpha_number'] = 'The format of %s is invalid. Please ent
$lang->filter['invalid_mid'] = 'The format of %s is invalid. Module ID should be begun with a letter. Subsequent characters may be letters, digits or underscore characters.';
$lang->filter['invalid_number'] = 'The format of %s is invalid. Please enter numbers only.';
$lang->filter['invalid_extension'] = 'The format of %s is invalid. e.g.) *.* or *.jpg;*.gif;.';
$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
$lang->security_warning_embed = 'Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID.';
$lang->msg_pc_to_mobile = 'View mobile optimized version of this page';
$lang->cmd_yes = 'Yes';

4
common/lang/es.php
View file

@ -228,7 +228,3 @@ $lang->filter['invalid_korean_number'] = 'Sólo puede introducir los caracteres
$lang->filter['invalid_alpha'] = 'Sólo puede introducir los alfabetos en el %s';
$lang->filter['invalid_alpha_number'] = 'Sólo puede introducir los alfanuméricos en el %s es inválido';
$lang->filter['invalid_number'] = 'Sólo puede introducir los dígitos numéricos en el %s';
$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
$lang->mobile_view = 'Use Mobile View';
$lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.';

4
common/lang/fr.php
View file

@ -224,7 +224,3 @@ $lang->filter['invalid_korean_number'] = 'La format de %s n\'est pas convenable.
$lang->filter['invalid_alpha'] = 'La format de %s n\'est pas convenable. Entrez seulement en alphabet, S.V.P.';
$lang->filter['invalid_alpha_number'] = 'La format de %s n\'est pas convenable. Entrez seulement des lettres d\'alphabet ou des chiffres.';
$lang->filter['invalid_number'] = 'La format de %s n\'est pas convenable. Entrez seulement des chiffres.';
$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
$lang->mobile_view = 'Use Mobile View';
$lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.';

1
common/lang/ja.php
View file

@ -292,7 +292,6 @@ $lang->filter['invalid_alpha'] = '%sの形式が正しくありません。半
$lang->filter['invalid_alpha_number'] = '%sの形式が正しくありません。半角英数字で入力してください。';
$lang->filter['invalid_mid'] = '%sの形式が正しくありません。 最初の文字は英文から始め、「英文＋数字＋_」組合せで入力が必要です。';
$lang->filter['invalid_number'] = '%sの形式が正しくありません。半角数字で入力してください。';
$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
$lang->security_warning_embed = 'セキュリティ問題のため、管理者IDではembedを見ることができません。<br />他のIDでログインしてください。';
$lang->msg_pc_to_mobile = 'このページは、モバイル表示が可能です。モバイル表示へ移動しますか?';
$lang->cmd_yes = 'はい';

2
common/lang/mn.php
View file

@ -245,5 +245,3 @@ $lang->filter['invalid_korean_number'] = '%s-ын хэлбэр буруу бай
$lang->filter['invalid_alpha'] = '%s-ын хэлбэр буруу байна. Зөвхөн латин үсгээр оруулах ёстой';
$lang->filter['invalid_alpha_number'] = '%s-ын хэлбэр буруу байна. Зөвхөн латин үсэг болон тоогоор л оруулах ёстой.';
$lang->filter['invalid_number'] = '%s-ын хэлбэр буруу байна. Зөвхөн тоогоор оруулах ёстой.';
$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';

6
common/lang/ru.php
View file

@ -228,9 +228,3 @@ $lang->default_value = 'Стандартное значение';
$lang->is_active = 'Активация';
$lang->is_required = 'Обязательные данные';
$lang->eid = 'Имя экстра переменных';
$lang->filter['invalid_email'] = 'The format of %s is invalid.';
$lang->filter['invalid_userid'] = 'The format of %s is invalid. All values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet';
$lang->filter['invalid_user_id'] = 'The format of %s is invalid. All values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet';
$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
$lang->mobile_view = 'Use Mobile View';
$lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.';

1
common/lang/tr.php
View file

@ -273,7 +273,6 @@ $lang->filter['invalid_alpha'] = '%s biçimi geçersiz. Lütfen sadece harfleri
$lang->filter['invalid_alpha_number'] = ' %s biçimi geçersiz. Lütfen harfleri ve sayıları kullanınız.';
$lang->filter['invalid_mid'] = '%s formatı geçersizdir. Modülün ID\'si harf ile başlaması gerekmektedir.';
$lang->filter['invalid_number'] = '%s bicimi geçersizdir . Lütfen sadece numaraları kullanın.';
$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
$lang->security_warning_embed = 'Güvenlik nedeniyle, yöneticiler yerleşik öğeleri görüntülemeye yetkili değildirler.<BR /> Yerleşik öğeleri görüntüleyebilmek için, lütfen yönetici olmayan bir hesap kullanın.';
$lang->msg_pc_to_mobile = 'Bu sayfanın mobil versiyonu bulunmaktadır. Mobil sayfaya geçiş yapmak istiyor musunuz?';
$lang->cmd_yes = 'Evet';

2
common/lang/vi.php
View file

@ -230,9 +230,7 @@ $lang->filter['invalid_korean_number'] = 'Định dạng của %s không hợp l
$lang->filter['invalid_alpha'] = 'Định dạng của %s không hợp lệ. Chỉ sử dụng các kí tự từ a-z';
$lang->filter['invalid_alpha_number'] = 'Định dạng của %s không hợp lệ. Chỉ sử dụng các kí tự từ a-z và các chữ số';
$lang->filter['invalid_number'] = 'Định dạng của %s không hợp lệ. Chỉ sử dụng các chữ số';
$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
$lang->security_warning_embed = 'Vì vấn đề bảo mật, nên Administrator không được phép xem các mục đã nhúng mã.<BR /> Để xem được chúng, hãy sử dụng một tên truy cập khác không có quyền quản trị.';
$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
$lang->mobile_view = 'Xem bằng di động';
$lang->about_mobile_view = 'Nếu truy cập bằng thiết bị di động, nội dung sẽ được bố trí theo từng loại thiết bị.';
$lang->more = 'Xem thêm';

2
common/lang/zh-CN.php
View file

@ -276,9 +276,7 @@ $lang->filter['invalid_alpha'] = '%s只能输入英文字母';
$lang->filter['invalid_alpha_number'] = '%s只能输入英文或数字';
$lang->filter['invalid_mid'] = '%s 格式错误。 模块名称只能用英文、数字及下划线，开头必须是英文。';
$lang->filter['invalid_number'] = '%s只能输入数字';
$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
$lang->security_warning_embed = '由于安全问题，不允许用系统管理员ID操作embed对象，请使用其他拥有管理权限的ID操作。';
$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
$lang->cmd_yes = '是';
$lang->cmd_no = '否';
$lang->cmd_set_multilingual = '选择语言';

1
common/lang/zh-TW.php
View file

@ -275,7 +275,6 @@ $lang->filter['invalid_alpha'] = '%s只能輸入英文字母';
$lang->filter['invalid_alpha_number'] = '%s只能輸入英文或數字';
$lang->filter['invalid_mid'] = '%s 格式錯誤。 模組名稱只能使用英文、數字及底線，開頭必須是英文。';
$lang->filter['invalid_number'] = '%s只能輸入數字';
$lang->security_invalid_session = '바르지 않은 접근입니다. 인증을 위해 다시 로그인해야 합니다.';
$lang->security_warning_embed = '基於安全因素，管理員無法檢視嵌入的物件。<BR /> 請使用其他非管理員帳號檢視。';
$lang->msg_pc_to_mobile = '此頁面有手機頁面，要移至手機頁面嗎？';
$lang->cmd_yes = '是';

8
common/legacy.php
View file

@ -594,8 +594,8 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = false)
// change day and am/pm for each language
if(preg_match('/[MFAa]/', $format))
{
$unit_week = (Array)Context::getLang('unit_week');
$unit_meridiem = (Array)Context::getLang('unit_meridiem');
$unit_week = (Array)lang('unit_week');
$unit_meridiem = (Array)lang('unit_meridiem');
$result = str_replace(array('Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', 'Sunday'), $unit_week, $result);
$result = str_replace(array('am', 'pm', 'AM', 'PM'), $unit_meridiem, $result);
}
@ -639,7 +639,7 @@ function getTimeGap($date, $format = 'Y.m.d')
{
$gap = RX_TIME - ztime($date);
$lang_time_gap = Context::getLang('time_gap');
$lang_time_gap = lang('time_gap');
if($gap < 60 * 1.5)
{
$buff = sprintf($lang_time_gap['min'], round($gap / 60));
@ -1157,7 +1157,7 @@ function stripEmbedTagForAdmin(&$content, $writer_member_srl)
return;
}
}
$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . Context::getLang('security_warning_embed') . "</p></div>";
$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>" . lang('security_warning_embed') . "</p></div>";
$content = preg_replace('/<object[^>]+>(.*?<\/object>)?/is', $security_msg, $content);
$content = preg_replace('/<embed[^>]+>(\s*<\/embed>)?/is', $security_msg, $content);
$content = preg_replace('/<img[^>]+editor_component="multimedia_link"[^>]*>(\s*<\/img>)?/is', $security_msg, $content);

18
common/tpl/debug_comment.html
View file

@ -2,6 +2,7 @@
<?php echo '[' . $data->timestamp . ']' . "\n"; ?>
<?php if (!count($display_content) || isset($display_content['request_info'])): ?>
Request / Response
==================
Request URL: <?php echo $data->url . "\n"; ?>
@ -25,7 +26,9 @@ Resource Usage
==============
Peak Memory Usage: <?php echo sprintf('%0.1f MB', memory_get_peak_usage(true) / 1024 / 1024) . "\n"; ?>
Included Files: <?php echo count(get_included_files()) . "\n"; ?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['entries'])): ?>
Debug Entries
=============
<?php
@ -51,12 +54,11 @@ Debug Entries
}
}
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['errors'])): ?>
PHP Errors and Warnings
=======================
<?php if ($data->errors === null): ?>
Error logging is disabled.
<?php else: ?>
<?php
$error_count = 0;
if (!count($data->errors))
@ -74,11 +76,9 @@ Error logging is disabled.
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['queries'])): ?>
Database Queries
================
<?php if ($data->queries === null): ?>
Query logging is disabled.
<?php else: ?>
<?php
$query_count = 0;
if (!count($data->queries))
@ -99,6 +99,7 @@ Query logging is disabled.
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['slow_queries'])): ?>
Slow Queries
============
<?php
@ -119,7 +120,9 @@ Slow Queries
echo sprintf(' - Result: %s', $query_result) . "\n";
}
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['slow_triggers'])): ?>
Slow Triggers
=============
<?php
@ -135,7 +138,9 @@ Slow Triggers
echo sprintf(' - Exec Time: %0.4f sec', $trigger->trigger_time) . "\n";
}
?>
<?php endif; ?>
<?php if (!count($display_content) || isset($display_content['slow_widgets'])): ?>
Slow Widgets
============
<?php
@ -150,3 +155,4 @@ Slow Widgets
echo sprintf(' - Exec Time: %0.4f sec', $widget->widget_time) . "\n";
}
?>
<?php endif; ?>

2
layouts/xedition/lang/ko.php Normal file
View file

@ -0,0 +1,2 @@
<?php
$lang->cmd_xedition_search_close = '검색창 닫기';

6
layouts/xedition/lang/lang.xml
View file

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<lang>
<item name="cmd_xedition_search_close">
<value xml:lang="ko"><![CDATA[검색창 닫기]]></value>
</item>
</lang>

2
layouts/xedition/layout.html
View file

@ -228,7 +228,7 @@
</a>
<div class="ly ly_login">
<ul>
<li loop="$logged_info->menu_list => $key, $val"><a href="{getUrl('act', $key, 'member_srl', '', 'page', '')}">{Context::getLang($val)}</a></li>
<li loop="$logged_info->menu_list => $key, $val"><a href="{getUrl('act', $key, 'member_srl', '', 'page', '')}">{lang($val)}</a></li>
<li><a href="{getUrl('act', 'dispMemberLogout')}">{$lang->cmd_logout}</a></li>
</ul>
<span class="edge"></span>

1
modules/addon/lang/ru.php
View file

@ -3,5 +3,4 @@ $lang->addon = 'Аддон';
$lang->addon_info = 'Информация об аддоне';
$lang->addon_maker = 'Автор аддона';
$lang->addon_history = 'История аддона';
$lang->about_addon_mid = '애드온이 사용될 대상을 지정할 수 있습니다.(모두 해제시 모든 대상에서 사용 가능합니다)';
$lang->about_addon = 'Аддон служит больше для контролирования действий, чем для отображения HTML-результатов.<br />Простым включением/выключением любых аддонов, Вы можете использовать очень полезные функции для администрирования Вашего веб-сайта';

16
modules/admin/admin.admin.controller.php
View file

@ -702,14 +702,16 @@ class adminAdminController extends admin
// Debug settings
Rhymix\Framework\Config::set('debug.enabled', $vars->debug_enabled === 'Y');
Rhymix\Framework\Config::set('debug.log_errors', $vars->debug_log_errors === 'Y');
Rhymix\Framework\Config::set('debug.log_queries', $vars->debug_log_queries === 'Y');
Rhymix\Framework\Config::set('debug.log_slow_queries', max(0, floatval($vars->debug_log_slow_queries)));
Rhymix\Framework\Config::set('debug.log_slow_triggers', max(0, floatval($vars->debug_log_slow_triggers)));
Rhymix\Framework\Config::set('debug.log_slow_widgets', max(0, floatval($vars->debug_log_slow_widgets)));
Rhymix\Framework\Config::set('debug.display_type', strval($vars->debug_display_type) ?: 'comment');
Rhymix\Framework\Config::set('debug.display_to', strval($vars->debug_display_to) ?: 'admin');
// Debug content
$debug_content = array_values($vars->debug_display_content);
Rhymix\Framework\Config::set('debug.display_content', $debug_content);
// Log filename
$log_filename = strval($vars->debug_log_filename);
$log_filename_today = str_replace(array('YYYY', 'YY', 'MM', 'DD'), array(
@ -907,7 +909,7 @@ class adminAdminController extends admin
else
{
$name = $tmpFileName = '';
Context::set('msg', Context::getLang('msg_invalid_format'));
Context::set('msg', lang('msg_invalid_format'));
}
Context::set('name', $name);
@ -934,7 +936,7 @@ class adminAdminController extends admin
if ($iconname == 'favicon.ico')
{
if(!preg_match('/^.*(x-icon|\.icon)$/i',$type)) {
Context::set('msg', '*.ico '.Context::getLang('msg_possible_only_file'));
Context::set('msg', '*.ico '.lang('msg_possible_only_file'));
return;
}
}
@ -942,18 +944,18 @@ class adminAdminController extends admin
{
if (!preg_match('/^.*(png).*$/',$type))
{
Context::set('msg', '*.png '.Context::getLang('msg_possible_only_file'));
Context::set('msg', '*.png '.lang('msg_possible_only_file'));
return;
}
if (!(($height == '57' && $width == '57') || ($height == '114' && $width == '114')))
{
Context::set('msg', Context::getLang('msg_invalid_format').' (size : 57x57, 114x114)');
Context::set('msg', lang('msg_invalid_format').' (size : 57x57, 114x114)');
return;
}
}
else
{
Context::set('msg', Context::getLang('msg_invalid_format'));
Context::set('msg', lang('msg_invalid_format'));
return;
}

4
modules/admin/admin.admin.model.php
View file

@ -112,7 +112,7 @@ class adminAdminModel extends admin
$connection = ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port);
if(!$connection)
{
return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host));
}
$login_result = @ftp_login($connection, $ftp_info->ftp_user, $ftp_info->ftp_password);
@ -216,7 +216,7 @@ class adminAdminModel extends admin
$oFTP = new ftp();
if(!$oFTP->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port))
{
return new Object(1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_info->ftp_host));
return new Object(1, sprintf(lang('msg_ftp_not_connected'), $ftp_info->ftp_host));
}
if(!$oFTP->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password))

3
modules/admin/admin.admin.view.php
View file

@ -491,13 +491,12 @@ class adminAdminView extends admin
{
// Load debug settings.
Context::set('debug_enabled', Rhymix\Framework\Config::get('debug.enabled'));
Context::set('debug_log_errors', Rhymix\Framework\Config::get('debug.log_errors'));
Context::set('debug_log_queries', Rhymix\Framework\Config::get('debug.log_queries'));
Context::set('debug_log_slow_queries', Rhymix\Framework\Config::get('debug.log_slow_queries'));
Context::set('debug_log_slow_triggers', Rhymix\Framework\Config::get('debug.log_slow_triggers'));
Context::set('debug_log_slow_widgets', Rhymix\Framework\Config::get('debug.log_slow_widgets'));
Context::set('debug_log_filename', Rhymix\Framework\Config::get('debug.log_filename') ?: 'files/debug/YYYYMMDD.php');
Context::set('debug_display_type', Rhymix\Framework\Config::get('debug.display_type'));
Context::set('debug_display_content', Rhymix\Framework\Config::get('debug.display_content'));
Context::set('debug_display_to', Rhymix\Framework\Config::get('debug.display_to'));
// IP access control

2
modules/admin/lang/es.php
View file

@ -37,7 +37,7 @@ $lang->xe_license = 'Rhymix está bajo la Licencia de GPL';
$lang->ssl_options['none'] = 'Desactivar';
$lang->ssl_options['optional'] = 'Opcionalmente el';
$lang->ssl_options['always'] = 'Utilice siempre el';
$lang->about_use_ssl = 'Opcionalmente, la composición de suscripción / editar la información y el uso de SSL especificada en la acción es siempre el uso de SSL para todos los servicios que se utilizarán SSL 환경이 갖춰지지 않은 상태에서 SSL을 사용할 경우 접속이 되지 않을 수 있으니 주의 바랍니다.';
$lang->about_use_ssl = 'Opcionalmente, la composición de suscripción / editar la información y el uso de SSL especificada en la acción es siempre el uso de SSL para todos los servicios que se utilizarán.';
$lang->server_ports = 'Especifique el puerto del servidor';
$lang->about_server_ports = '80 de HTTP, HTTPS al puerto 443 si se utiliza otro que se especifique lo contrario, el puerto va a necesitar.';
$lang->about_db_session = 'This setting will use PHP session used for authentication as DB. For the Websites which do not use web server frequently, you can uncheck this setting to improve response time. However, session DB will make it difficult to get current users, so you cannot use related functions.';

3
modules/admin/lang/fr.php
View file

@ -36,7 +36,7 @@ $lang->xe_license = 'Rhymix s\'applique la GPL';
$lang->ssl_options['none'] = 'Ne Pas utiliser';
$lang->ssl_options['optional'] = 'Optionnel';
$lang->ssl_options['always'] = 'Toujours';
$lang->about_use_ssl = 'Si l\'on choisit \'Optionnel\' , on utilise protocole SSL seulement dans quelques services comme inscription ou modification. Si l\'on choisit \'Toujours\', on utilise protocole SSL dans tous les services. SSL 환경이 갖춰지지 않은 상태에서 SSL을 사용할 경우 접속이 되지 않을 수 있으니 주의 바랍니다.';
$lang->about_use_ssl = 'Si l\'on choisit \'Optionnel\' , on utilise protocole SSL seulement dans quelques services comme inscription ou modification. Si l\'on choisit \'Toujours\', on utilise protocole SSL dans tous les services.';
$lang->server_ports = 'déclarer le port de serveur';
$lang->about_server_ports = 'Si l\'on ne veut pas utiliser le port 80 pour HTTP mais un autre port, ou bien, si l\'on ne veut pas utiliser le port 443 pour HTTPS mais un autre port, on doit déclarer les ports.';
$lang->about_db_session = 'This setting will use PHP session used for authentication as DB. For the Websites which do not use web server frequently, you can uncheck this setting to improve response time. However, session DB will make it difficult to get current users, so you cannot use related functions.';
@ -44,6 +44,5 @@ $lang->trash = 'Poubelle';
$lang->timezone = 'Fuseau horaire';
$lang->about_use_sso = 'SSO will enable users to sign in just once for both default and virtual site. You will need this only if you are using virtual sites.';
$lang->modify = 'Modifier';
$lang->ftp_form_title = 'FTP 정보 입력';
$lang->ftp = 'FTP';
$lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.';

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

@ -107,8 +107,6 @@ $lang->use_sftp_support = 'SFTP 사용';
$lang->disable_sftp_support = 'SFTP를 사용하려면 PHP에 ssh2 모듈이 설치되어 있어야 합니다.';
$lang->msg_self_restart_cache_engine = 'Memcached 또는 캐시 서비스를 재시작해 주세요.';
$lang->debug_enabled = '디버그 기능 사용';
$lang->debug_log_errors = '에러 기록';
$lang->debug_log_queries = '쿼리 기록';
$lang->debug_log_slow_queries = '느린 쿼리 기록';
$lang->debug_log_slow_triggers = '느린 트리거 기록';
$lang->debug_log_slow_widgets = '느린 위젯 기록';
@ -117,6 +115,14 @@ $lang->debug_display_type = '디버그 정보 표시 방법';
$lang->debug_display_type_comment = 'HTML 소스에 표시 (주석)';
$lang->debug_display_type_panel = '화면에 표시 (패널)';
$lang->debug_display_type_file = '파일에 기록';
$lang->debug_display_content = '디버그 정보 표시 내용';
$lang->debug_display_content_request_info = '요청/응답 정보';
$lang->debug_display_content_entries = '디버그 메시지';
$lang->debug_display_content_errors = '에러';
$lang->debug_display_content_queries = '쿼리';
$lang->debug_display_content_slow_queries = '느린 쿼리';
$lang->debug_display_content_slow_triggers = '느린 트리거';
$lang->debug_display_content_slow_widgets = '느린 위젯';
$lang->debug_display_to = '디버그 정보 표시 대상';
$lang->debug_display_to_admin = '관리자에게만 표시';
$lang->debug_display_to_ip = '아래 IP의 방문자에게만 표시';

3
modules/admin/lang/mn.php
View file

@ -3,8 +3,7 @@ $lang->modify = 'Засах';
$lang->ftp_form_title = 'FTP мэдээлэл оруулах';
$lang->ftp = 'FTP';
$lang->cmd_check_ftp_connect = 'FTP холболт шалгах';
$lang->msg_safe_mode_ftp_needed = 'PHP의 safe_mode가 Onбайх тохиолдолд , FTP мэдээллийг заавал оруулснаар Rhymix идэвжvvлэх болон хэрэглэх боломжтой болно.';
$lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.';
$lang->msg_safe_mode_ftp_needed = 'PHP safe_mode Onбайх тохиолдолд , FTP мэдээллийг заавал оруулснаар Rhymix идэвжvvлэх болон хэрэглэх боломжтой болно.';
$lang->msg_ftp_mkdir_fail = 'FTP-г ашиглан eгсeн eгeгдлийг биелvvлж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.';
$lang->msg_ftp_chmod_fail = 'FTP-г ашиглан eeрчлeлтийг хийж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.';
$lang->msg_ftp_connect_success = 'FTP холболт болон баталгаажуулалт хийгдлээ.';

14
modules/admin/lang/ru.php
View file

@ -4,14 +4,6 @@ $lang->admin_index = 'Индексная страница администрат
$lang->control_panel = 'Контрольная панель';
$lang->start_module = 'Homepage';
$lang->about_start_module = 'Вы можете указать модуль запуска по умолчанию.';
$lang->select_site = 'Site';
$lang->select_module_type = 'Module Type';
$lang->select_module_instance = 'Page';
$lang->module_category_title['service'] = 'Service Setting';
$lang->module_category_title['member'] = 'Member Setting';
$lang->module_category_title['content'] = 'Content Setting';
$lang->module_category_title['utility'] = 'Utility Setting';
$lang->module_category_title['interlock'] = 'Interlock Setting';
$lang->newest_news = 'Последние новости';
$lang->env_setup = 'Настройка';
$lang->default_url = 'Основной URL';
@ -40,15 +32,9 @@ $lang->today = 'Сегодня';
$lang->ssl_options['none'] = 'Никогда';
$lang->ssl_options['optional'] = 'На выбор';
$lang->ssl_options['always'] = 'Всегда';
$lang->about_use_ssl = 'In case of "Optional", SSL will be used for actions such as signing up / changing information. And for "Always", your site will be served only via https SSL 환경이 갖춰지지 않은 상태에서 SSL을 사용할 경우 접속이 되지 않을 수 있으니 주의 바랍니다.';
$lang->about_db_session = 'It will use php session with DB when authenticating. Websites with infrequent usage of web server may expect faster response when this function is disabled. However session DB will make it unable to get current users, so you cannot use related functions';
$lang->ftp_remove_info = 'Remove FTP Info';
$lang->trash = 'мусор';
$lang->timezone = 'Часовой пояс';
$lang->about_use_sso = 'SSO will enable users to sign in just once for both default and virtual site. You will need this only if you are using virtual sites.';
$lang->move = 'Перейти';
$lang->modify = 'Изменить';
$lang->ftp_form_title = 'Введите данные FTP';
$lang->ftp = 'FTP';
$lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.';
$lang->msg_ftp_chmod_fail = 'Chmod failed. Please check the permission and configuration of FTP server.';

2
modules/admin/lang/tr.php
View file

@ -64,7 +64,7 @@ $lang->use_ssl = '<abbr title="Secure Sockets Layer">SSL</abbr>\'i kullanmak ist
$lang->ssl_options['none'] = 'Hiçbir zaman';
$lang->ssl_options['optional'] = 'İsteğe Bağlı';
$lang->ssl_options['always'] = 'Her zaman';
$lang->about_use_ssl = '\'İsteği Bağlı\' seçiminde; SSL, kayıt olma/bilgi değiştirme gibi eylemler için kullanılacaktır. \'Her zaman\' seçiminde, siteniz sadece http yoluyla hizmet verecektir. SSL 환경이 갖춰지지 않은 상태에서 SSL을 사용할 경우 접속이 되지 않을 수 있으니 주의 바랍니다.';
$lang->about_use_ssl = '\'İsteği Bağlı\' seçiminde; SSL, kayıt olma/bilgi değiştirme gibi eylemler için kullanılacaktır. \'Her zaman\' seçiminde, siteniz sadece http yoluyla hizmet verecektir.';
$lang->server_ports = 'Sunucu Bağlantı Noktası (port)';
$lang->about_server_ports = 'Eğer web sunucunuz, HTTP bağlantı noktaları için 80 ya da HTTPS 443 portunu kullanmıyorsa, sunucu bağlantı noktalarını belirtmeniz gerekmektedir.';
$lang->use_db_session = 'Oturum Veritabanı Kullanımı';

2
modules/admin/lang/vi.php
View file

@ -58,7 +58,6 @@ $lang->msg_self_restart_cache_engine = 'Hãy thiết lập lại bộ nhớ Cach
$lang->autoinstall = 'Cập nhật tự động';
$lang->trash = 'Thùng rác';
$lang->timezone = 'Múi giờ';
$lang->about_use_sso = 'SSO will enable users to sign in just once for both default and virtual site. You will need this only if you are using virtual sites.';
$lang->move = 'Di chuyển';
$lang->modify = 'Thay đổi';
$lang->ftp_form_title = 'Thông tin FTP';
@ -68,7 +67,6 @@ $lang->ftp_port = 'Cổng kết nối';
$lang->about_ftp_password = 'Mật khẩu của FTP sẽ không lưu lại';
$lang->cmd_check_ftp_connect = 'Kiểm tra kết nối bằng FTP';
$lang->msg_safe_mode_ftp_needed = 'Nếu safe_mode của PHP mở, bạn có thể cài đặt các thành phần bổ xung cho Rhymix một cách tự động qua FTP.';
$lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.';
$lang->msg_ftp_mkdir_fail = 'Lỗi khi tạo thư mục. Xin vui lòng kiểm tra lại quyền truy cập FTP.';
$lang->msg_ftp_chmod_fail = 'CHMOD thất bại. Xin vui lòng kiểm tra lại.';
$lang->msg_ftp_connect_success = 'Đã xác nhận và kết nối thành công tới máy chủ bằng FTP.';

5
modules/admin/lang/zh-CN.php
View file

@ -12,11 +12,7 @@ $lang->favorites = '收藏';
$lang->admin_info = '管理员信息';
$lang->admin_index = '管理首页';
$lang->control_panel = '控制面板';
$lang->start_module = 'Homepage';
$lang->about_start_module = '可指定用户访问网站时的默认首页模块。';
$lang->select_site = 'Site';
$lang->select_module_type = 'Module Type';
$lang->select_module_instance = 'Page';
$lang->module_category_title['service'] = '应用管理';
$lang->module_category_title['member'] = '用户管理';
$lang->module_category_title['content'] = '资源管理';
@ -101,7 +97,6 @@ $lang->about_use_favicon = '请上传16*16像素的<em>*.ico</em>文件.';
$lang->allow_use_mobile_icon = '是否启用移动版屏幕图标?';
$lang->detail_use_mobile_icon = '请上传57*57像素或者114*114像素的<em>*.png</em>文件.';
$lang->use_sso = '是否启用通行证<abbr title="Single Sign On">SSO</abbr>?';
$lang->about_use_sso = 'SSO will enable users to sign in just once for both default and virtual site. You will need this only if you are using virtual sites.';
$lang->about_arrange_session = '你想要整理session吗？';
$lang->cmd_clear_session = '整理sessioon';
$lang->save = '保存';

7
modules/admin/lang/zh-TW.php
View file

@ -2,11 +2,7 @@
$lang->admin_info = '管理員資訊';
$lang->admin_index = '管理頁面';
$lang->control_panel = '控制介面';
$lang->start_module = 'Homepage';
$lang->about_start_module = '可將所選擇的模組作為預設首頁。';
$lang->select_site = 'Site';
$lang->select_module_type = 'Module Type';
$lang->select_module_instance = 'Page';
$lang->module_category_title['service'] = '服務設定';
$lang->module_category_title['member'] = '會員管理';
$lang->module_category_title['content'] = '內容管理';
@ -45,7 +41,7 @@ $lang->today = '今天';
$lang->ssl_options['none'] = '關閉';
$lang->ssl_options['optional'] = '手動';
$lang->ssl_options['always'] = '開啟';
$lang->about_use_ssl = '選擇手動時，在會員註冊或修改資料等動作時才會使用 SSL功能。 選擇開啟時，所有的服務都會使用 SSL功能。 SSL 환경이 갖춰지지 않은 상태에서 SSL을 사용할 경우 접속이 되지 않을 수 있으니 주의 바랍니다.';
$lang->about_use_ssl = '選擇手動時，在會員註冊或修改資料等動作時才會使用 SSL功能。 選擇開啟時，所有的服務都會使用 SSL功能。 ';
$lang->server_ports = '主機埠口';
$lang->about_server_ports = 'HTTP、HTTPS預設埠口分別是『80』、『443』 如果想使用其他的埠口的話，請自行設定。';
$lang->use_db_session = 'DB session認證';
@ -73,7 +69,6 @@ $lang->cmd_check_ftp_connect = '檢查 FTP 連線';
$lang->msg_safe_mode_ftp_needed = '當 PHP 的安全模式(safe_mode)開啟時，請輸入相關 FTP 資訊，否則無法正常安裝或使用程式。';
$lang->msg_safe_mode_ftp_needed2 = '可用的安裝或更新。';
$lang->msg_safe_mode_ftp_config = '此資料會儲存在<strong>files/config/ftp.config.php</strong> 檔案中。 安裝後可在設定頁面中新增、更改或刪除此資訊。';
$lang->msg_ftp_no_directory = 'Succeed to connect to the host via FTP. However, can not read any directory list informaiton. Check the server configurations.';
$lang->msg_ftp_mkdir_fail = '新增資料夾失敗。請確認 FTP 主機設置。';
$lang->msg_ftp_chmod_fail = '修改資料夾權限失敗。請確認 FTP 主機設置。';
$lang->msg_ftp_connect_success = 'FTP連線成功。';

34
modules/admin/tpl/config_debug.html
View file

@ -14,38 +14,24 @@
<label for="debug_enabled_n" class="x_inline"><input type="radio" name="debug_enabled" id="debug_enabled_n" value="N" checked="checked"|cond="!$debug_enabled" /> {$lang->cmd_no}</label>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->debug_log_errors}</label>
<div class="x_controls">
<label for="debug_log_errors_y" class="x_inline"><input type="radio" name="debug_log_errors" id="debug_log_errors_y" value="Y" checked="checked"|cond="$debug_log_errors" /> {$lang->cmd_yes}</label>
<label for="debug_log_errors_n" class="x_inline"><input type="radio" name="debug_log_errors" id="debug_log_errors_n" value="N" checked="checked"|cond="!$debug_log_errors" /> {$lang->cmd_no}</label>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->debug_log_queries}</label>
<div class="x_controls">
<label for="debug_log_queries_y" class="x_inline"><input type="radio" name="debug_log_queries" id="debug_log_queries_y" value="Y" checked="checked"|cond="$debug_log_queries" /> {$lang->cmd_yes}</label>
<label for="debug_log_queries_n" class="x_inline"><input type="radio" name="debug_log_queries" id="debug_log_queries_n" value="N" checked="checked"|cond="!$debug_log_queries" /> {$lang->cmd_no}</label>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="debug_log_slow_queries">{$lang->debug_log_slow_queries}</label>
<div class="x_controls">
<input type="text" name="debug_log_slow_queries" id="debug_log_slow_queries" size="5" value="{$debug_log_slow_queries}" />
<input type="text" name="debug_log_slow_queries" id="debug_log_slow_queries" size="5" value="{$debug_log_slow_queries}" style="width:60px" />
&nbsp;{$lang->debug_seconds}
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="debug_log_slow_triggers">{$lang->debug_log_slow_triggers}</label>
<div class="x_controls">
<input type="text" name="debug_log_slow_triggers" id="debug_log_slow_triggers" size="5" value="{$debug_log_slow_triggers}" />
<input type="text" name="debug_log_slow_triggers" id="debug_log_slow_triggers" size="5" value="{$debug_log_slow_triggers}" style="width:60px" />
&nbsp;{$lang->debug_seconds}
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="debug_log_slow_widgets">{$lang->debug_log_slow_widgets}</label>
<div class="x_controls">
<input type="text" name="debug_log_slow_widgets" id="debug_log_slow_widgets" size="5" value="{$debug_log_slow_widgets}" />
<input type="text" name="debug_log_slow_widgets" id="debug_log_slow_widgets" size="5" value="{$debug_log_slow_widgets}" style="width:60px" />
&nbsp;{$lang->debug_seconds}
</div>
</div>
@ -57,10 +43,22 @@
<label for="debug_display_type_file" class="x_inline"><input type="radio" name="debug_display_type" id="debug_display_type_file" value="file" checked="checked"|cond="$debug_display_type=='file'" /> {$lang->debug_display_type_file}</label>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="debug_log_slow_widgets">{$lang->debug_display_content}</label>
<div class="x_controls">
<label for="debug_display_content_request_info" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_request_info" value="request_info" checked="checked"|cond="!count($debug_display_content) || in_array('request_info', $debug_display_content)" /> {$lang->debug_display_content_request_info}</label>
<label for="debug_display_content_entries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_entries" value="entries" checked="checked"|cond="!count($debug_display_content) || in_array('entries', $debug_display_content)" /> {$lang->debug_display_content_entries}</label>
<label for="debug_display_content_errors" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_errors" value="errors" checked="checked"|cond="!count($debug_display_content) || in_array('errors', $debug_display_content)" /> {$lang->debug_display_content_errors}</label>
<label for="debug_display_content_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_queries" value="queries" checked="checked"|cond="!count($debug_display_content) || in_array('queries', $debug_display_content)" /> {$lang->debug_display_content_queries}</label>
<label for="debug_display_content_slow_queries" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_queries" value="slow_queries" checked="checked"|cond="!count($debug_display_content) || in_array('slow_queries', $debug_display_content)" /> {$lang->debug_display_content_slow_queries}</label>
<label for="debug_display_content_slow_triggers" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_triggers" value="slow_triggers" checked="checked"|cond="!count($debug_display_content) || in_array('slow_triggers', $debug_display_content)" /> {$lang->debug_display_content_slow_triggers}</label>
<label for="debug_display_content_slow_widgets" class="x_inline"><input type="checkbox" name="debug_display_content[]" id="debug_display_content_slow_widgets" value="slow_widgets" checked="checked"|cond="!count($debug_display_content) || in_array('slow_widgets', $debug_display_content)" /> {$lang->debug_display_content_slow_widgets}</label>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="debug_log_filename">{$lang->debug_log_filename}</label>
<div class="x_controls">
<input type="text" name="debug_log_filename" id="debug_log_filename" value="{$debug_log_filename}" />
<input type="text" name="debug_log_filename" id="debug_log_filename" value="{$debug_log_filename}" style="min-width: 80%" />
<p class="x_help-block">{$lang->about_debug_log_filename}</p>
</div>
</div>

14
modules/autoinstall/autoinstall.lib.php
View file

@ -411,7 +411,7 @@ class SFTPModuleInstaller extends ModuleInstaller
if(!@ssh2_sftp_unlink($this->sftp, $target_path))
{
return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path));
}
return new Object();
}
@ -432,7 +432,7 @@ class SFTPModuleInstaller extends ModuleInstaller
if(!@ssh2_sftp_rmdir($this->sftp, $target_path))
{
return new Object(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
return new Object(-1, sprintf(lang('msg_delete_dir_failed'), $path));
}
return new Object();
}
@ -532,7 +532,7 @@ class PHPFTPModuleInstaller extends ModuleInstaller
$this->connection = ftp_connect($ftp_host, $this->ftp_info->ftp_port);
if(!$this->connection)
{
return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host));
}
$login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password);
@ -745,7 +745,7 @@ class FTPModuleInstaller extends ModuleInstaller
$this->oFtp = new ftp();
if(!$this->oFtp->ftp_connect($ftp_host, $this->ftp_info->ftp_port))
{
return new Object(-1, sprintf(Context::getLang('msg_ftp_not_connected'), $ftp_host));
return new Object(-1, sprintf(lang('msg_ftp_not_connected'), $ftp_host));
}
if(!$this->oFtp->ftp_login($this->ftp_info->ftp_user, $this->ftp_password))
{
@ -772,7 +772,7 @@ class FTPModuleInstaller extends ModuleInstaller
if(!$this->oFtp->ftp_delete($target_path))
{
return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path));
}
return new Object();
}
@ -792,7 +792,7 @@ class FTPModuleInstaller extends ModuleInstaller
if(!$this->oFtp->ftp_rmdir($target_path))
{
return new Object(-1, sprintf(Context::getLang('msg_delete_dir_failed'), $path));
return new Object(-1, sprintf(lang('msg_delete_dir_failed'), $path));
}
return new Object();
}
@ -911,7 +911,7 @@ class DirectModuleInstaller extends ModuleInstaller
if(!FileHandler::removeFile($target_path))
{
return new Object(-1, sprintf(Context::getLang('msg_delete_file_failed'), $path));
return new Object(-1, sprintf(lang('msg_delete_file_failed'), $path));
}
return new Object();
}

3
modules/autoinstall/lang/fr.php
View file

@ -1,4 +1 @@
<?php
$lang->current_version = 'Version Courante';
$lang->msg_ftp_invalid_auth_info = 'Cannot log in with the FTP password you entered. Please check if it is correct.';
$lang->msg_ftp_not_connected = 'Connection to the %s via FTP failed. Please check the port number and whether the FTP service is available.';

8
modules/autoinstall/lang/ru.php
View file

@ -3,13 +3,5 @@ $lang->order_newest = 'Новый';
$lang->order_popular = 'Популярный';
$lang->order_download = 'Скачать';
$lang->success_installed = 'Установлено успешно';
$lang->description_ftp_note = 'If %s is not set, installation would not work. Please configure FTP information';
$lang->description_update = 'If you have upgraded or installed programs without EasyInstall module, please press %s to renew new information';
$lang->install = 'Инсталлировать';
$lang->update = 'Обновить';
$lang->require_update = 'Update is required';
$lang->require_installation = 'Installation is required';
$lang->description_install = 'EasyInstall will also install/update all other programs which this program is depending on';
$lang->description_download = 'If FTP is unavailable, you should manually download it and extract it into target path. (if target path is ./modules/board, extract it at ./modules)';
$lang->rate = 'points';
$lang->msg_ftp_not_connected = 'Connection to %s via FTP failed. Please check the port number and if FTP service is available.';

6
modules/board/board.admin.model.php
View file

@ -48,10 +48,10 @@ class boardAdminModel extends board
// set order target list
foreach($this->order_target AS $key)
{
$order_target[$key] = Context::getLang($key);
$order_target[$key] = lang($key);
}
$order_target['list_order'] = Context::getLang('document_srl');
$order_target['update_order'] = Context::getLang('last_update');
$order_target['list_order'] = lang('document_srl');
$order_target['update_order'] = lang('last_update');
Context::set('order_target', $order_target);
// for advanced language & url

8
modules/board/board.admin.view.php
View file

@ -54,9 +54,9 @@ class boardAdminView extends board {
$this->setTemplatePath($template_path);
// install order (sorting) options
foreach($this->order_target as $key) $order_target[$key] = Context::getLang($key);
$order_target['list_order'] = Context::getLang('document_srl');
$order_target['update_order'] = Context::getLang('last_update');
foreach($this->order_target as $key) $order_target[$key] = lang($key);
$order_target['list_order'] = lang('document_srl');
$order_target['update_order'] = lang('last_update');
Context::set('order_target', $order_target);
}
@ -295,7 +295,7 @@ class boardAdminView extends board {
* @brief board module message
**/
function alertMessage($message) {
$script = sprintf('<script> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', Context::getLang($message));
$script = sprintf('<script> xAddEventListener(window,"load", function() { alert("%s"); } );</script>', lang($message));
Context::addHtmlHeader( $script );
}
}

19
modules/board/board.controller.php
View file

@ -106,6 +106,11 @@ class boardController extends board
}
}
if($this->module_info->update_log == 'Y')
{
$obj->update_log_setting = 'Y';
}
// update the document if it is existed
if($is_update)
{
@ -126,7 +131,7 @@ class boardController extends board
{
if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_document');
$format = lang('msg_protect_regdate_document');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -146,12 +151,14 @@ class boardController extends board
$obj->last_update = $obj->regdate = date('YmdHis');
$obj->update_order = $obj->list_order = (getNextSequence() * -1);
}
$obj->reason_update = escape($obj->reason_update);
$output = $oDocumentController->updateDocument($oDocument, $obj);
$msg_code = 'success_updated';
// insert a new document otherwise
} else {
}
else
{
$output = $oDocumentController->insertDocument($obj, $bAnonymous);
$msg_code = 'success_registed';
$obj->document_srl = $output->get('document_srl');
@ -227,7 +234,7 @@ class boardController extends board
{
if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_document');
$format = lang('msg_protect_regdate_document');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -378,7 +385,7 @@ class boardController extends board
{
if($comment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_comment');
$format = lang('msg_protect_regdate_comment');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -431,7 +438,7 @@ class boardController extends board
{
if($comment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_comment');
$format = lang('msg_protect_regdate_comment');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}

2
modules/board/board.mobile.php
View file

@ -105,7 +105,7 @@ class boardMobile extends boardView
function dispBoardMessage($msg_code)
{
$msg = Context::getLang($msg_code);
$msg = lang($msg_code);
$oMessageObject = &ModuleHandler::getModuleInstance('message','mobile');
$oMessageObject->setError(-1);
$oMessageObject->setMessage($msg);

4
modules/board/board.model.php
View file

@ -48,7 +48,7 @@ class boardModel extends module
}
else
{
$output[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);
$output[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null);
}
}
return $output;
@ -64,7 +64,7 @@ class boardModel extends module
'user_id', 'user_name', 'readed_count', 'voted_count', 'blamed_count', 'thumbnail', 'summary', 'comment_status');
foreach($virtual_vars as $key)
{
$extra_vars[$key] = new ExtraItem($module_srl, -1, Context::getLang($key), $key, 'N', 'N', 'N', null);
$extra_vars[$key] = new ExtraItem($module_srl, -1, lang($key), $key, 'N', 'N', 'N', null);
}
// get the extra variables from the document model

58
modules/board/board.view.php
View file

@ -160,7 +160,7 @@ class boardView extends board
* add extra vaiables to the search options
**/
// use search options on the template (the search options key has been declared, based on the language selected)
foreach($this->search_option as $opt) $search_option[$opt] = Context::getLang($opt);
foreach($this->search_option as $opt) $search_option[$opt] = lang($opt);
$extra_keys = Context::get('extra_keys');
if($extra_keys)
{
@ -328,11 +328,13 @@ class boardView extends board
// disappear the document if it is secret
if($oDocument->isSecret() && !$oDocument->isGranted())
{
$oDocument->add('content',Context::getLang('thisissecret'));
$oDocument->add('content',lang('thisissecret'));
}
}
}
Context::set('update_view', $this->grant->update_view);
// setup the document oject on context
$oDocument->add('module_srl', $this->module_srl);
Context::set('oDocument', $oDocument);
@ -430,7 +432,7 @@ class boardView extends board
{
if(!$val->isAccessible())
{
$val->add('content',Context::getLang('thisissecret'));
$val->add('content',lang('thisissecret'));
}
}
}
@ -698,7 +700,7 @@ class boardView extends board
{
if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_document');
$format = lang('msg_protect_regdate_document');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -825,7 +827,7 @@ class boardView extends board
{
if($oDocument->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_document');
$format = lang('msg_protect_regdate_document');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -987,7 +989,7 @@ class boardView extends board
{
if($oComment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_comment');
$format = lang('msg_protect_regdate_comment');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -1055,7 +1057,7 @@ class boardView extends board
{
if($oComment->get('regdate') < date('YmdHis', strtotime('-'.$this->module_info->protect_document_regdate.' day')))
{
$format = Context::getLang('msg_protect_regdate_comment');
$format = lang('msg_protect_regdate_comment');
$massage = sprintf($format, $this->module_info->protect_document_regdate);
return new Object(-1, $massage);
}
@ -1134,19 +1136,57 @@ class boardView extends board
**/
function dispBoardMessage($msg_code)
{
$msg = Context::getLang($msg_code);
$msg = lang($msg_code);
if(!$msg) $msg = $msg_code;
Context::set('message', $msg);
$this->setTemplateFile('message');
}
function dispBoardUpdateLog()
{
$oDocumentModel = getModel('document');
$document_srl = Context::get('document_srl');
if($this->grant->update_view !== true)
{
return new Object(-1, 'msg_not_permitted');
}
$updatelog = $oDocumentModel->getDocumentUpdateLog($document_srl);
Context::set('total_count', $updatelog->page_navigation->total_count);
Context::set('total_page', $updatelog->page_navigation->total_page);
Context::set('page', $updatelog->page);
Context::set('page_navigation', $updatelog->page_navigation);
Context::set('updatelog', $updatelog);
$this->setTemplateFile('update_list');
}
function dispBoardUpdateLogView()
{
$oDocumentModel = getModel('document');
$update_id = Context::get('update_id');
if($this->grant->update_view !== true)
{
return new Object(-1, 'msg_not_permitted');
}
$update_log = $oDocumentModel->getUpdateLog($update_id);
$extra_vars = unserialize($update_log->extra_vars);
Context::set('extra_vars', $extra_vars);
Context::set('update_log', $update_log);
$this->setTemplateFile('update_view');
}
/**
* @brief the method for displaying the warning messages
* display an error message if it has not a special design
**/
function alertMessage($message)
{
$script = sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', Context::getLang($message));
$script = sprintf('<script> jQuery(function(){ alert("%s"); } );</script>', lang($message));
Context::addHtmlFooter( $script );
}

14
modules/board/board.wap.php
View file

@ -17,7 +17,7 @@ class boardWAP extends board
// check grant
if(!$this->grant->list || $this->module_info->consultation == 'Y')
{
return $oMobile->setContent(Context::getLang('msg_not_permitted'));
return $oMobile->setContent(lang('msg_not_permitted'));
}
// generate document model object
@ -33,7 +33,7 @@ class boardWAP extends board
// check the grant
if(!$this->grant->view)
{
return $oMobile->setContent(Context::getLang('msg_not_permitted'));
return $oMobile->setContent(lang('msg_not_permitted'));
}
// setup the browser title
@ -64,7 +64,7 @@ class boardWAP extends board
$oMobile->setContent( $content );
// setup upper URL
$oMobile->setUpperUrl( getUrl('act',''), Context::getLang('cmd_go_upper') );
$oMobile->setUpperUrl( getUrl('act',''), lang('cmd_go_upper') );
// display the document if the act is not display the comment list
} else {
@ -74,14 +74,14 @@ class boardWAP extends board
// setup content information(include the comments link)
$content = Context::getLang('replies').' : <a href="'.getUrl('act','dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;
$content = lang('replies').' : <a href="'.getUrl('act','dispBoardContentCommentList').'">'.$oDocument->getCommentCount().'</a><br>'."\r\n".$content;
$content = '<b>'.$oDocument->getNickName().'</b> ('.$oDocument->getRegdate("Y-m-d").")<br>\r\n".$content;
// setup mobile contents
$oMobile->setContent( $content );
// setup upper URL
$oMobile->setUpperUrl( getUrl('document_srl',''), Context::getLang('cmd_list') );
$oMobile->setUpperUrl( getUrl('document_srl',''), lang('cmd_list') );
}
@ -124,12 +124,12 @@ class boardWAP extends board
// next/prevUrl specification
if($page > 1)
{
$oMobile->setPrevUrl(getUrl('mid',$_GET['mid'],'page',$page-1), sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $page-1, $totalPage));
$oMobile->setPrevUrl(getUrl('mid',$_GET['mid'],'page',$page-1), sprintf('%s (%d/%d)', lang('cmd_prev'), $page-1, $totalPage));
}
if($page < $totalPage)
{
$oMobile->setNextUrl(getUrl('mid',$_GET['mid'],'page',$page+1), sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $page+1, $totalPage));
$oMobile->setNextUrl(getUrl('mid',$_GET['mid'],'page',$page+1), sprintf('%s (%d/%d)', lang('cmd_next'), $page+1, $totalPage));
}
$oMobile->mobilePage = $page;

5
modules/board/conf/module.xml
View file

@ -21,6 +21,9 @@
<title xml:lang="zh-TW">檢視</title>
<title xml:lang="tr">görüş</title>
</grant>
<grant name="update_view" default="guest">
<title xml:lang="ko">수정내역 조회</title>
</grant>
<grant name="write_document" default="guest">
<title xml:lang="ko">글 작성</title>
<title xml:lang="zh-CN">发表新主题</title>
@ -63,6 +66,7 @@
<action name="dispBoardCategoryList" type="view" />
<action name="dispBoardContentCommentList" type="view" />
<action name="dispBoardContentFileList" type="view" />
<action name="dispBoardUpdateLog" type="view" />
<action name="dispBoardTagList" type="view" />
<action name="dispBoardWrite" type="view" standalone="false" />
@ -73,6 +77,7 @@
<action name="dispBoardDeleteComment" type="view" standalone="false" />
<action name="dispBoardDeleteTrackback" type="view" standalone="false" />
<action name="dispBoardMessage" type="view" />
<action name="dispBoardUpdateLogView" type="view" />
<action name="procBoardInsertDocument" type="controller" ruleset="insertDocument" standalone="false" />
<action name="procBoardDeleteDocument" type="controller" standalone="false" />

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

@ -13,7 +13,6 @@ $lang->cmd_board_info = 'Información del Tablero';
$lang->about_layout_setup = 'Puede modificar manualmente el código del diseño de tableros. Insertar o modificar el código de widget.';
$lang->about_board_category = 'Puede crear las categorias de tableros. Cuando no funciona la categoría de tableros, rehacer el archivo caché manualmente para solucionar.';
$lang->about_except_notice = 'Aviso de los artículos no se mostrará en la lista normal.';
$lang->about_use_anonymous = '글쓴이의 정보를 없애고 익명으로 게시판 사용을 할 수 있게 합니다. 스킨설정에서 글쓴이 정보등을 보이지 않도록 하시면 더욱 유용합니다';
$lang->about_board = 'Este módulo es para crear y manejar los tableros.';
$lang->about_consultation = 'No administrador de los miembros que consideran que su propia artocles. \\ NNon miembros no serían capaces de escribir artículos al utilizar la consulta.';
$lang->about_secret = 'Boletín y los comentarios de bimilgeul utilizar.';

2
modules/board/lang/fr.php
View file

@ -10,8 +10,6 @@ $lang->cmd_board_info = 'Information des Panneaux';
$lang->about_layout_setup = 'Vous pouvez manuellement modifier le code de Mise en Page du blogue. Insérez ou administrez le code de Gadget n\'importe où vous voulez.';
$lang->about_board_category = 'Vous pouvez créer des catégories de Panneau d\'Affichage. Quand la catégorie d\'affichage est cassé, essayez manuellement rétablir l\'antémémoire du fichier.';
$lang->about_except_notice = 'Le titre de Notice dont l\'article se représentera toujours en tête de la liste ne sera exposé sur la liste générale.';
$lang->about_use_anonymous = '글쓴이의 정보를 없애고 익명으로 게시판 사용을 할 수 있게 합니다. 스킨설정에서 글쓴이 정보등을 보이지 않도록 하시면 더욱 유용합니다';
$lang->about_board = 'Ce module se sert à créer et à administrer des Panneaux d\'Affichage.';
$lang->about_consultation = 'Les membres non-administratifs verront seulement les ariticles d\'eux-même. Non-membres ne pourraient pas écrire des articles quand la Consultation est appliqué.';
$lang->about_admin_mail = 'Un message éléctronique sera envoyé à l\'adresse inscrite quand un article ou commentaire se soumet. On peut inscrire multiple adresses délimité par les virgules.';
$lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다. 단 스킨에서 지원하지 않는 경우 지원되지 않을 수 있습니다 대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';

9
modules/board/lang/ko.php
View file

@ -14,6 +14,8 @@ $lang->consultation = '상담 기능';
$lang->secret = '비밀글 기능';
$lang->thisissecret = '비밀글입니다.';
$lang->admin_mail = '관리자 메일';
$lang->update_log = '게시글 수정 내역';
$lang->last_updater = '수정한사람';
$lang->cmd_board_list = '게시판 목록';
$lang->cmd_module_config = '게시판 공통 설정';
$lang->cmd_board_info = '게시판 정보';
@ -31,6 +33,7 @@ $lang->about_admin_mail = '글이나 댓글이 등록될때 등록된 메일주
$lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다. 단 스킨에서 지원하지 않는 경우 불가능합니다. 대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
$lang->about_use_status = '글 작성 시 선택할 수 있는 상태를 지정해주세요.';
$lang->about_protect_comment = '댓글의 댓글이 있을경우 해당댓글을 삭제 및 수정을 할 수 없도록 합니다.';
$lang->about_update_log = '게시글을 수정할 경우 수정한 내역을 저장하도록 합니다.';
$lang->msg_not_enough_point = '포인트가 부족합니다';
$lang->write_comment = '댓글 쓰기';
$lang->msg_not_allow_comment = '해당 글의 댓글 쓰기가 잠겨있습니다.';
@ -52,4 +55,8 @@ $lang->msg_admin_comment_no_modify = '최고관리자의 댓글을 수정할 권
$lang->msg_board_delete_protect_comment = '댓글이 작성된 댓글의 글을 삭제할 수 없습니다.';
$lang->msg_board_update_protect_comment = '댓글이 작성된 댓글의 글을 수정할 수 없습니다.';
$lang->msg_protect_regdate_document = '%s일 이전의 게시글은 수정 또는 삭제 할 수 없습니다.';
$lang->msg_protect_regdate_comment = '%s일 이전의 댓글은 수정 또는 삭제 할 수 없습니다.';
$lang->msg_protect_regdate_comment = '%s일 이전의 댓글은 수정 또는 삭제 할 수 없습니다.';
$lang->msg_dont_have_update_log = '업데이트 로그가 기록되어 있지 않은 게시글입니다.';
$lang->original_letter = '원본글';
$lang->msg_warning_update_log = '<span class="x_label x_label-important">주의!</span> 사용시 디비가 많이 늘어날 수 있습니다.';
$lang->reason_update = '수정한 이유';

6
modules/board/lang/ru.php
View file

@ -7,8 +7,4 @@ $lang->cmd_module_config = 'Общие настройки форума';
$lang->cmd_board_info = 'Информация форума';
$lang->about_layout_setup = 'Вы можете вручную изменять лейаут код блога. Вставляйте или управляйте кодом виджетов везде, где хотите';
$lang->about_board_category = 'Вы можете сделать категории блога. Когда категория блога испорчена, попробуйте перепостроить файл кеша вручную.';
$lang->about_use_anonymous = '글쓴이의 정보를 없애고 익명으로 게시판 사용을 할 수 있게 합니다. 스킨설정에서 글쓴이 정보등을 보이지 않도록 하시면 더욱 유용합니다';
$lang->about_board = 'Этот модуль служит для создания и управления форумами.';
$lang->about_consultation = '상담 기능은 관리권한이 없는 회원은 자신이 쓴 글만 보이도록 하는 기능입니다. 단 상담기능 사용시 비회원 글쓰기는 자동으로 금지됩니다.';
$lang->about_admin_mail = '글이나 댓글이 등록될때 등록된 메일주소로 메일이 발송됩니다 ,(콤마)로 연결시 다수의 메일주소로 발송할 수 있습니다.';
$lang->about_list_config = '게시판의 목록형식 사용시 원하는 항목들로 배치를 할 수 있습니다. 단 스킨에서 지원하지 않는 경우 지원되지 않을 수 있습니다 대상항목/ 표시항목의 항목을 더블클릭하면 추가/ 제거가 됩니다.';
$lang->about_board = 'Этот модуль служит для создания и управления форумами.';

1
modules/board/lang/zh-CN.php
View file

@ -16,7 +16,6 @@ $lang->cmd_list_setting = '列表设置';
$lang->about_layout_setup = '可直接编辑博客布局代码。可以把控件代码插入到您喜欢的位置。';
$lang->about_board_category = '可以添加/删除分类项 分类有异常情况时，可以尝试重新生成缓冲文件。';
$lang->about_except_notice = '设置公告目录项不再重复显示到普通目录当中。';
$lang->about_use_anonymous = '글쓴이의 정보를 없애고 익명으로 게시판 사용을 할 수 있게 합니다. 스킨설정에서 글쓴이 정보등을 보이지 않도록 하시면 더욱 유용합니다';
$lang->about_board = '可生成及管理版面的模块。';
$lang->about_consultation = '咨询功能是指除有管理权限的会员以外，其他会员只能浏览自己发表的主题。使用咨询功能时系统将自动禁止非会员的发表主题权限。';
$lang->about_secret = '设置主题及评论当中使用密帖与否。';

2
modules/board/skins/default/write_form.html
View file

@ -10,7 +10,7 @@
{str_repeat("&nbsp;&nbsp;",$val->depth)} {$val->title} ({$val->document_count})
</option>
</select>
<input cond="$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" value="{htmlspecialchars($oDocument->getTitleText())}" />
<input cond="$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" value="{escape($oDocument->getTitleText(), false)}" />
<input cond="!$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" />
<input cond="$grant->manager" type="checkbox" name="is_notice" value="Y" class="iCheck" checked="checked"|cond="$oDocument->isNotice()" id="is_notice" />
<label cond="$grant->manager" for="is_notice">{$lang->notice}</label>

3
modules/board/skins/xedition/_read.html
View file

@ -114,7 +114,8 @@
<img cond="$oDocument->getProfileImage()" src="{$oDocument->getProfileImage()}" alt="Profile" class="pf" />
<div cond="$oDocument->getSignature()" class="tx">{$oDocument->getSignature()}</div>
</div>
<div class="btnArea">
<div class="btnArea">
<a cond="$update_view" class="btn" href="{getUrl('act','dispBoardUpdateLog','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-list-ul"></i>{$lang->update_log}</a>
<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardWrite','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-eraser"></i>{$lang->cmd_modify}</a>
<a cond="$oDocument->isEditable()" class="btn" href="{getUrl('act','dispBoardDelete','document_srl',$oDocument->document_srl,'comment_srl','')}"><i class="xi-trash"></i>{$lang->cmd_delete}</a>
<span class="etc">

13
modules/board/skins/xedition/board.default.css
View file

@ -263,6 +263,16 @@
right:0;
border-radius: 0 2px 2px 0;
}
.update-log {
width:100%;
border-bottom:1px solid #dbdbdb;
margin: 5px auto 5px auto;
padding:5px;
}
/* Board Write */
/* write_form.html */
@ -463,6 +473,9 @@
white-space: nowrap;
color : #666;
}
.update-log .read_header .meta {
border-bottom:0;
}
.read_header .meta > span { margin-left: 8px ;}
.read_header .meta > span:first-child {margin-left:0;}
.read_header .meta:after {

42
modules/board/skins/xedition/update_list.html Normal file
View file

@ -0,0 +1,42 @@
<include target="_header.html" />
<div class="board_list" id="board_list">
<table width="100%" border="1" cellspacing="0" summary="List of Articles">
<thead>
<tr>
<th scope="col" class="title"><span>{$lang->title}</span></th>
<th scope="col"><span>{$lang->writer}</span></th>
<th scope="col"><span>{$lang->last_updater}</span></th>
<th scope="col"><span>{$lang->last_post}</span></th>
</tr>
</thead>
<tbody cond="$updatelog->data">
<tr loop="$updatelog->data=>$val">
<td class="title">
<a href="{getUrl('', 'mid', $mid, 'act', 'dispBoardUpdateLogView', 'update_id', $val->update_id)}">{$val->title}</a>
</td>
<td class="author">
{$val->update_nick_name}
</td>
<td class="author">
{$val->nick_name}
</td>
<td class="time">
{zdate($val->regdate, 'Y.m.d H:i:s')}
</td>
</tr>
</tbody>
<tbody cond="!$updatelog->data">
<tr>
<td colspan="4" style="text-align: center">{$lang->msg_dont_have_update_log}</td>
</tr>
</tbody>
</table>
</div>
<div class="pagination pagination-centered">
<a href="{getUrl('page','','module_srl','')}" class="direction">&laquo; {$lang->first_page}</a>
<!--@while($page_no = $page_navigation->getNextPage())-->
<strong cond="$page==$page_no">{$page_no}</strong>
<a cond="$page!=$page_no" href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a>
<!--@end-->
<a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &raquo;</a>
</div>

29
modules/board/skins/xedition/update_view.html Normal file
View file

@ -0,0 +1,29 @@
<include target="_header.html" />
<div class="update-log">
<div class="board_read" >
<!-- READ HEADER -->
<div class="read_header">
<h1>
<a href="{getUrl('category',$update_log->category_srl, 'document_srl', '')}" class="category" cond="$module_info->use_category=='Y' && $update_log->category_srl">{$category_list[$update_log->category_srl]->title}</a>
<a>{$update_log->title}</a>
</h1>
<p class="meta">
<span class="time">
<i class="xi-time"></i> {zdate($update_log->regdate,'Y.m.d H:i:s')}
</span>
</p>
</div>
<!-- READ BODY -->
<div class="read_body">
{$update_log->content}
</div>
<p loop="$extra_vars=>$key=>$val">
{$key} : {$val}
</p>
<p>
{$lang->reason_update} :
{$update_log->reason_update}
</p>
<!-- /READ BODY -->
</div>
</div>

9
modules/board/skins/xedition/write_form.html
View file

@ -10,7 +10,7 @@
{str_repeat("&nbsp;&nbsp;",$val->depth)} {$val->title} ({$val->document_count})
</option>
</select>
<input cond="$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" value="{htmlspecialchars($oDocument->getTitleText())}" />
<input cond="$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" value="{escape($oDocument->getTitleText(), false)}" />
<input cond="!$oDocument->getTitleText()" type="text" name="title" class="iText" title="{$lang->title}" />
<input cond="$grant->manager" type="checkbox" name="is_notice" value="Y" class="iCheck" checked="checked"|cond="$oDocument->isNotice()" id="is_notice" />
<label cond="$grant->manager" for="is_notice">{$lang->notice}</label>
@ -43,6 +43,7 @@
<input type="checkbox" name="notify_message" class="iCheck" value="Y" checked="checked"|cond="$oDocument->useNotify()" id="notify_message" />
<label for="notify_message">{$lang->notify}</label>
</block>
<!--@if(is_array($status_list))-->
<!--@foreach($status_list AS $key=>$value)-->
<input type="radio" name="status" value="{$key}" id="{$key}" <!--@if($oDocument->get('status') == $key || ($key == 'PUBLIC' && !$document_srl))-->checked="checked"<!--@end--> />
@ -66,7 +67,11 @@
<span class="item">
<label for="tags" class="iLabel">{$lang->tag}: {$lang->about_tag}</label>
<input type="text" name="tags" id="tags" value="{htmlspecialchars($oDocument->get('tags'))}" class="iText" style="width:300px" title="Tag" />
</span>
</span>
<span class="item" cond="$oDocument->get('document_srl') && $module_info->update_log == 'Y'">
<label for="reason_update" class="iLabel">{$lang->reason_update}</label>
<input type="text" name="reason_update" id="reason_update" value="" class="iText" style="width:300px" title="reason update" />
</span>
</div>
<div class="btnArea">
<block cond="!$oDocument->isExists() || $oDocument->get('status') == 'TEMP'">

7
modules/board/tpl/board_insert.html
View file

@ -199,6 +199,13 @@
<label class="x_inline" for="consultation"><input type="checkbox" name="consultation" id="consultation" value="Y" checked="checked"|cond="$module_info->consultation == 'Y'" /> {$lang->about_consultation}</label>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->update_log}</label>
<div class="x_controls">
<label class="x_inline" for="update_log"><input type="checkbox" name="update_log" id="update_log" value="Y" checked="checked"|cond="$module_info->update_log == 'Y'" /> {$lang->about_update_log}</label>
<p>{$lang->msg_warning_update_log}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->protect_content}</label>
<div class="x_controls">

2
modules/comment/comment.admin.controller.php
View file

@ -267,7 +267,7 @@ class commentAdminController extends comment
{
$msgCode = 'success_deleted';
}
//$this->setMessage( sprintf(Context::getLang('msg_checked_comment_is_deleted'), $deleted_count) );
//$this->setMessage( sprintf(lang('msg_checked_comment_is_deleted'), $deleted_count) );
$this->setMessage($msgCode, 'info');
//set url params

6
modules/comment/comment.controller.php
View file

@ -207,7 +207,7 @@ class commentController extends comment
// if an user select message from options, message would be the option.
$message_option = strval(Context::get('message_option'));
$improper_comment_reasons = Context::getLang('improper_comment_reasons');
$improper_comment_reasons = lang('improper_comment_reasons');
$declare_message = ($message_option !== 'others' && isset($improper_comment_reasons[$message_option]))?
$improper_comment_reasons[$message_option] : trim(Context::get('declare_message'));
@ -594,7 +594,7 @@ class commentController extends comment
if(!$manual_inserted)
{
// send a message if notify_message option in enabled in the original article
$oDocument->notify(Context::getLang('comment'), $obj->content);
$oDocument->notify(lang('comment'), $obj->content);
// send a message if notify_message option in enabled in the original comment
if($obj->parent_srl)
@ -602,7 +602,7 @@ class commentController extends comment
$oParent = $oCommentModel->getComment($obj->parent_srl);
if($oParent->get('member_srl') != $oDocument->get('member_srl'))
{
$oParent->notify(Context::getLang('comment'), $obj->content);
$oParent->notify(lang('comment'), $obj->content);
}
}
}

6
modules/comment/comment.item.php
View file

@ -312,7 +312,7 @@ class commentItem extends Object
{
if($this->isSecret() && !$this->isAccessible())
{
return Context::getLang('msg_is_secret');
return lang('msg_is_secret');
}
$content = $this->get('content');
@ -333,7 +333,7 @@ class commentItem extends Object
{
if($this->isSecret() && !$this->isAccessible())
{
return Context::getLang('msg_is_secret');
return lang('msg_is_secret');
}
$content = $this->get('content');
@ -343,7 +343,7 @@ class commentItem extends Object
if($add_popup_menu && Context::get('is_logged'))
{
$content = sprintf(
'%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, Context::getLang('cmd_comment_do')
'%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>', $content, $this->comment_srl, lang('cmd_comment_do')
);
}

4
modules/comment/comment.model.php
View file

@ -77,7 +77,7 @@ class commentModel extends comment
ModuleHandler::triggerCall('comment.getCommentMenu', 'after', $menu_list);
if($this->grant->manager){
$str_confirm = Context::getLang('confirm_move');
$str_confirm = lang('confirm_move');
$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['comment_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('comment', 'procCommentAdminMoveToTrash', params)", $str_confirm, $comment_srl);
$oCommentController->addCommentPopupMenu($url,'cmd_trash','','javascript');
@ -106,7 +106,7 @@ class commentModel extends comment
for($i = 0; $i < $menus_count; $i++)
{
$menus[$i]->str = Context::getLang($menus[$i]->str);
$menus[$i]->str = lang($menus[$i]->str);
}
// get a list of final organized pop-up menus

377
modules/comment/lang/lang.xml
View file

@ -1,377 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<lang>
<item name="cmd_comment_do">
<value xml:lang="ko"><![CDATA[이 댓글을]]></value>
<value xml:lang="en"><![CDATA[I want to]]></value>
<value xml:lang="jp"><![CDATA[このコメントを…]]></value>
<value xml:lang="zh-CN"><![CDATA[将把此评论..]]></value>
<value xml:lang="zh-TW"><![CDATA[將此回覆..]]></value>
<value xml:lang="fr"><![CDATA[Vous voudriez]]></value>
<value xml:lang="ru"><![CDATA[Эту запись]]></value>
<value xml:lang="es"><![CDATA[Usted ]]></value>
<value xml:lang="tr"><![CDATA[Şunu yap]]></value>
<value xml:lang="vi"><![CDATA[Bình chọn / Phê bình]]></value>
</item>
<item name="comment_list">
<value xml:lang="ko"><![CDATA[댓글 목록]]></value>
<value xml:lang="en"><![CDATA[Comments List]]></value>
<value xml:lang="jp"><![CDATA[コメントリスト]]></value>
<value xml:lang="zh-CN"><![CDATA[评论列表]]></value>
<value xml:lang="zh-TW"><![CDATA[回覆列表]]></value>
<value xml:lang="fr"><![CDATA[Liste des Commentaires]]></value>
<value xml:lang="ru"><![CDATA[Список записей]]></value>
<value xml:lang="es"><![CDATA[Comentarios Lista]]></value>
<value xml:lang="tr"><![CDATA[Yorum Listesi]]></value>
<value xml:lang="vi"><![CDATA[Danh sách bình luận]]></value>
</item>
<item name="cmd_toggle_checked_comment">
<value xml:lang="ko"><![CDATA[선택항목 반전]]></value>
<value xml:lang="en"><![CDATA[Invert Selection]]></value>
<value xml:lang="jp"><![CDATA[選択項目の反転]]></value>
<value xml:lang="zh-CN"><![CDATA[反选]]></value>
<value xml:lang="zh-TW"><![CDATA[反向選擇]]></value>
<value xml:lang="fr"><![CDATA[Renverser les choisis]]></value>
<value xml:lang="ru"><![CDATA[Изменить выбранное]]></value>
</item>
<item name="cmd_delete_checked_comment">
<value xml:lang="ko"><![CDATA[선택항목 삭제]]></value>
<value xml:lang="en"><![CDATA[Delete selected item]]></value>
<value xml:lang="jp"><![CDATA[選択項目削除]]></value>
<value xml:lang="zh-CN"><![CDATA[删除所选]]></value>
<value xml:lang="zh-TW"><![CDATA[刪除所選]]></value>
<value xml:lang="fr"><![CDATA[Supprimer les choisis]]></value>
<value xml:lang="ru"><![CDATA[Удалить выбранное]]></value>
<value xml:lang="es"><![CDATA[Eliminar lo seleccionado]]></value>
<value xml:lang="tr"><![CDATA[Seçili parçayı sil]]></value>
<value xml:lang="vi"><![CDATA[Xóa những bình luận đã chọn]]></value>
</item>
<item name="trash">
<value xml:lang="ko"><![CDATA[휴지통]]></value>
<value xml:lang="en"><![CDATA[Recycle Bin]]></value>
<value xml:lang="jp"><![CDATA[ゴミ箱]]></value>
<value xml:lang="zh-TW"><![CDATA[回收桶]]></value>
</item>
<item name="cmd_trash">
<value xml:lang="ko"><![CDATA[휴지통으로 이동]]></value>
<value xml:lang="en"><![CDATA[Move to Recycle Bin]]></value>
<value xml:lang="jp"><![CDATA[ゴミ箱へ移動]]></value>
<value xml:lang="zh-TW"><![CDATA[移至回收桶]]></value>
</item>
<item name="comment_count">
<value xml:lang="ko"><![CDATA[댓글 수]]></value>
<value xml:lang="en"><![CDATA[Number of Comments]]></value>
<value xml:lang="jp"><![CDATA[コメント数]]></value>
<value xml:lang="zh-CN"><![CDATA[每页评论数]]></value>
<value xml:lang="zh-TW"><![CDATA[每頁回覆數]]></value>
<value xml:lang="fr"><![CDATA[Limite de Commentaires]]></value>
<value xml:lang="de"><![CDATA[Kommentare]]></value>
<value xml:lang="ru"><![CDATA[Количество ответов]]></value>
<value xml:lang="tr"><![CDATA[Yorum Sayısı]]></value>
<value xml:lang="vi"><![CDATA[Số bình luận]]></value>
<value xml:lang="mn"><![CDATA[Комментын тоо]]></value>
</item>
<item name="about_comment_count">
<value xml:lang="ko"><![CDATA[댓글을 정해진 수 만큼만 표시하고, 그 이상일 경우 페이지 번호를 표시해서 이동할 수 있게 합니다.]]></value>
<value xml:lang="en"><![CDATA[Display comments and if the number of them is over a specified number, move to the comment list.]]></value>
<value xml:lang="jp"><![CDATA[コメントを指定した数だけ表示し、それ以上はリスト化します。]]></value>
<value xml:lang="zh-CN"><![CDATA[可以指定要显示的每页评论数。]]></value>
<value xml:lang="zh-TW"><![CDATA[可以指定要顯示的每頁回覆數。]]></value>
<value xml:lang="fr"><![CDATA[Quand il y a plus de commentaires, ils seront bougés sur le liste.]]></value>
<value xml:lang="ru"><![CDATA[Отображается указанное количество ответов, после превышения этого количества производится переход к списку.]]></value>
<value xml:lang="tr"><![CDATA[Yorumları, kullanıcının girdiği rakam kadar gösterin. Eğer yorum sayısı belirlenen sayıyı aşarsa, yorum Liste'ye taşınır.]]></value>
<value xml:lang="vi"><![CDATA[Hiển thị số bình luận được gửi, và nó sẽ tạo một danh sách nếu có nhiều bình luận.]]></value>
</item>
<item name="msg_comment_voted_cancel_not">
<value xml:lang="ko"><![CDATA[추천수가 0이하일 경우 추천캔슬을 사용할 수 없습니다.]]></value>
</item>
<item name="msg_comment_blamed_cancel_not">
<value xml:lang="ko"><![CDATA[추천수가 0이하일 경우 비추천캔슬을 사용할 수 없습니다.]]></value>
</item>
<item name="msg_cart_is_null">
<value xml:lang="ko"><![CDATA[삭제할 글을 선택해주세요.]]></value>
<value xml:lang="en"><![CDATA[Please select an article to delete.]]></value>
<value xml:lang="jp"><![CDATA[削除するコメントを選択してください。]]></value>
<value xml:lang="zh-CN"><![CDATA[请选择要删除的评论。]]></value>
<value xml:lang="zh-TW"><![CDATA[請選擇要刪除的回覆。]]></value>
<value xml:lang="fr"><![CDATA[Choisissez un article à supprimer, S.V.P.]]></value>
<value xml:lang="ru"><![CDATA[Пожалуйста, выберите записи для удаления.]]></value>
<value xml:lang="es"><![CDATA[Selecciona el commentario que desea eliminar]]></value>
<value xml:lang="tr"><![CDATA[Lütfen silinecek makaleyi seçiniz]]></value>
<value xml:lang="vi"><![CDATA[Xin hãy chọn một bài viết để xóa.]]></value>
</item>
<item name="msg_checked_comment_is_deleted">
<value xml:lang="ko"><![CDATA[%d개의 댓글을 삭제했습니다.]]></value>
<value xml:lang="en"><![CDATA[%d comment(s) is(are) successfully deleted.]]></value>
<value xml:lang="jp"><![CDATA[%d個のコメントを削除しました。]]></value>
<value xml:lang="zh-CN"><![CDATA[已删除%d个评论。]]></value>
<value xml:lang="zh-TW"><![CDATA[已刪除 %d 個回覆。]]></value>
<value xml:lang="fr"><![CDATA[%d commentaire(s) est(sont) supprimé(s) avec succés.]]></value>
<value xml:lang="ru"><![CDATA[%d записьуспешно удалена]]></value>
<value xml:lang="es"><![CDATA[%d comentario eliminado correctamente.]]></value>
<value xml:lang="tr"><![CDATA[%d yorum başarıyla silindi.]]></value>
<value xml:lang="vi"><![CDATA[%d bình luận đã được xóa.]]></value>
</item>
<item name="search_target_list" type="array">
<item name="content">
<value xml:lang="ko"><![CDATA[내용]]></value>
<value xml:lang="en"><![CDATA[Content]]></value>
<value xml:lang="jp"><![CDATA[内容]]></value>
<value xml:lang="zh-CN"><![CDATA[内容]]></value>
<value xml:lang="zh-TW"><![CDATA[內容]]></value>
<value xml:lang="fr"><![CDATA[Contenu]]></value>
<value xml:lang="ru"><![CDATA[Содержание]]></value>
<value xml:lang="es"><![CDATA[Contenido]]></value>
<value xml:lang="tr"><![CDATA[İçerik]]></value>
<value xml:lang="vi"><![CDATA[Nội dung]]></value>
</item>
<item name="user_id">
<value xml:lang="ko"><![CDATA[아이디]]></value>
<value xml:lang="en"><![CDATA[ID]]></value>
<value xml:lang="jp"><![CDATA[ユーザID]]></value>
<value xml:lang="zh-CN"><![CDATA[I D]]></value>
<value xml:lang="zh-TW"><![CDATA[帳號]]></value>
<value xml:lang="fr"><![CDATA[Compte]]></value>
<value xml:lang="vi"><![CDATA[ID người gửi]]></value>
</item>
<item name="user_name">
<value xml:lang="ko"><![CDATA[이름]]></value>
<value xml:lang="en"><![CDATA[Name]]></value>
<value xml:lang="jp"><![CDATA[名前]]></value>
<value xml:lang="zh-CN"><![CDATA[姓名]]></value>
<value xml:lang="zh-TW"><![CDATA[姓名]]></value>
<value xml:lang="fr"><![CDATA[Nom]]></value>
<value xml:lang="ru"><![CDATA[Имя]]></value>
<value xml:lang="es"><![CDATA[Nombre]]></value>
<value xml:lang="tr"><![CDATA[İsim]]></value>
<value xml:lang="vi"><![CDATA[Tên]]></value>
</item>
<item name="nick_name">
<value xml:lang="ko"><![CDATA[닉네임]]></value>
<value xml:lang="en"><![CDATA[Nickname]]></value>
<value xml:lang="jp"><![CDATA[ニックネーム]]></value>
<value xml:lang="zh-CN"><![CDATA[昵称]]></value>
<value xml:lang="zh-TW"><![CDATA[暱稱]]></value>
<value xml:lang="fr"><![CDATA[Surnom]]></value>
<value xml:lang="ru"><![CDATA[Ник]]></value>
<value xml:lang="es"><![CDATA[Apodo]]></value>
<value xml:lang="tr"><![CDATA[Takma Ad]]></value>
</item>
<item name="member_srl">
<value xml:lang="ko"><![CDATA[회원 번호]]></value>
<value xml:lang="en"><![CDATA[Member Serial]]></value>
<value xml:lang="jp"><![CDATA[会員番号]]></value>
<value xml:lang="zh-CN"><![CDATA[会员编号]]></value>
<value xml:lang="zh-TW"><![CDATA[會員編號]]></value>
<value xml:lang="fr"><![CDATA[Numéro de Série du Membre]]></value>
<value xml:lang="ru"><![CDATA[Номер пользователя]]></value>
<value xml:lang="tr"><![CDATA[Üye Dizisi]]></value>
<value xml:lang="vi"><![CDATA[Mã số người gửi]]></value>
</item>
<item name="email_address">
<value xml:lang="ko"><![CDATA[이메일 주소]]></value>
<value xml:lang="en"><![CDATA[Email]]></value>
<value xml:lang="jp"><![CDATA[メールアドレス]]></value>
<value xml:lang="zh-CN"><![CDATA[电子信箱]]></value>
<value xml:lang="zh-TW"><![CDATA[電子信箱]]></value>
<value xml:lang="fr"><![CDATA[Mél]]></value>
<value xml:lang="ru"><![CDATA[Email адрес]]></value>
<value xml:lang="es"><![CDATA[Correo Electrónico]]></value>
<value xml:lang="tr"><![CDATA[E-posta]]></value>
</item>
<item name="homepage">
<value xml:lang="ko"><![CDATA[홈페이지]]></value>
<value xml:lang="en"><![CDATA[Homepage]]></value>
<value xml:lang="jp"><![CDATA[ホームページURL]]></value>
<value xml:lang="zh-CN"><![CDATA[主页]]></value>
<value xml:lang="zh-TW"><![CDATA[主頁]]></value>
<value xml:lang="fr"><![CDATA[Page d'Accueil]]></value>
<value xml:lang="ru"><![CDATA[Домашняя страница]]></value>
<value xml:lang="es"><![CDATA[Página web]]></value>
<value xml:lang="tr"><![CDATA[Anasayfa]]></value>
<value xml:lang="vi"><![CDATA[Trang chủ]]></value>
</item>
<item name="regdate">
<value xml:lang="ko"><![CDATA[등록일]]></value>
<value xml:lang="en"><![CDATA[Date]]></value>
<value xml:lang="jp"><![CDATA[登録日]]></value>
<value xml:lang="zh-CN"><![CDATA[日期]]></value>
<value xml:lang="zh-TW"><![CDATA[日期]]></value>
<value xml:lang="fr"><![CDATA[Jour]]></value>
<value xml:lang="ru"><![CDATA[Дата регистрации]]></value>
<value xml:lang="es"><![CDATA[Fecha del registro]]></value>
<value xml:lang="tr"><![CDATA[Tarih]]></value>
<value xml:lang="vi"><![CDATA[Ngày]]></value>
</item>
<item name="last_update">
<value xml:lang="ko"><![CDATA[최근수정일 ]]></value>
<value xml:lang="en"><![CDATA[Last update]]></value>
<value xml:lang="jp"><![CDATA[最終更新日 ]]></value>
<value xml:lang="zh-CN"><![CDATA[最后更新 ]]></value>
<value xml:lang="zh-TW"><![CDATA[最後更新]]></value>
<value xml:lang="fr"><![CDATA[Mise à Jour]]></value>
<value xml:lang="ru"><![CDATA[Дата последнего обновления]]></value>
<value xml:lang="es"><![CDATA[Ultima actualización]]></value>
<value xml:lang="tr"><![CDATA[Son Güncelleştirme]]></value>
<value xml:lang="vi"><![CDATA[Cập nhật lần cuối]]></value>
</item>
<item name="ipaddress">
<value xml:lang="ko"><![CDATA[IP 주소]]></value>
<value xml:lang="en"><![CDATA[IP Address]]></value>
<value xml:lang="jp"><![CDATA[IPアドレス]]></value>
<value xml:lang="zh-CN"><![CDATA[IP 地址]]></value>
<value xml:lang="zh-TW"><![CDATA[IP 位址]]></value>
<value xml:lang="fr"><![CDATA[Adresse IP]]></value>
<value xml:lang="ru"><![CDATA[IP-адрес]]></value>
<value xml:lang="es"><![CDATA[Dirección IP]]></value>
<value xml:lang="tr"><![CDATA[IP Adresi]]></value>
<value xml:lang="vi"><![CDATA[IP]]></value>
</item>
<item name="is_secret">
<value xml:lang="ko"><![CDATA[상태]]></value>
<value xml:lang="en"><![CDATA[Status]]></value>
<value xml:lang="jp"><![CDATA[状態]]></value>
<value xml:lang="zh-TW"><![CDATA[狀態]]></value>
</item>
</item>
<item name="no_text_comment">
<value xml:lang="ko"><![CDATA[글자가 없는 댓글입니다.]]></value>
<value xml:lang="en"><![CDATA[No text in this comment.]]></value>
<value xml:lang="jp"><![CDATA[テキストがないコメントです。]]></value>
<value xml:lang="zh-TW"><![CDATA[此回覆無內容。]]></value>
<value xml:lang="tr"><![CDATA[Bu yorumda herhangi bir metin yok.]]></value>
</item>
<item name="secret_name_list" type="array">
<item name="Y">
<value xml:lang="ko"><![CDATA[비밀]]></value>
<value xml:lang="en"><![CDATA[Secret]]></value>
<value xml:lang="jp"><![CDATA[非公開]]></value>
<value xml:lang="zh-TW"><![CDATA[秘密]]></value>
</item>
<item name="N">
<value xml:lang="ko"><![CDATA[공개]]></value>
<value xml:lang="en"><![CDATA[Public]]></value>
<value xml:lang="jp"><![CDATA[公開]]></value>
<value xml:lang="zh-TW"><![CDATA[公開]]></value>
</item>
</item>
<item name="published_name_list" type="array">
<item name="Y">
<value xml:lang="en"><![CDATA[Published]]></value>
<value xml:lang="ko"><![CDATA[발행완료]]></value>
<value xml:lang="jp"><![CDATA[発行完了]]></value>
</item>
<item name="N">
<value xml:lang="en"><![CDATA[Unpublished]]></value>
<value xml:lang="ko"><![CDATA[발행대기]]></value>
<value xml:lang="jp"><![CDATA[発行待機]]></value>
</item>
</item>
<item name="comment_manager">
<value xml:lang="ko"><![CDATA[선택한 댓글 관리]]></value>
<value xml:lang="en"><![CDATA[Manage Selected Comment]]></value>
<value xml:lang="jp"><![CDATA[選択したコメントを管理]]></value>
<value xml:lang="zh-TW"><![CDATA[管理所選回覆]]></value>
</item>
<item name="selected_comment">
<value xml:lang="ko"><![CDATA[선택한 댓글]]></value>
<value xml:lang="en"><![CDATA[Selected Comment]]></value>
<value xml:lang="jp"><![CDATA[選択したコメント]]></value>
<value xml:lang="zh-TW"><![CDATA[已選回覆]]></value>
</item>
<item name="cmd_comment_validation">
<value xml:lang="ko"><![CDATA[승인 후 공개]]></value>
<value xml:lang="en"><![CDATA[Use comment validation]]></value>
<value xml:lang="jp"><![CDATA[承認後公開]]></value>
</item>
<item name="about_comment_validation">
<value xml:lang="ko"><![CDATA[관리자 승인 후 댓글을 공개합니다.]]></value>
<value xml:lang="en"><![CDATA[If you want to use comment validation before displaying on your module frontend select USE, otherwise select NOT USE.]]></value>
<value xml:lang="jp"><![CDATA[管理者承認後コメントを公開します。]]></value>
</item>
<item name="published">
<value xml:lang="en"><![CDATA[Publish status]]></value>
<value xml:lang="ko"><![CDATA[발행 상태]]></value>
<value xml:lang="jp"><![CDATA[発行状態]]></value>
</item>
<item name="cmd_publish">
<value xml:lang="en"><![CDATA[Publish]]></value>
<value xml:lang="ko"><![CDATA[발행]]></value>
<value xml:lang="jp"><![CDATA[発行]]></value>
</item>
<item name="cmd_unpublish">
<value xml:lang="en"><![CDATA[Unpublish]]></value>
<value xml:lang="ko"><![CDATA[발행 중지]]></value>
<value xml:lang="jp"><![CDATA[発行中止]]></value>
</item>
<item name="select_module">
<value xml:lang="ko"><![CDATA[모듈 선택]]></value>
<value xml:lang="en"><![CDATA[Select Module]]></value>
<value xml:lang="jp"><![CDATA[モジュール選択]]></value>
</item>
<item name="page">
<value xml:lang="ko"><![CDATA[페이지]]></value>
<value xml:lang="en"><![CDATA[Page]]></value>
<value xml:lang="jp"><![CDATA[ページ]]></value>
</item>
<item name="msg_not_selected_comment">
<value xml:lang="ko"><![CDATA[선택한 댓글이 없습니다.]]></value>
<value xml:lang="en"><![CDATA[There are no selected comment.]]></value>
<value xml:lang="jp"><![CDATA[選択したコメントがありません。]]></value>
</item>
<item name="msg_admin_comment_no_delete">
<value xml:lang="ko"><![CDATA[최고관리자의 댓글을 삭제 할 수 없습니다.]]></value>
</item>
<item name="msg_admin_c_comment_no_delete">
<value xml:lang="ko"><![CDATA[이 댓글에 최고관리자의 댓글이 있어 삭제할 수 없습니다.]]></value>
</item>
<item name="improper_comment_declare">
<value xml:lang="ko"><![CDATA[불량 댓글 신고]]></value>
<value xml:lang="en"><![CDATA[Report an improper comment]]></value>
</item>
<item name="declaring_user">
<value xml:lang="ko"><![CDATA[신고자]]></value>
<value xml:lang="en"><![CDATA[Reporter]]></value>
</item>
<item name="improper_comment_declare_reason">
<value xml:lang="ko"><![CDATA[신고 이유]]></value>
<value xml:lang="en"><![CDATA[Reason]]></value>
</item>
<item name="improper_comment_reasons" type="array">
<item name="advertisement">
<value xml:lang="ko"><![CDATA[본문 주제나 흐름에 맞지 않는 광고 글입니다.]]></value>
<value xml:lang="en"><![CDATA[Advertisements that do not fit the topics or themes.]]></value>
</item>
<item name="theme">
<value xml:lang="ko"><![CDATA[주제에 맞지 않는 글입니다.]]></value>
<value xml:lang="en"><![CDATA[Comments that do not fit the topics or themes.]]></value>
</item>
<item name="bad_word">
<value xml:lang="ko"><![CDATA[과도한 욕설을 담고 있습니다.]]></value>
<value xml:lang="en"><![CDATA[Too much bad words.]]></value>
</item>
<item name="violence">
<value xml:lang="ko"><![CDATA[폭력적인 내용을 담고 있습니다.]]></value>
<value xml:lang="en"><![CDATA[Violence.]]></value>
</item>
<item name="racism">
<value xml:lang="ko"><![CDATA[인종차별적인 내용을 담고 있습니다.]]></value>
<value xml:lang="en"><![CDATA[Racism.]]></value>
</item>
<item name="pornography">
<value xml:lang="ko"><![CDATA[음란물을 포함하고 있습니다.]]></value>
<value xml:lang="en"><![CDATA[Pornography.]]></value>
</item>
<item name="privacy">
<value xml:lang="ko"><![CDATA[민감한 개인정보가 노출 되어있습니다.]]></value>
<value xml:lang="en"><![CDATA[Privacy issue.]]></value>
</item>
<item name="others">
<value xml:lang="ko"><![CDATA[기타(직접작성)]]></value>
<value xml:lang="en"><![CDATA[Others (Write your own)]]></value>
</item>
</item>
<item name="about_improper_comment_declare">
<value xml:lang="ko"><![CDATA[댓글을 신고하신 이유를 간단히 적어서 제출해주시면 관리자 검토 후 조치하겠습니다.]]></value>
<value xml:lang="en"><![CDATA[Write here why you report this comment as an improper thing.]]></value>
</item>
</lang>

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>

15
modules/document/document.admin.controller.php
View file

@ -41,7 +41,7 @@ class documentAdminController extends document
$oDocumentController->deleteDocument($document_srl, true);
}
$this->setMessage(sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count) );
$this->setMessage(sprintf(lang('msg_checked_document_is_deleted'), $document_count) );
}
/**
@ -145,11 +145,20 @@ class documentAdminController extends document
$obj->module_srl = $module_srl;
$obj->category_srl = $category_srl;
$output = executeQuery('document.updateDocumentModule', $obj);
if(!$output->toBool()) {
if(!$output->toBool())
{
$oDB->rollback();
return $output;
}
else
{
$update_output = $oDocumentController->insertDocumentUpdateLog($obj);
if(!$update_output->toBool())
{
$oDB->rollback();
return $update_output;
}
}
//Move a module of the extra vars
$output = executeQuery('document.moveDocumentExtraVars', $obj);
if(!$output->toBool()) {

2
modules/document/document.admin.view.php
View file

@ -68,7 +68,7 @@ class documentAdminView extends document
$count_search_option = count($this->search_option);
for($i=0;$i<$count_search_option;$i++)
{
$search_option[$this->search_option[$i]] = Context::getLang($this->search_option[$i]);
$search_option[$this->search_option[$i]] = lang($this->search_option[$i]);
}
Context::set('search_option', $search_option);

92
modules/document/document.controller.php
View file

@ -205,7 +205,7 @@ class documentController extends document
// if an user select message from options, message would be the option.
$message_option = strval(Context::get('message_option'));
$improper_document_reasons = Context::getLang('improper_document_reasons');
$improper_document_reasons = lang('improper_document_reasons');
$declare_message = ($message_option !== 'others' && isset($improper_document_reasons[$message_option]))?
$improper_document_reasons[$message_option] : trim(Context::get('declare_message'));
@ -439,6 +439,7 @@ class documentController extends document
return $output;
}
// Insert extra variables if the document successfully inserted.
$extra_vars = array();
$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
if(count($extra_keys))
{
@ -449,13 +450,20 @@ class documentController extends document
{
$tmp = $obj->{'extra_vars'.$idx};
if(is_array($tmp))
{
$value = implode('|@|', $tmp);
}
else
{
$value = trim($tmp);
}
}
else if(isset($obj->{$extra_item->name}))
{
$value = trim($obj->{$extra_item->name});
}
else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
if($value == NULL) continue;
$extra_vars[$extra_item->name] = $value;
$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
}
}
@ -464,6 +472,16 @@ class documentController extends document
// Call a trigger (after)
if($output->toBool())
{
if($obj->update_log_setting === 'Y')
{
$obj->extra_vars = serialize($extra_vars);
$update_output = $this->insertDocumentUpdateLog($obj);
if(!$update_output->toBool())
{
$oDB->rollback();
return $update_output;
}
}
$trigger_output = ModuleHandler::triggerCall('document.insertDocument', 'after', $obj);
if(!$trigger_output->toBool())
{
@ -686,7 +704,9 @@ class documentController extends document
$oDB->rollback();
return $output;
}
// Remove all extra variables
$extra_vars = array();
if(Context::get('act')!='procFileDelete')
{
$this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType());
@ -707,6 +727,7 @@ class documentController extends document
}
else if(isset($obj->{$extra_item->name})) $value = trim($obj->{$extra_item->name});
if($value == NULL) continue;
$extra_vars[$extra_item->name] = $value;
$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
}
}
@ -723,6 +744,16 @@ class documentController extends document
// Call a trigger (after)
if($output->toBool())
{
if($obj->update_log_setting === 'Y')
{
$obj->extra_vars = serialize($extra_vars);
$update_output = $this->insertDocumentUpdateLog($obj, $source_obj);
if(!$update_output->toBool())
{
$oDB->rollback();
return $update_output;
}
}
$trigger_output = ModuleHandler::triggerCall('document.updateDocument', 'after', $obj);
if(!$trigger_output->toBool())
{
@ -749,6 +780,45 @@ class documentController extends document
return $output;
}
function insertDocumentUpdateLog($obj, $source_obj = null)
{
$update_args = new stdClass();
$logged_info = Context::get('logged_info');
if($source_obj === null)
{
$update_args->category_srl = $obj->category_srl;
$update_args->module_srl = $obj->module_srl;
$update_args->nick_name = $obj->nick_name;
}
else
{
if($obj->category_srl)
{
$update_args->category_srl = $obj->category_srl;
}
else
{
$update_args->category_srl = $source_obj->get('category_srl');
}
$update_args->module_srl = $source_obj->get('module_srl');
$update_args->nick_name = $source_obj->get('nick_name');
}
$update_args->document_srl = $obj->document_srl;
$update_args->update_member_srl = $logged_info->member_srl;
$update_args->title = $obj->title;
$update_args->title_bold = $obj->title_bold;
$update_args->title_color = $obj->title_color;
$update_args->content = $obj->content;
$update_args->update_nick_name = $logged_info->nick_name;
$update_args->tags = $obj->tags;
$update_args->extra_vars = $obj->extra_vars;
$update_args->reason_update = $obj->reason_update;
$update_output = executeQuery('document.insertDocumentUpdateLog', $update_args);
return $update_output;
}
/**
* Deleting Documents
* @param int $document_srl
@ -832,6 +902,7 @@ class documentController extends document
$this->_deleteDeclaredDocuments($args);
$this->_deleteDocumentReadedLog($args);
$this->_deleteDocumentVotedLog($args);
$this->_deleteDocumentUpdateLog($args);
// Remove the thumbnail file
FileHandler::removeDir(sprintf('files/thumbnails/%s',getNumberingPath($document_srl, 3)));
@ -881,6 +952,11 @@ class documentController extends document
executeQuery('document.deleteDocumentVotedLog', $documentSrls);
}
function _deleteDocumentUpdateLog($document_srl)
{
executeQuery('document.deleteDocumentUpdateLog', $document_srl);
}
/**
* Move the doc into the trash
* @param object $obj
@ -1738,9 +1814,9 @@ class documentController extends document
$prev_category = $val;
}
// Return if the previous category doesn't exist
if(!$prev_category) return new Object(-1,Context::getLang('msg_category_not_moved'));
if(!$prev_category) return new Object(-1,lang('msg_category_not_moved'));
// Return if the selected category is the top level
if($category_srl_list[0]==$category_srl) return new Object(-1,Context::getLang('msg_category_not_moved'));
if($category_srl_list[0]==$category_srl) return new Object(-1,lang('msg_category_not_moved'));
// Information of the selected category
$cur_args = new stdClass;
$cur_args->category_srl = $category_srl;
@ -1784,7 +1860,7 @@ class documentController extends document
}
$next_category_srl = $category_srl_list[$i+1];
if(!$category_list[$next_category_srl]) return new Object(-1,Context::getLang('msg_category_not_moved'));
if(!$category_list[$next_category_srl]) return new Object(-1,lang('msg_category_not_moved'));
$next_category = $category_list[$next_category_srl];
// Information of the selected category
$cur_args = new stdClass;
@ -2453,10 +2529,10 @@ class documentController extends document
{
$logged_info = Context::get('logged_info');
$message_content = '';
$default_message_verbs = Context::getLang('default_message_verbs');
$default_message_verbs = lang('default_message_verbs');
if(isset($default_message_verbs[$type]) && is_string($default_message_verbs[$type]))
{
$message_content = sprintf(Context::getLang('default_message_format'), $logged_info->nick_name, $default_message_verbs[$type]);
$message_content = sprintf(lang('default_message_format'), $logged_info->nick_name, $default_message_verbs[$type]);
}
}
else

6
modules/document/document.item.php
View file

@ -411,7 +411,7 @@ class documentItem extends Object
{
if(!$this->document_srl) return;
if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return lang('msg_is_secret');
$result = $this->_checkAccessibleFromStatus();
if($result && Context::getSessionStatus())
@ -475,7 +475,7 @@ class documentItem extends Object
{
if(!$this->document_srl) return;
if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return lang('msg_is_secret');
$result = $this->_checkAccessibleFromStatus();
if($result && Context::getSessionStatus())
@ -498,7 +498,7 @@ class documentItem extends Object
$content = sprintf(
'%s<div class="document_popup_menu"><a href="#popup_menu_area" class="document_%d" onclick="return false">%s</a></div>',
$content,
$this->document_srl, Context::getLang('cmd_document_do')
$this->document_srl, lang('cmd_document_do')
);
}
// If additional content information is set

23
modules/document/document.model.php
View file

@ -528,7 +528,7 @@ class documentModel extends document
ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
if($this->grant->manager)
{
$str_confirm = Context::getLang('confirm_move');
$str_confirm = lang('confirm_move');
$url = sprintf("if(!confirm('%s')) return; var params = new Array(); params['document_srl']='%s'; params['mid']=current_mid;params['cur_url']=current_url; exec_xml('document', 'procDocumentAdminMoveToTrash', params)", $str_confirm, $document_srl);
$oDocumentController->addDocumentPopupMenu($url,'cmd_trash','','javascript');
}
@ -554,7 +554,7 @@ class documentModel extends document
$menus_count = count($menus);
for($i=0;$i<$menus_count;$i++)
{
$menus[$i]->str = Context::getLang($menus[$i]->str);
$menus[$i]->str = lang($menus[$i]->str);
}
// Wanted to finally clean pop-up menu list
$this->add('menus', $menus);
@ -1548,6 +1548,25 @@ class documentModel extends document
return $document_list;
}
function getDocumentUpdateLog($document_srl)
{
$args = new stdClass();
$args->document_srl = $document_srl;
$output = executeQueryArray('document.getDocumentUpdateLog', $args);
return $output;
}
function getUpdateLog($update_id)
{
$args = new stdClass();
$args->update_id = $update_id;
$output = exeCuteQuery('document.getUpdateLog', $args);
$updage_log = $output->data;
return $updage_log;
}
}
/* End of file document.model.php */
/* Location: ./modules/document/document.model.php */

4
modules/document/lang/es.php
View file

@ -1,6 +1,5 @@
<?php
$lang->document_list = 'Document list';
$lang->new_document_count = '새글';
$lang->parent_category_title = 'Categoría Superior';
$lang->category_title = 'Nombre de la categoría';
$lang->expand = 'Expandir';
@ -9,8 +8,6 @@ $lang->cmd_make_child = 'Agregar sub categoría';
$lang->cmd_enable_move_category = 'Cambiar la posición de la categoría. (arrastrar y soltar luego de haber selecionado)';
$lang->about_category_title = 'Ingresar el nombre de la categoría.';
$lang->about_expand = 'Si seleccionas esta opción, siempre estará expandido.';
$lang->about_category_group_srls = '선택한 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
$lang->about_category_color = '분류 폰트색깔을 지정합니다.';
$lang->cmd_search_next = 'Buscar siguiente';
$lang->cmd_temp_save = 'Guardar Temporales';
$lang->cmd_toggle_checked_document = 'Invertir los elementos seleccionados';
@ -40,5 +37,4 @@ $lang->search_target_list['uploaded_count'] = 'Número de archivos adjuntos (sob
$lang->search_target_list['regdate'] = 'Día del registro';
$lang->search_target_list['last_update'] = 'Día de la última actualización';
$lang->search_target_list['ipaddress'] = 'Dirección IP';
$lang->about_use_history = '히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.';
$lang->trash_nick_name = 'Person who deleted';

2
modules/document/lang/fr.php
View file

@ -6,7 +6,6 @@ $lang->thumbnail_ratio = 'Proportion';
$lang->cmd_delete_all_thumbnail = 'Supprimer toutes les vignettes';
$lang->title_bold = 'Gras';
$lang->title_color = 'Couleur';
$lang->new_document_count = '새글';
$lang->parent_category_title = 'catégorie supérieure';
$lang->category_title = 'Catégorie';
$lang->expand = 'Etendre';
@ -44,5 +43,4 @@ $lang->search_target_list['uploaded_count'] = 'Fichiers Attachés (surplus)';
$lang->search_target_list['regdate'] = 'Enrégistré';
$lang->search_target_list['last_update'] = 'La Dernière Mise à Jour';
$lang->search_target_list['ipaddress'] = 'Adresse IP';
$lang->about_use_history = '히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.';
$lang->trash_nick_name = 'Person who deleted';

1
modules/document/lang/ru.php
View file

@ -16,7 +16,6 @@ $lang->cmd_enable_move_category = 'Изменить местоположение
$lang->about_category_title = 'Введите название категории';
$lang->about_expand = 'Если эта опция выбрана, расширение будут применено всегда';
$lang->about_category_group_srls = 'Только выбранные группы можно отнести к этой категории';
$lang->about_category_color = '분류 폰트색깔을 지정합니다.';
$lang->cmd_search_next = 'Искать дальше';
$lang->cmd_temp_save = 'Сохранить временно';
$lang->cmd_toggle_checked_document = 'Перевернуть выбранные объекты';

8
modules/document/queries/deleteDocumentUpdateLog.xml Normal file
View file

@ -0,0 +1,8 @@
<query id="deleteDocumentUpdateLog" action="delete">
<tables>
<table name="document_update_log" />
</tables>
<conditions>
<condition operation="in" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
</conditions>
</query>

22
modules/document/queries/getDocumentUpdateLog.xml Normal file
View file

@ -0,0 +1,22 @@
<query id="getDocumentUpdateLog" action="select">
<tables>
<table name="document_update_log" />
</tables>
<columns>
<column name="nick_name" />
<column name="update_nick_name" />
<column name="regdate" />
<column name="title" />
<column name="module_srl" />
<column name="update_id" />
</columns>
<conditions>
<condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
</conditions>
<navigation>
<index var="sort_index" default="update_id" order="desc" />
<list_count var="list_count" default="20" />
<page_count var="page_count" default="10" />
<page var="page" default="1" />
</navigation>
</query>

11
modules/document/queries/getUpdateLog.xml Normal file
View file

@ -0,0 +1,11 @@
<query id="getUpdateLog" action="select">
<tables>
<table name="document_update_log" />
</tables>
<columns>
<column name="*" />
</columns>
<conditions>
<condition operation="equal" column="update_id" var="update_id" filter="number" notnull="notnull" />
</conditions>
</query>

22
modules/document/queries/insertDocumentUpdateLog.xml Normal file
View file

@ -0,0 +1,22 @@
<query id="insertDocumentUpdateLog" action="insert">
<tables>
<table name="document_update_log" />
</tables>
<columns>
<column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
<column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
<column name="update_member_srl" var="update_member_srl" filter="number" />
<column name="category_srl" var="category_srl" filter="number" />
<column name="ipaddress" var="ipaddress" default="ipaddress()" />
<column name="nick_name" var="nick_name" notnull="notnull" />
<column name="title" var="title" notnull="notnull" />
<column name="title_bold" var="title_bold" />
<column name="title_color" var="title_color" />
<column name="content" var="content" notnull="notnull" />
<column name="update_nick_name" var="update_nick_name" notnull="notnull" />
<column name="tags" var="tags" />
<column name="extra_vars" var="extra_vars" />
<column name="reason_update" var="reason_update" />
<column name="regdate" var="regdate" default="curdate()" />
</columns>
</query>

18
modules/document/schemas/document_update_log.xml Normal file
View file

@ -0,0 +1,18 @@
<table name="document_update_log">
<column name="update_id" type="number" size="11" notnull="notnull" auto_increment="auto_increment" primary_key="primary_key" />
<column name="document_srl" type="number" size="11" notnull="notnull" index="idx_document_srl" />
<column name="update_member_srl" type="number" size="11" notnull="notnull" />
<column name="module_srl" type="number" size="11" notnull="notnull" />
<column name="category_srl" type="number" size="11" />
<column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
<column name="nick_name" type="varchar" size="80" notnull="notnull" />
<column name="regdate" type="date" index="idx_regdate" />
<column name="title" type="varchar" size="250" />
<column name="title_bold" type="char" size="1" default="N" notnull="notnull" />
<column name="title_color" type="varchar" size="7" />
<column name="content" type="bigtext" notnull="notnull" />
<column name="update_nick_name" type="varchar" size="80" />
<column name="tags" type="text" />
<column name="extra_vars" type="text" />
<column name="reason_update" type="text" />
</table>

4
modules/editor/editor.controller.php
View file

@ -47,13 +47,13 @@ class editorController extends editor
{
$component = Context::get('component');
$method = Context::get('method');
if(!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
if(!$component) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
$oEditorModel = getModel('editor');
$oComponent = &$oEditorModel->getComponentObject($component);
if(!$oComponent->toBool()) return $oComponent;
if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
//$output = call_user_method($method, $oComponent);
//$output = call_user_func(array($oComponent, $method));

4
modules/editor/editor.model.php
View file

@ -547,11 +547,11 @@ class editorModel extends editor
// Create an object of the component and execute
$class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
$class_file = sprintf('%s%s.class.php', $class_path, $component);
if(!file_exists($class_file)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
if(!file_exists($class_file)) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
// Create an object after loading the class file
require_once($class_file);
$oComponent = new $component($editor_sequence, $class_path);
if(!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
if(!$oComponent) return new Object(-1, sprintf(lang('msg_component_is_not_founded'), $component));
// Add configuration information
$component_info = $this->getComponent($component, $site_srl);
$oComponent->setInfo($component_info);

2
modules/editor/editor.view.php
View file

@ -33,7 +33,7 @@ class editorView extends editor
$oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
if(!$oComponent->toBool())
{
Context::set('message', sprintf(Context::getLang('msg_component_is_not_founded'), $component));
Context::set('message', sprintf(lang('msg_component_is_not_founded'), $component));
$this->setTemplatePath($this->module_path.'tpl');
$this->setTemplateFile('component_not_founded');
}

1
modules/editor/lang/en.php
View file

@ -1,5 +1,4 @@
<?php
$lang->editor_now = '현재 설정 상태';
$lang->editor_component = 'Editor Component';
$lang->main_editor = 'Main editor';
$lang->comment_editor = 'Comment editor';

16
modules/editor/lang/es.php
View file

@ -10,7 +10,6 @@ $lang->component_description = 'Descripción';
$lang->component_extra_vars = 'Varibles Extras';
$lang->component_grant = 'Ajuste de las atribuciones';
$lang->about_component = 'Presentación del componente';
$lang->about_component_mid = '에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.(모두 해제시 모든 대상에서 사용 가능합니다)';
$lang->msg_component_is_not_founded = 'No se puede encontrar el componente del editor %s';
$lang->msg_component_is_inserted = 'El componente seleccionado ya esta insertado';
$lang->msg_component_is_first_order = 'El componente seleccionado se localiza en la primera posición';
@ -28,8 +27,6 @@ $lang->enable_html_grant = 'La autorización de uso de HTML';
$lang->enable_autosave = 'Utilice función de guardado automático,';
$lang->height_resizable = 'Altura cambiar de tamaño';
$lang->editor_height = 'Altura de Editor';
$lang->about_content_font = '콤마(,)로 여러 폰트를 지정할 수 있습니다.';
$lang->about_content_font_size = '12px, 1em등 단위까지 포함해서 입력해주세요.';
$lang->about_enable_autosave = 'Usted puede permitir que la función de guardado automático, en tanto que función de la redacción de artículos';
$lang->edit['fontname'] = 'Fuente';
$lang->edit['fontsize'] = 'Tamaño';
@ -68,17 +65,4 @@ $lang->edit['icon_align_left'] = 'Margen izquierdo';
$lang->edit['icon_align_middle'] = 'Margen central';
$lang->edit['icon_align_right'] = 'Margen derecho';
$lang->edit['lineheight'] = 'Line Height';
$lang->edit['target_blank'] = '새창으로';
$lang->edit['add_one_row'] = '1행추가';
$lang->edit['del_one_row'] = '1행삭제';
$lang->edit['add_one_col'] = '1열추가';
$lang->edit['del_one_col'] = '1열삭제';
$lang->edit['search_color'] = '색상찾기';
$lang->edit['circle_bracket'] = '원,괄호';
$lang->edit['replace_all'] = '모두바꾸기';
$lang->edit['search_words'] = '찾을단어';
$lang->edit['replace_words'] = '바꿀단어';
$lang->edit['next_search_words'] = '다음찾기';
$lang->edit['materials'] = '글감보관함';
$lang->edit['temporary_savings'] = '임시저장목록';
$lang->about_dblclick_in_editor = 'Para la configuracion más detallada debera hacer dobleclick sobre el texto, imagen, fondo, etc.';

15
modules/editor/lang/fr.php
View file

@ -27,8 +27,6 @@ $lang->enable_html_grant = 'Permission d\'utiliser HTML';
$lang->enable_autosave = 'Valider à conserver automatiquement';
$lang->height_resizable = 'Permettre de remettre l\'hauteur';
$lang->editor_height = 'Hauteur de l\'Editeur';
$lang->about_content_font = '콤마(,)로 여러 폰트를 지정할 수 있습니다.';
$lang->about_content_font_size = '12px, 1em등 단위까지 포함해서 입력해주세요.';
$lang->about_enable_autosave = 'Vous pouvez valider la fonction à Conserver Automatiquement pendant écrire des articles.';
$lang->edit['fontname'] = 'Police de caractères';
$lang->edit['fontsize'] = 'Mesure';
@ -69,17 +67,4 @@ $lang->edit['icon_align_left'] = 'Placer à gauche du texte';
$lang->edit['icon_align_middle'] = 'Placer au centre';
$lang->edit['icon_align_right'] = 'Placer à droite du texte';
$lang->edit['lineheight'] = 'Line Height';
$lang->edit['target_blank'] = '새창으로';
$lang->edit['add_one_row'] = '1행추가';
$lang->edit['del_one_row'] = '1행삭제';
$lang->edit['add_one_col'] = '1열추가';
$lang->edit['del_one_col'] = '1열삭제';
$lang->edit['search_color'] = '색상찾기';
$lang->edit['circle_bracket'] = '원,괄호';
$lang->edit['replace_all'] = '모두바꾸기';
$lang->edit['search_words'] = '찾을단어';
$lang->edit['replace_words'] = '바꿀단어';
$lang->edit['next_search_words'] = '다음찾기';
$lang->edit['materials'] = '글감보관함';
$lang->edit['temporary_savings'] = '임시저장목록';
$lang->about_dblclick_in_editor = 'Vous pouvez configurer en détail des composants par double-clic sur un arrière-plan, un texte, une image ou une citation';

12
modules/editor/lang/ru.php
View file

@ -1,16 +1,4 @@
<?php
$lang->editor_now = '현재 설정 상태';
$lang->editor_component = 'Editor Component';
$lang->main_editor = 'Main editor';
$lang->comment_editor = 'Comment editor';
$lang->editor_option = 'Editor Option';
$lang->guide_choose_main_editor = 'Main editor.';
$lang->guide_set_height_main_editor = 'Height of the main editor.';
$lang->guide_choose_comment_editor = 'Comment editor.';
$lang->guide_set_height_comment_editor = 'Height of the comment editor.';
$lang->guide_choose_text_formatting = 'Text formatting.';
$lang->guide_choose_font_body = 'Font body.';
$lang->guide_choose_font_size_body = 'Font size body.';
$lang->editor = 'WYSIWYG-Редактор';
$lang->component_name = 'Компонент';
$lang->component_version = 'Версия';

12
modules/editor/lang/tr.php
View file

@ -1,16 +1,4 @@
<?php
$lang->editor_now = '현재 설정 상태';
$lang->editor_component = 'Editor Component';
$lang->main_editor = 'Main editor';
$lang->comment_editor = 'Comment editor';
$lang->editor_option = 'Editor Option';
$lang->guide_choose_main_editor = 'Main editor.';
$lang->guide_set_height_main_editor = 'Height of the main editor.';
$lang->guide_choose_comment_editor = 'Comment editor.';
$lang->guide_set_height_comment_editor = 'Height of the comment editor.';
$lang->guide_choose_text_formatting = 'Text formatting.';
$lang->guide_choose_font_body = 'Font body.';
$lang->guide_choose_font_size_body = 'Font size body.';
$lang->component_name = 'Bileşen';
$lang->component_version = 'Sürüm';
$lang->component_author = 'Geliştirici';

Some files were not shown because too many files have changed in this diff Show more