Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Oct 12, 2018 · 02344e8 · 02344e8
2 parents 7135d52 + c3c0da8
commit 02344e8
Show file tree

Hide file tree

Showing 10 changed files with 102 additions and 68 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -2798,7 +2798,7 @@ public void onClick(AjaxRequestTarget target) {
 									result.recordInProgress(); // this should be probably have been done in submitTaskFromTemplate
 									result.setBackgroundTaskOid(executorTask.getOid());
 								} else {
-									result.recordWarning("There are no objects to execute the action on");  // TODO i18n
+									result.recordWarning(pageBase.createStringResource("webComponentUtil.message.createMenuItemsFromActions.warning").getString());
 								}
 							} catch (Exception ex) {
 								result.recordFatalError(result.getOperation(), ex);

diff --git a/...rc/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java b/...rc/main/java/com/evolveum/midpoint/web/component/wizard/resource/SynchronizationStep.java
@@ -490,7 +490,7 @@ public String getObject() {
 									sb.append(StringUtils.substringAfter(action.getHandlerUri(), "#"));
 								}
 							} else {
-								sb.append("sync");	// TODO i18n
+								sb.append(getString("SynchronizationStep.label.editorReaction"));
 							}
 						}
 						sb.append(")");

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.java
@@ -1022,15 +1022,14 @@ private void deleteCampaignsPerformed(AjaxRequestTarget target,
 				getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task,
 						result);
 			} catch (Exception ex) {
-				result.recordPartialError("Couldn't delete campaign.", ex);
+				result.recordPartialError(createStringResource("PageCertCampaigns.message.deleteCampaignsPerformed.partialError").getString(), ex);
 				LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete campaign", ex);
 			}
 		}
 
 		result.recomputeStatus();
 		if (result.isSuccess()) {
-			result.recordStatus(OperationResultStatus.SUCCESS,
-					"The campaign(s) have been successfully deleted.");     // todo i18n
+			result.recordStatus(OperationResultStatus.SUCCESS, createStringResource("PageCertCampaigns.message.deleteCampaignsPerformed.success").getString());
 		}
 
 		Table campaignsTable = getCampaignsTable();
@@ -1074,7 +1073,7 @@ private void actOnCampaignsPerformed(AjaxRequestTarget target, String operationN
 						throw new IllegalStateException("Unknown action: " + operationName);
 				}
 			} catch (Exception ex) {
-				result.recordPartialError("Couldn't process campaign.", ex);
+				result.recordPartialError(createStringResource("PageCertCampaigns.message.actOnCampaignsPerformed.partialError").getString(), ex);
 				LoggingUtils.logUnexpectedException(LOGGER, "Couldn't process campaign", ex);
 			}
 		}
@@ -1087,8 +1086,7 @@ private void actOnCampaignsPerformed(AjaxRequestTarget target, String operationN
 
 		result.recomputeStatus();
 		if (result.isSuccess()) {
-			result.recordStatus(OperationResultStatus.SUCCESS,
-					processed + " campaign(s) have been successfully processed.");      // todo i18n
+			result.recordStatus(OperationResultStatus.SUCCESS, createStringResource("PageCertCampaigns.message.actOnCampaignsPerformed.success", processed).getString());
 		}
 		WebComponentUtil.safeResultCleanup(result, LOGGER);
 		showResult(result);

diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java b/...src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
@@ -252,13 +252,13 @@ private void deleteDefinitionPerformed(AjaxRequestTarget target, AccessCertifica
 							getPrismContext());
 			getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task, result);
 		} catch (Exception ex) {
-			result.recordPartialError("Couldn't delete campaign definition.", ex);
+			result.recordPartialError(createStringResource("PageCertDefinitions.message.deleteDefinitionPerformed.partialError").getString(), ex);
 			LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete campaign definition", ex);
 		}
 
 		result.computeStatusIfUnknown();
 		if (result.isSuccess()) {
-			result.recordStatus(OperationResultStatus.SUCCESS, "The definition has been successfully deleted.");    // todo i18n
+			result.recordStatus(OperationResultStatus.SUCCESS, createStringResource("PageCertDefinitions.message.deleteDefinitionPerformed.success").getString());
 		}
 
 		getDefinitionsTable().clearCache();

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java
@@ -279,15 +279,14 @@ private void deleteHostConfirmedPerformed(AjaxRequestTarget target) {
 							result);
 				}
 			} catch (Exception ex) {
-				result.recordPartialError("Couldn't delete host.", ex);
+				result.recordPartialError(createStringResource("PageConnectorHosts.message.deleteHostConfirmedPerformed.partialError").getString(), ex);
 				LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete host", ex);
 			}
 		}
 
 		result.recomputeStatus();
 		if (result.isSuccess()) {
-			result.recordStatus(OperationResultStatus.SUCCESS,
-					"The resource(s) have been successfully deleted.");     // todo i18n
+			result.recordStatus(OperationResultStatus.SUCCESS, createStringResource("PageConnectorHosts.message.deleteHostConfirmedPerformed.success").getString());
 		}
 
 		BaseSortableDataProvider provider = (BaseSortableDataProvider) hostTable.getDataTable()
@@ -317,8 +316,7 @@ private void discoveryRemotePerformed(AjaxRequestTarget target) {
 				try {
 					getModelService().discoverConnectors(host, task, result);
 				} catch (Exception ex) {
-					result.recordFatalError("Fail to discover connectors on host '" + host.getHostname() + ":"
-							+ host.getPort() + "'", ex);
+					result.recordFatalError(createStringResource("PageConnectorHosts.message.discoveryRemotePerformed.fatalError", host.getHostname(), host.getPort()).getString(), ex);
 				}
 			}
 		}

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java b/...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
@@ -474,15 +474,14 @@ private void deleteResourceConfirmedPerformed(AjaxRequestTarget target) {
 				getModelService().executeChanges(WebComponentUtil.createDeltaCollection(delta), null, task,
 						result);
 			} catch (Exception ex) {
-				result.recordPartialError("Couldn't delete resource.", ex);
+				result.recordPartialError(createStringResource("PageResources.message.deleteResourceConfirmedPerformed.partialError").getString(), ex);
 				LoggingUtils.logUnexpectedException(LOGGER, "Couldn't delete resource", ex);
 			}
 		}
 
 		result.recomputeStatus();
 		if (result.isSuccess()) {
-			result.recordStatus(OperationResultStatus.SUCCESS,
-					"The resource(s) have been successfully deleted."); // todo i18n
+			result.recordStatus(OperationResultStatus.SUCCESS, createStringResource("PageResources.message.deleteResourceConfirmedPerformed.success").getString());
 		}
 
 		getResourceTable().clearCache();
@@ -498,7 +497,7 @@ private void testResourcePerformed(AjaxRequestTarget target, ResourceType resour
 		// SelectableBean<ResourceType> dto = rowModel.getObject();
 		// ResourceType resourceType = dto.getValue();
 		if (StringUtils.isEmpty(resourceType.getOid())) {
-			result.recordFatalError("Resource oid not defined in request");
+			result.recordFatalError(createStringResource("PageResources.message.testResourcePerformed.partialError").getString());
 		}
 
 		Task task = createSimpleTask(OPERATION_TEST_RESOURCE);