From abc11990677b7a686e5bfe7ea1659f1dc1a38ab8 Mon Sep 17 00:00:00 2001 From: kate Date: Wed, 31 Oct 2018 11:11:17 +0100 Subject: [PATCH 1/2] search box configuration fix --- .../web/page/admin/roles/AbstractRoleMemberPanel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java index 0e75a8b80e7..654b181571e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/AbstractRoleMemberPanel.java @@ -162,10 +162,10 @@ protected void initLayout() { } private void initDefaultSearchParameters(){ - GuiObjectListViewType panelConfig = WebComponentUtil.getViewTypeConfig(getComplexTypeQName(), getPageBase()); - if (panelConfig != null && panelConfig.getSearchBoxConfiguration() != null) { - scopeDefaultValue = panelConfig.getSearchBoxConfiguration().getDefaultScope(); - objectTypeDefaultValue = panelConfig.getSearchBoxConfiguration().getDefaultObjectType(); + GuiObjectListPanelConfigurationType additionalPanel = getAdditionalPanelConfig(); + if (additionalPanel != null && additionalPanel.getSearchBoxConfiguration() != null) { + scopeDefaultValue = additionalPanel.getSearchBoxConfiguration().getDefaultScope(); + objectTypeDefaultValue = additionalPanel.getSearchBoxConfiguration().getDefaultObjectType(); } if (scopeDefaultValue == null){ scopeDefaultValue = SearchBoxScopeType.ONE_LEVEL; From 76910dfd03eca93619b6c5abf09841a07d9135c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ga=C5=A1par=C3=ADk?= Date: Wed, 31 Oct 2018 11:11:36 +0100 Subject: [PATCH 2/2] Final translation for midPoint 3.9! Thank to all that contributed for this release: d.tautkute (lt), kremerpatricklux (fr), ktamura (ja), merlincaf (it), mceylan (tr), nagai (ja), petr.gasparik (cs), sa_nagata (ja), wstaszewski (pl), --- .../localization/Midpoint_es.properties | 68 +++++++++---------- .../localization/Midpoint_ja.properties | 14 ++-- 2 files changed, 41 insertions(+), 41 deletions(-) diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties index f96d870eaa5..fb671d689e7 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_es.properties @@ -112,8 +112,8 @@ AssignmentTablePanel.menu.assign=Asignar Recursos de la Cuenta AssignmentTablePanel.menu.assignOrg=Asignar Org. AssignmentTablePanel.menu.assignOrg.noorgs=No organization structure defined. AssignmentTablePanel.menu.assignRole=Asignar Rol -AssignmentTablePanel.menu.addDelegation=Agregar delegación -AssignmentTablePanel.menu.deleteDelegation=Eliminar delegación +AssignmentTablePanel.menu.addDelegation=Add delegation +AssignmentTablePanel.menu.deleteDelegation=Delete delegation AssignmentTablePanel.menu.unassign=Desasignar AssignmentTablePanel.menu.showAllAssignments=Mostrar todas las asignaciones AssignmentTablePanel.message.couldntAssignObject=No se pudo asignar objeto '{0}', razón: {1}. @@ -1073,13 +1073,13 @@ pageAdmin.configuration=Configuración pageAdmin.configuration.description=Securidad, logging, importación pageAdmin.home.description=Comenzar aquí pageAdmin.home=Inicio -PageAdmin.menu.top.certification.campaigns=Campañas -PageAdmin.menu.top.certification.scheduling=Programar campaña +PageAdmin.menu.top.certification.campaigns=Campaigns +PageAdmin.menu.top.certification.scheduling=Campaigns scheduling PageAdmin.menu.top.certification=Certificación PageAdmin.menu.top.certification.decisions=Mis elementos de trabajo -PageAdmin.menu.top.certification.definitions=Definiciones de campaña -PageAdmin.menu.top.certification.newDefinition=Nueva definición de campaña -PageAdmin.menu.top.certification.viewDefinition=Ver definición de campaña +PageAdmin.menu.top.certification.definitions=Campaign definitions +PageAdmin.menu.top.certification.newDefinition=New campaign definition +PageAdmin.menu.top.certification.viewDefinition=View campaign definition PageAdmin.menu.top.configuration.about=About PageAdmin.menu.top.configuration.basic=Sistema PageAdmin.menu.top.configuration.bulkActions=Acciones en masa @@ -1132,12 +1132,12 @@ PageAdmin.menu.top.users.new=Nuevo usuario PageAdmin.menu.top.users.org.new=Nueva organización PageAdmin.menu.top.users.org=Estructura organizativa PageAdmin.menu.top.users.org.tree=Árbol organizacional -PageAdmin.menu.top.users=Usuarios +PageAdmin.menu.top.users=Usuario PageAdmin.menu.top.valuePolicies.list= List value policies PageAdmin.menu.top.valuePolicies.new = New value policy PageAdmin.menu.top.valuePolicies= Value policies -PageAdmin.menu.top.workItems.listClaimable=Elementos reclamables -PageAdmin.menu.top.workItems.list=Mis elementos +PageAdmin.menu.top.workItems.listClaimable=Artículos reclamados por mí +PageAdmin.menu.top.workItems.list=Mis artículos PageAdmin.menu.top.workItems.listAll=All items PageAdmin.menu.top.workItems.listProcessInstancesAll=Todas las solicitudes PageAdmin.menu.top.workItems.listProcessInstancesRequestedBy=Mis solicitudes @@ -1398,17 +1398,17 @@ PageCertDecisions.ago={0} atrás PageCertDecisions.checkbox.showNoResponseOnly=Show "no response" cases only PageCertDecisions.in=en {0} PageCertDecisions.menu.accept=Aceptar -PageCertDecisions.menu.acceptSelected=Aceptar seleccionadas +PageCertDecisions.menu.acceptSelected=Accept selected PageCertDecisions.menu.delegate=Delegar -PageCertDecisions.menu.delegateSelected=Delegar seleccionadas +PageCertDecisions.menu.delegateSelected=Delegate selected PageCertDecisions.menu.noResponse=Sin respuesta -PageCertDecisions.menu.noResponseSelected=Marcar seleccionadas como Sin respuesta +PageCertDecisions.menu.noResponseSelected=Mark selected as No response PageCertDecisions.menu.notDecided=No decidido -PageCertDecisions.menu.notDecidedSelected=Marcar seleccionadas como No decidido +PageCertDecisions.menu.notDecidedSelected=Mark selected as Not decided PageCertDecisions.menu.reduce=Reducir PageCertDecisions.menu.reduceSelected=Reduce selected PageCertDecisions.menu.revoke=Rechazar -PageCertDecisions.menu.revokeSelected=Rechazar seleccionadas +PageCertDecisions.menu.revokeSelected=Revoke selected PageCertDecisions.message.noItemSelected=No item selected PageCertDecisions.now=ahora PageCertDecisions.table.campaignName=Campaign name @@ -1663,7 +1663,7 @@ pageDebugList.resourceType=Tipo de recurso pageDebugList.searchTextPlaceholder=Nombre PageDebugList.title=Objetos en crudo pageDebugList.zipCheck=Usar zip -pageDebugView.button.back=Volver +pageDebugView.button.back=Negro pageDebugView.button.save=Guardar pageDebugView.edit=Editar pageDebugView.encrypt=Protegido por cifrado @@ -2346,7 +2346,7 @@ pageUser.assignment.active=Activo pageUser.assignment.name=Nombre pageUser.assignments=Asignaciones pageAdminFocus.request=Request a role -pageAdminFocus.objectHistory=Historial +pageAdminFocus.objectHistory=History pageUser.assignment.type=Tipo pageUser.button.abort=Abortar pageUser.button.addAccount=Agregar cuenta @@ -3274,7 +3274,7 @@ User.disabled=Disabilitado UserMenuPanel.editPasswordQuestions=Preguntas de Seguridad UserMenuPanel.editProfile=Editar perfil UserMenuPanel.logout=Finalizar sesión -UserMenuPanel.resetPasswords=Resetear contraseña +UserMenuPanel.resetPasswords=Reset password UserOrgReferenceChoosePanel.type.org=Org. Unit UserOrgReferenceChoosePanel.type=Owner Type UserOrgReferenceChoosePanel.type.user=Usuario @@ -3341,7 +3341,7 @@ WorkItemsPanel.target=Objetivo WorkItemsPanel.name=Name WorkItemsPanel.stage=Stage WorkItemsPanel.started=Process started -WorkItemsPanel.created=Creado +WorkItemsPanel.created=Created WorkItemsPanel.deadline=Deadline WorkItemsPanel.escalationLevel=Esc. level PageAdmin.menu.dashboard=Panel de control @@ -3349,10 +3349,10 @@ PageAdmin.menu.selfDashboard=Inicio PageAdmin.menu.selfService=SELF SERVICE PageAdmin.menu.mainNavigation=ADMINISTRATION PageAdmin.menu.additional=ADDITIONAL -PageAdmin.menu.profile=Perfil +PageAdmin.menu.profile=Profile PageAdmin.menu.assignments=Asignaciones PageAdmin.menu.credentials=Credenciales -PageAdmin.menu.request=Solicitar roles +PageAdmin.menu.request=Request a role PageTemplate.version=Version: PageTemplate.copy=Copyright © 2010-2018 Evolveum® and partners.  PageTemplate.toggleNavigation=Toggle navigation @@ -3376,17 +3376,17 @@ PageSelfProfile.title=Editar perfil PageSelfDashboard.title=Inicio PageSelfDashboard.workItems=Mis elementos de trabajo PageSelfDashboard.myRequests=Mis solicitudes -PageAdmin.menu.top.serverTasks.edit=Editar tarea -PageAdmin.menu.top.configuration.repositoryObjectView=Editar objeto -PageAdmin.menu.top.reports.configure=Configurar reporte -PageAdmin.menu.top.users.edit=Editar usuario -PageAdmin.menu.top.roles.edit=Editar rol -PageAdmin.menu.top.users.org.edit=Editar organización +PageAdmin.menu.top.serverTasks.edit=Edit task +PageAdmin.menu.top.configuration.repositoryObjectView=Edit object +PageAdmin.menu.top.reports.configure=Configure report +PageAdmin.menu.top.users.edit=Edit user +PageAdmin.menu.top.roles.edit=Edit role +PageAdmin.menu.top.users.org.edit=Edit organization PageSelfCredentials.tabs.password=Contraseña PageSelfCredentials.title=Credenciales -PageSelfCredentials.oldPasswordLabel=Contraseña actual -PageSelfCredentials.passwordLabel1=Nueva contraseña -PageSelfCredentials.passwordLabel2=Confirmar contraseña +PageSelfCredentials.oldPasswordLabel=Old password +PageSelfCredentials.passwordLabel1=New password +PageSelfCredentials.passwordLabel2=Confirm password PageSelfCredentials.accountMidpoint=Identity Manager PageSelfCredentials.resourceMidpoint=Identity Repository PageSelfCredentials.noAccountSelected=Contraseña no cambiada. No se seleccionó cuenta. @@ -3526,10 +3526,10 @@ autoRefreshPanel.resumeRefreshing=Resume refreshing autoRefreshPanel.pauseRefreshing=Pause refreshing autoRefreshPanel.refreshingEach=Refreshing each {0} sec autoRefreshPanel.noRefreshing=(no refreshing) -PageAdmin.menu.top.services=Servicios -PageAdmin.menu.top.services.list=Listar servicios -PageAdmin.menu.top.services.new=Nuevo servicio -PageAdmin.menu.top.services.edit=Editar servicio +PageAdmin.menu.top.services=Services +PageAdmin.menu.top.services.list=List services +PageAdmin.menu.top.services.new=New service +PageAdmin.menu.top.services.edit=Edit service taskShowAdvancedFeaturesPanel.label=Show advanced features taskWfParentPanel.changesNotRequiringApproval=Changes not requiring approval taskOtherChangesPanel.label.state=Estado: diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties index 3db462cbbda..96949f149fe 100644 --- a/gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties +++ b/gui/admin-gui/src/main/resources/localization/Midpoint_ja.properties @@ -1470,8 +1470,8 @@ PageCertDefinition.scopeIncludeResources=リソース PageCertDefinition.scopeIncludeByStatus=Include by activation status PageCertDefinition.scopeEnabledItemsOnly=Enabled items only PageCertDefinition.stagesDefinition=ステージ定義 -PageCertDefinitions.message.deleteDefinitionPerformed.success=The definition has been successfully deleted. -PageCertDefinitions.message.deleteDefinitionPerformed.partialError=Couldn't delete campaign definition. +PageCertDefinitions.message.deleteDefinitionPerformed.success=定義が正常に削除されました。 +PageCertDefinitions.message.deleteDefinitionPerformed.partialError=キャンペーン定義を削除できませんでした。 PageCert.in={0} 内 PageCert.message.assignment={0} of {1} {2} to {3} {4}. PageCert.message.textAdministrativeState=Administrative state: {0}. @@ -2274,7 +2274,7 @@ pageTasks.message.deactivateServiceThreadsPerformed.warning=ローカルノー pageTasks.message.deactivateServiceThreadsPerformed.fatalError=このノードのサービススレッドを非アクティブ化できませんでした pageTasks.message.reactivateServiceThreadsPerformed.success=ローカルノード上のサービススレッドは正常に再アクティブ化されました。 pageTasks.message.reactivateServiceThreadsPerformed.fatalError=ローカルノードのサービススレッドを再アクティブ化できませんでした -pageTasks.message.deleteTaskConfirmedPerformed.success=The task(s) have been successfully deleted. +pageTasks.message.deleteTaskConfirmedPerformed.success=タスクが正常に削除されました。 pageTasks.message.deleteTaskConfirmedPerformed.fatalError=タスクを削除できませんでした pageTasks.message.suspendTasksPerformed.success=タスクが正常にサスペンドされました。 pageTasks.message.suspendTasksPerformed.warning=Task(s) suspension has been successfully requested; please check for its completion using task list. @@ -2519,13 +2519,13 @@ workItemPanel.additionalAttributes=Additional attributes workItemPanel.approvalHistory=本申請に関する承認履歴 workItemPanel.approvalHistoryHelp=Decisions that have been done so far in the process of approving the changes displayed here. workItemPanel.otherWorkItemsHelp=Work items for the changes shown here that are currently active (in addition to the work item displayed on this page). -TaskOperationUtils.message.suspendPerformed.success=The task have been successfully suspended. +TaskOperationUtils.message.suspendPerformed.success=タスクが正常にサスペンドされました。 TaskOperationUtils.message.suspendPerformed.warning=Task suspension has been successfully requested; please check for its completion using task list. -TaskOperationUtils.message.suspendPerformed.fatalError=Couldn't suspend the task +TaskOperationUtils.message.suspendPerformed.fatalError=タスクをサスペンドできませんでした TaskOperationUtils.message.resumePerformed.success=The task has been successfully resumed. TaskOperationUtils.message.resumePerformed.fatalError=Couldn't resume the task TaskOperationUtils.message.runNowPerformed.success=The task has been successfully scheduled to run. -TaskOperationUtils.message.runNowPerformed.fatalError=Couldn't schedule the task +TaskOperationUtils.message.runNowPerformed.fatalError=タスクをスケジュールできませんでした。 TaskWfChildPanel.approvalHistoryHelp=Decisions that have been done so far in the process of approving the changes displayed here. TaskWfChildPanel.currentWorkItemsHelp=Work items for the changes displayed here that are currently active. TaskWfChildPanel.showNextStagesHelp=Displays the preview of the following approval stages. @@ -4150,7 +4150,7 @@ abstractRoleMemberPanel.menu.delete=削除 abstractRoleMemberPanel.searchScope=スコープ abstractRoleMemberPanel.searchScope.tooltip=組織単位メンバーにのみ適用されます。 使用可能なスコープ：１つの階層レベルまたはサブツリー abstractRoleMemberPanel.type=タイプ -abstractRoleMemberPanel.type.tooltip=Show members of selected type +abstractRoleMemberPanel.type.tooltip=選択したタイプのメンバーを参照 abstractRoleMemberPanel.indirectMembers=間接的 abstractRoleMemberPanel.indirectMembers.tooltip="Whether to show members which are not assigned directly (there is no assignment in the object)" abstractRoleMemberPanel.recomputeAllMembersConfirmationLabel=本当にすべてのメンバーを再計算しますか？