Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-14 09:25:43 +01:00
Code Issues Packages Projects Releases Activity

Peer-Review changes

Browse Source
This commit is contained in:
Rene Pfeuffer
2019-08-22 10:53:14 +02:00
parent 5c09f92a57
commit 74cc7b53e8
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
scm-ui/public/locales/de/admin.json
View File

@@ -39,12 +39,12 @@
"abort": "Abbrechen", "abort": "Abbrechen",
"author": "Autor", "author": "Autor",
"version": "Version", "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", "dependencies": "Abhängigkeiten",
"successNotification": "Das Plugin wurde erfolgreich installiert. Um Änderungen an der UI zu sehen, muss die Seite neu geladen werden:", "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.", "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": { "repositoryRole": {

4
scm-ui/public/locales/en/admin.json
View File

@@ -39,11 +39,11 @@
"abort": "Abort", "abort": "Abort",
"author": "Author", "author": "Author",
"version": "Version", "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", "dependencies": "Dependencies",
"successNotification": "Successful installed plugin. You have to reload the page, to see ui changes:", "successNotification": "Successful installed plugin. You have to reload the page, to see ui changes:",
"reload": "reload now", "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." "installPending": "The following plugins will be installed and after installation the scm-manager context will be restarted."
} }
}, },

2
scm-ui/src/admin/plugins/components/waitForRestart.js
View File

@@ -9,7 +9,7 @@ const waitForRestart = () => {
// we need some initial delay // we need some initial delay
if (!started) { if (!started) {
started = true; started = true;
setTimeout(executor, 100, resolve, reject); setTimeout(executor, 1000, resolve, reject);
} else { } else {
apiClient apiClient
.get("") .get("")

2
scm-webapp/src/main/java/sonia/scm/api/v2/resources/AvailablePluginResource.java
View File

@@ -75,7 +75,7 @@ public class AvailablePluginResource {
if (plugin.isPresent()) { if (plugin.isPresent()) {
return Response.ok(mapper.mapAvailable(plugin.get())).build(); return Response.ok(mapper.mapAvailable(plugin.get())).build();
} else { } else {
throw notFound(entity(InstalledPluginDescriptor.class, name)); throw notFound(entity("Plugin", name));
} }
} }

2
scm-webapp/src/main/java/sonia/scm/api/v2/resources/InstalledPluginResource.java
View File

@@ -75,7 +75,7 @@ public class InstalledPluginResource {
if (pluginDto.isPresent()) { if (pluginDto.isPresent()) {
return Response.ok(mapper.mapInstalled(pluginDto.get())).build(); return Response.ok(mapper.mapInstalled(pluginDto.get())).build();
} else { } else {
throw notFound(entity(InstalledPluginDescriptor.class, name)); throw notFound(entity("Plugin", name));
} }
} }
} }