Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion frontend/src/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@
"ou": "User OU",
"ou_placeholder": "Example: ou=users,dc=example,dc=com",
"user_filter": "User Filter",
"user_filter_placeholder": "Example: uid",
"user_filter_placeholder": "For example: uid or uid {0} email. Multiple attributes should be separated by {1}",
"ldap_field_mapping_placeholder": "Example: {\"account\": \"ldapAccount\", \"name\": \"ldapName\", \"email\": \"mail\"}",
"be_turned_on": "Once the test connection is confirmed to be effective, it can be enabled"
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/i18n/ko-KR.json
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@
"ou": "사용자 OU",
"ou_placeholder": "예: ou=users,dc=example,dc=com",
"user_filter": "사용자 필터",
"user_filter_placeholder": "예: uid",
"user_filter_placeholder": "예: uid 또는 uid {0} email. 여러 속성은 {1}로 구분합니다",
"ldap_field_mapping_placeholder": "예: {\"account\": \"ldapAccount\", \"name\": \"ldapName\", \"email\": \"mail\"}",
"be_turned_on": "테스트 연결이 유효한 것으로 확인되면 활성화할 수 있습니다"
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/i18n/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@
"ou": "用户 OU",
"ou_placeholder": "例如:ou=users,dc=example,dc=com",
"user_filter": "用户过滤器",
"user_filter_placeholder": "例如:uid",
"user_filter_placeholder": "例如:uid 或 uid {0} email, 多属性以 {1} 分割",
"ldap_field_mapping_placeholder": "例如:{'{'}\"account\": \"ldapAccount\", \"name\": \"ldapName\", \"email\": \"mail\"{'}'}",
"be_turned_on": "测试连接有效后,可开启"
},
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/system/authentication/LdapEditor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ defineExpose({
<el-form-item :label="t('authentication.user_filter')" prop="user_filter">
<el-input
v-model="state.form.user_filter"
:placeholder="t('authentication.user_filter_placeholder')"
:placeholder="t('authentication.user_filter_placeholder', ['|', '|'])"
/>
</el-form-item>

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/system/user/User.vue
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ const filterOption = ref<any[]>([
{ id: '2', name: 'OIDC' },
{ id: '3', name: 'LDAP' },
{ id: '4', name: 'OAuth2' },
{ id: '5', name: 'SAML2' },
/* { id: '5', name: 'SAML2' }, */
],
field: 'origins',
title: t('user.user_source'),
Expand Down