From 107600f19c0ceece4c2f9d878fb8fce435b00121 Mon Sep 17 00:00:00 2001 From: Kijin Sung Date: Sat, 4 Mar 2017 21:32:01 +0900 Subject: [PATCH] Add language codes for domain-related error messages. --- modules/admin/admin.admin.controller.php | 2 +- modules/admin/lang/en.php | 10 +++++++++- modules/admin/lang/ko.php | 7 +++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php index c8bb07912..dafa34d2c 100644 --- a/modules/admin/admin.admin.controller.php +++ b/modules/admin/admin.admin.controller.php @@ -1003,7 +1003,7 @@ class adminAdminController extends admin } if ($vars->https_port !== 0 && ($vars->https_port < 1 || $vars->https_port > 65535 || $vars->https_port == 80)) { - return new Object(-1, 'msg_invalid_http_port'); + return new Object(-1, 'msg_invalid_https_port'); } // Validate the security setting. diff --git a/modules/admin/lang/en.php b/modules/admin/lang/en.php index 22d3abf19..a9ec4251c 100644 --- a/modules/admin/lang/en.php +++ b/modules/admin/lang/en.php @@ -115,9 +115,17 @@ $lang->cmd_index_module_srl = 'Main Module'; $lang->cmd_index_document_srl = 'Main Document'; $lang->cmd_default_language = 'Default Language'; $lang->cmd_new_domain = 'Add New Domain'; -$lang->about_use_ssl = '

Selecting \'Optional\' is to use SSL for the specified actions such as signing up and changing information.
Selecting \'Always\' is to use SSL for the entire pages, generated by Rhymix.

Please be careful! You may not be able to access to the site, before installing SSL certificate.

'; +$lang->cmd_edit_domain = 'Edit Domain'; +$lang->about_use_ssl = 'Selecting \'Optional\' is to use SSL for the specified actions such as signing up and changing information.
Selecting \'Always\' is to use SSL for the entire pages, generated by Rhymix.
Please be careful! You may not be able to access to the site, before installing SSL certificate.'; $lang->server_ports = 'Server Port'; $lang->about_server_ports = 'If your web server does not use 80 for HTTP or 443 for HTTPS port, you should specify server ports.'; +$lang->msg_invalid_domain = 'Invalid domain.'; +$lang->msg_domain_already_exists = 'The domain already exists.'; +$lang->msg_invalid_http_port = 'Invalid HTTP port.'; +$lang->msg_invalid_https_port = 'Invalid HTTPS port.'; +$lang->msg_invalid_index_module_srl = 'The main module does not exist.'; +$lang->msg_invalid_index_document_srl = 'The main document number does not exist.'; +$lang->msg_lang_is_not_enabled = 'The language you selected is not enabled in this site.'; $lang->use_db_session = 'Store Session in DB'; $lang->about_db_session = 'Store PHP sessions in the database. This setting must be turned on if you want to see current users or get detailed statistics.
Unnecessary use may decrease server performance.'; $lang->qmail_compatibility = 'Enable Qmail'; diff --git a/modules/admin/lang/ko.php b/modules/admin/lang/ko.php index bd5f1650f..ff27add03 100644 --- a/modules/admin/lang/ko.php +++ b/modules/admin/lang/ko.php @@ -119,6 +119,13 @@ $lang->cmd_edit_domain = '도메인 정보 수정'; $lang->about_use_ssl = '\'선택적으로 사용\'은 회원가입, 정보수정 등의 지정된 동작(action)에서만 보안접속(HTTPS)을 사용합니다.
\'항상 사용\'은 사이트 전체에 HTTPS를 사용합니다.
SSL 인증서가 설치되지 않은 상태에서 HTTPS 사용을 시도하면 접속이 되지 않을 수 있으니 주의하시기 바랍니다.'; $lang->server_ports = '포트'; $lang->about_server_ports = 'HTTP는 80, HTTPS는 443 이 아닌, 다른 포트를 사용할 경우에 포트를 지정해 주어야 합니다.'; +$lang->msg_invalid_domain = '올바르지 않은 도메인입니다.'; +$lang->msg_domain_already_exists = '이미 등록된 도메인입니다.'; +$lang->msg_invalid_http_port = '올바르지 않은 HTTP 포트입니다.'; +$lang->msg_invalid_https_port = '올바르지 않은 HTTPS 포트입니다.'; +$lang->msg_invalid_index_module_srl = '선택하신 메인 모듈이 존재하지 않습니다.'; +$lang->msg_invalid_index_document_srl = '선택하신 메인 문서 번호가 존재하지 않습니다.'; +$lang->msg_lang_is_not_enabled = '선택하신 언어가 활성화되어 있지 않습니다.'; $lang->use_db_session = '인증 세션 DB 사용'; $lang->about_db_session = '세션을 DB에 저장합니다. 현재 접속자를 파악하려면 이 기능을 켜야 합니다.
불필요하게 사용하면 서버 성능에 악영향을 줄 수 있으니 주의하십시오.'; $lang->qmail_compatibility = '큐메일(Qmail) 사용';