diff --git a/scm-ui/public/locales/de/admin.json b/scm-ui/public/locales/de/admin.json index 20a1e0a004..8d9c876537 100644 --- a/scm-ui/public/locales/de/admin.json +++ b/scm-ui/public/locales/de/admin.json @@ -39,12 +39,12 @@ "abort": "Abbrechen", "author": "Autor", "version": "Version", - "dependencyNotification": "Mit diesem Plugin werden folgende Abhängigkeiten mit installieren wenn sie noch nicht vorhanden sind!", + "dependencyNotification": "Mit diesem Plugin werden folgende Abhängigkeiten mit installiert, wenn sie noch nicht vorhanden sind!", "dependencies": "Abhängigkeiten", "successNotification": "Das Plugin wurde erfolgreich installiert. Um Änderungen an der UI zu sehen, muss die Seite neu geladen werden:", - "reload": "jetzt new laden", + "reload": "jetzt neu laden", "restartNotification": "Der SCM-Manager Kontext sollte nur neu gestartet werden, wenn aktuell niemand damit arbeitet.", - "installPending": "Die folgenden Plugins werden installiert und anschließend wir der SCM-Manager Kontext neu gestartet." + "installPending": "Die folgenden Plugins werden installiert. Anschließend wird der SCM-Manager Kontext neu gestartet." } }, "repositoryRole": { diff --git a/scm-ui/public/locales/en/admin.json b/scm-ui/public/locales/en/admin.json index 2c9304ac85..7c9adff4f9 100644 --- a/scm-ui/public/locales/en/admin.json +++ b/scm-ui/public/locales/en/admin.json @@ -39,11 +39,11 @@ "abort": "Abort", "author": "Author", "version": "Version", - "dependencyNotification": "With this plugin, the following dependencies are installed if they are not available yet!", + "dependencyNotification": "With this plugin, the following dependencies will be installed if they are not available yet!", "dependencies": "Dependencies", "successNotification": "Successful installed plugin. You have to reload the page, to see ui changes:", "reload": "reload now", - "restartNotification": "Restarting the scm-manager context, should only be done if no one else is currently working with it.", + "restartNotification": "You should only restart the scm-manager context if no one else is currently working with it.", "installPending": "The following plugins will be installed and after installation the scm-manager context will be restarted." } }, diff --git a/scm-ui/src/admin/plugins/components/waitForRestart.js b/scm-ui/src/admin/plugins/components/waitForRestart.js index 93b7b17855..a2f800a013 100644 --- a/scm-ui/src/admin/plugins/components/waitForRestart.js +++ b/scm-ui/src/admin/plugins/components/waitForRestart.js @@ -9,7 +9,7 @@ const waitForRestart = () => { // we need some initial delay if (!started) { started = true; - setTimeout(executor, 100, resolve, reject); + setTimeout(executor, 1000, resolve, reject); } else { apiClient .get("") diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AvailablePluginResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AvailablePluginResource.java index fa06740945..3ee4a4ea73 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AvailablePluginResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/AvailablePluginResource.java @@ -75,7 +75,7 @@ public class AvailablePluginResource { if (plugin.isPresent()) { return Response.ok(mapper.mapAvailable(plugin.get())).build(); } else { - throw notFound(entity(InstalledPluginDescriptor.class, name)); + throw notFound(entity("Plugin", name)); } } diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InstalledPluginResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InstalledPluginResource.java index 893d09a51a..bc9d4b397c 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InstalledPluginResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/InstalledPluginResource.java @@ -75,7 +75,7 @@ public class InstalledPluginResource { if (pluginDto.isPresent()) { return Response.ok(mapper.mapInstalled(pluginDto.get())).build(); } else { - throw notFound(entity(InstalledPluginDescriptor.class, name)); + throw notFound(entity("Plugin", name)); } } }