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

Merge remote-tracking branch 'refs/remotes/origin/pr/member-engilsh-lang' into pr/document-update-log

Browse source
This commit is contained in:
BJRambo 2016-03-01 15:54:44 +09:00
commit de127f27f8
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -660,6 +660,7 @@ class documentController extends document
// Change not extra vars but language code of the original document if document's lang_code doesn't exist.
if(!$source_obj->get('lang_code'))
{
$lang_code_args = new stdClass();
$lang_code_args->document_srl = $source_obj->get('document_srl');
$lang_code_args->lang_code = Context::getLangType();
$output = executeQuery('document.updateDocumentsLangCode', $lang_code_args);

2
modules/member/lang/en.php
View file

@ -206,7 +206,7 @@ $lang->about_profile_image = 'Members will be able to use profile images';
$lang->about_signature_max_height = 'You can limit the signature max height. Set this as 0 or leave it blank not to limit it.';
$lang->about_accept_agreement = 'I have read the agreement and agree with it';
$lang->about_member_default = 'It will be set as the default group on sign up';
$lang->about_find_member_account = 'lease input the email address you have entered during the registration and we will send your account info to this email address.';
$lang->about_find_member_account = 'Please input the email address you have entered during the registration and we will send your account info to this email address.';
$lang->about_ssl_port = 'Please enter if you are using non-default SSL port';
$lang->about_resend_auth_mail = 'You can request for the activation email if you have not activated yet.';
$lang->no_article = 'No articles';