Merge branch 'rhymix:master' into develop

modules/member/member.admin.view.php

@@ -58,6 +58,10 @@ class MemberAdminView extends Member
 
 		// retrieve group list
 		$this->group_list = $oMemberModel->getGroups();
+		foreach ($this->group_list as $group)
+		{
+			$group->title = Context::replaceUserLang($group->title, true);
+		}
 		Context::set('group_list', $this->group_list);
 
 		$security = new Security();

modules/member/member.class.php

@@ -14,16 +14,6 @@ class Member extends ModuleObject
 	public const NOUSE_EXTRA_VARS = ['error_return_url', 'success_return_url', '_rx_ajax_compat', '_rx_ajax_form', '_rx_csrf_token', 'ruleset', 'captchaType', 'use_editor', 'use_html'];
 	public const STATUS_LIST = ['APPROVED', 'DENIED', 'UNAUTHED', 'SUSPENDED', 'DELETED'];
 
-	/**
-	 * constructor
-	 *
-	 * @return void
-	 */
-	function __construct()
-	{
-		parent::__construct();
-	}
-
 	/**
 	 * Implement if additional tasks are necessary when installing
 	 *

modules/member/member.view.php

@@ -176,6 +176,11 @@ class MemberView extends Member
 			$member_info->email_address = sprintf('%s@%s', $protect_id, $email_host);
 		}
 
+		foreach ($member_info->group_list ?? [] as $key => $val)
+		{
+			$member_info->group_list[$key] = Context::replaceUserLang($val, true);
+		}
+
 		Context::set('memberInfo', get_object_vars($member_info));
 
 		$extendForm = MemberModel::getCombineJoinForm($member_info);

modules/member/tpl/member_list.html

@@ -61,7 +61,7 @@
 					<i class="no_profile">?</i>
 					<!--@end-->
 				</td>
-				{@ $member_info['group_list'] = implode(', ', $member_info['group_list'])}
+				{@ $member_info['group_list'] = Context::replaceUserLang(implode(', ', $member_info['group_list']), true)}
 				<td class="nowr" loop="$usedIdentifiers=>$name,$title">
 					<!--@if($name === 'email_address')-->
 						<a href="#popup_menu_area" class="member_{$member_info['member_srl']}">{getEncodeEmailAddress($member_info['email_address'])}</a>