diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml index 35a178cb..4c014676 100644 --- a/.github/release-drafter.yml +++ b/.github/release-drafter.yml @@ -1,3 +1,3 @@ _extends: .github -tag-template: git-$NEXT_PATCH_VERSION +tag-template: $NEXT_PATCH_VERSION version-template: $MAJOR.$MINOR.$PATCH diff --git a/src/main/java/hudson/plugins/jobConfigHistory/ConfigInfoCollector.java b/src/main/java/hudson/plugins/jobConfigHistory/ConfigInfoCollector.java index adf770e3..fcc88b47 100644 --- a/src/main/java/hudson/plugins/jobConfigHistory/ConfigInfoCollector.java +++ b/src/main/java/hudson/plugins/jobConfigHistory/ConfigInfoCollector.java @@ -33,8 +33,8 @@ /** * Collects all configs of a special type. For Jobs these follow the pattern: - * config-history/jobs/FOLDERNAME/JOBNAME/TIMESTAMP, where - * FOLDERNAME may be empty. + * config-history/jobs/FOLDERNAME/JOBNAME/TIMESTAMP, where + * FOLDERNAME may be empty. *

* Extracted from {@link JobConfigHistoryRootAction} for easier testability. * @@ -45,7 +45,7 @@ final class ConfigInfoCollector { /** * outparameter. */ - private final List configs = new ArrayList(); + private final List configs = new ArrayList<>(); /** * Type to collect. @@ -77,9 +77,8 @@ public ConfigInfoCollector(String type, * @param itemDir The job directory as File * @param folderName Something Jesse Glick came up with but never documented, * probably the folderName. - * @throws IOException If one of the entries cannot be read. */ - void getConfigsForType(File itemDir, String folderName) throws IOException { + void getConfigsForType(File itemDir, String folderName) { final String jobsString = "/jobs/"; final String itemName = folderName.isEmpty() ? itemDir.getName() diff --git a/src/main/java/hudson/plugins/jobConfigHistory/XmlSyntaxChecker.java b/src/main/java/hudson/plugins/jobConfigHistory/XmlSyntaxChecker.java index bceb9b59..7a1c05db 100644 --- a/src/main/java/hudson/plugins/jobConfigHistory/XmlSyntaxChecker.java +++ b/src/main/java/hudson/plugins/jobConfigHistory/XmlSyntaxChecker.java @@ -52,13 +52,13 @@ public void fatalError(SAXParseException exception) { builder.parse(xmlFile); } catch (SAXException | IOException exception) { - message[0] = exception.getClass().getSimpleName() + Messages.XmlSyntaxChecker_occuredWhile() + exception.getMessage(); + message[0] = exception.getClass().getSimpleName() + Messages.XmlSyntaxChecker_occurredWhile() + ": " + exception.getMessage(); wellFormatted[0] = false; } } catch (ParserConfigurationException exception) { - message[0] = "ParserConfigurationException" + Messages.XmlSyntaxChecker_occuredWhile() + exception.getMessage(); + message[0] = "ParserConfigurationException" + Messages.XmlSyntaxChecker_occurredWhile() + ": " + exception.getMessage(); wellFormatted[0] = false; } return new Answer(message[0], wellFormatted[0]); diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/index.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/index.jelly index cf95d5d1..232f3b43 100644 --- a/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/index.jelly +++ b/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/index.jelly @@ -1,15 +1,15 @@ - - + + - +

${%Agent Configuration History}

- + + @@ -19,11 +19,11 @@
- + @@ -84,7 +84,7 @@ - +
@@ -180,9 +180,9 @@
- + - + @@ -237,9 +237,9 @@ - + - + diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/showDiffFiles_de.properties b/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/showDiffFiles_de.properties new file mode 100644 index 00000000..bffaab2f --- /dev/null +++ b/src/main/resources/hudson/plugins/jobConfigHistory/ComputerConfigHistoryAction/showDiffFiles_de.properties @@ -0,0 +1,20 @@ +Job\ Configuration\ History=Job Konfigurationsverlauf +Agent\ Configuration\ Difference=Knoten-Konfigurations-Unterschied +Warning=Warung +Corrupt\ XML\ file(s)=Defekte XML-Datei(en) +Revision=Revision +No\ permission\ to\ view\ config\ history=Keine Berechtigung zum Anzeigen des Konfigurationsverlaufes +No\ agent\ configuration\ history\ available=Kein Knotenkonfigurationsverlauf verfügbar +Hide\ Version\ Changes=Versionsänderungen ausblenden +Show\ Version\ Changes=Versionsänderungen anzeigen +Restore\ this\ configuration=Diese Konfiguration wiederherstellen +Date=Datum +Operation=Operation +User=Benutzer +Newer\ Change=Neue Änderung +Older\ Change=Alte Änderung +No\ lines\ changed=Keine Zeilen geändert +Expand\ Diff=Diff erweitern +Shrink\ Diff=Diff verkleinern +Prev=Vorherige +Next=Nächste diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigBadgeAction/badge.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigBadgeAction/badge.jelly index bfdd30c2..ffecd15a 100644 --- a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigBadgeAction/badge.jelly +++ b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigBadgeAction/badge.jelly @@ -1,5 +1,5 @@ - + x diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistory/config.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistory/config.jelly index 39214905..bc4cd698 100644 --- a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistory/config.jelly +++ b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistory/config.jelly @@ -1,5 +1,5 @@ - + @@ -44,7 +44,7 @@ - + - - + + - +

${%Job Configuration History}

- + + @@ -20,11 +19,11 @@
${%Warning}: ${%Corrupt xml file(s)}: ${%Warning}: ${%Corrupt XML file(s)}:
- ⚠ + ❗
@@ -36,7 +36,7 @@
- ⚠ + ❗
... ... ${line.left.lineNumber}... ... ${line.left.lineNumber}
- + @@ -86,7 +85,7 @@ - +
@@ -199,9 +198,9 @@
- + - + @@ -256,9 +255,9 @@ - + - + diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/showDiffFiles_de.properties b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/showDiffFiles_de.properties new file mode 100644 index 00000000..5a315361 --- /dev/null +++ b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryProjectAction/showDiffFiles_de.properties @@ -0,0 +1,21 @@ +Job\ Configuration\ History=Job Konfigurationsverlauf +Job\ Configuration\ Difference=Job Konfigurationsunterschied +Warning=Warnung +Corrupt\ XML\ file(s)=Korrupte XML Datei(en) +Revision=Revision +No\ permission\ to\ view\ config\ history=Keine Berechtigung zum Anzeigen des Konfigurationsverlaufes +No\ job\ configuration\ history\ available=Kein Job Konfigurationsverlauf verfügbar +Hide\ Version\ Changes=Versionsänderungen ausblenden +Show\ Version\ Changes=Versionsänderungen anzeigen +Older\ Change=Alte Änderungen +Newer\ Change=Neue Änderungen +Restore\ this\ configuration=Diese Konfiguration wiederherstellen +Date=Datum +Operation=Operation +User=Benutzer +Change\ Reason=Änderungsgrund +No\ lines\ changed=Keine Zeilen geändert +Expand\ Diff=Diff erweitern +Shrink\ Diff=Diff verkleinern +Prev=Vorherige +Next=Nächste diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/history.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/history.jelly index 1ac90000..e03c1669 100644 --- a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/history.jelly +++ b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/history.jelly @@ -1,8 +1,8 @@ - - + + - + @@ -53,7 +53,7 @@ - + + @@ -23,11 +23,11 @@
${%Warning}: ${%Corrupt xml file(s)}: ${%Warning}: ${%Corrupt XML file(s)}:
- ⚠ + ❗
@@ -37,7 +36,7 @@
- ⚠ + ❗
... ... ${line.left.lineNumber}... ... ${line.left.lineNumber}
- + @@ -87,7 +87,7 @@
- +
@@ -165,9 +165,9 @@
- + - + @@ -222,9 +222,9 @@ - + - + diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/showDiffFiles_de.properties b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/showDiffFiles_de.properties new file mode 100644 index 00000000..e4a0d8bd --- /dev/null +++ b/src/main/resources/hudson/plugins/jobConfigHistory/JobConfigHistoryRootAction/showDiffFiles_de.properties @@ -0,0 +1,16 @@ +Job\ Configuration\ History=Job Konfigurationsverlauf +Back\ to\ Dashboard=Zurück zur Übersicht +Back\ to\ Overview=Zurück zur Übersicht +Configuration\ Difference=Konfigurationsunterschied +Warning=Warung +Corrupt\ XML\ files(s)=Korrupte XML-Datei(en) +Revision=Revision +No\ permission\ to\ view\ system\ changes=Keine Berechtigung zum Anzeigen von Systemänderungen +No\ permission\ to\ view\ config\ history=Keine Berechtigung zum Anzeigen des Konfigurationsverlaufes +No\ configuration\ history\ available=Kein Konfigurationsverlauf verfügbar +Hide\ Version\ Changes=Versionsänderungen ausblenden +Show\ Version\ Changes=Versionsänderungen anzeigen +Older\ Change=Alte Änderungen +Newer\ Change=Neue Änderungen +Date=Datum +No\ lines\ changed=Keine Zeilen geändert diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobLocalConfiguration/config.jelly b/src/main/resources/hudson/plugins/jobConfigHistory/JobLocalConfiguration/config.jelly index e06b9e2d..55235a51 100644 --- a/src/main/resources/hudson/plugins/jobConfigHistory/JobLocalConfiguration/config.jelly +++ b/src/main/resources/hudson/plugins/jobConfigHistory/JobLocalConfiguration/config.jelly @@ -1,7 +1,6 @@ - - + + @@ -9,11 +8,11 @@
- JobConfigHistory
change message: + ${%JobConfigHistory}
${%change message}:
diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/JobLocalConfiguration/config_de.properties b/src/main/resources/hudson/plugins/jobConfigHistory/JobLocalConfiguration/config_de.properties new file mode 100644 index 00000000..6ed3d4bc --- /dev/null +++ b/src/main/resources/hudson/plugins/jobConfigHistory/JobLocalConfiguration/config_de.properties @@ -0,0 +1,3 @@ +Job\ Config\ History=Job Konfigurationsverlauf +change\ message=Änderungsnachricht +This\ field\ cannot\ be\ empty\,\ please\ enter\ a\ valid\ notice=Dies ist ein Pflichtfeld. Bitte geben Sie eine gültige Änderungsnachricht an diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/Messages.properties b/src/main/resources/hudson/plugins/jobConfigHistory/Messages.properties index 9ffe5065..4a54b1cf 100644 --- a/src/main/resources/hudson/plugins/jobConfigHistory/Messages.properties +++ b/src/main/resources/hudson/plugins/jobConfigHistory/Messages.properties @@ -10,10 +10,10 @@ ConfigHistoryListenerHelper.anonymous=anonymous JobConfigBadgeAction.ToolTip=Config changed since last build -XmlSyntaxChecker.error=Error occurred while checking xml parsability: -XmlSyntaxChecker.warning=Warning occured while checking xml parsability: -XmlSyntaxChecker.fatalError=Fatal error occured while checking xml parsability: -XmlSyntaxChecker.occuredWhile= occured while checking xml parsability: +XmlSyntaxChecker.error=Error occurred while checking xml parsability +XmlSyntaxChecker.warning=Warning occurred while checking xml parsability +XmlSyntaxChecker.fatalError=Fatal error occurred while checking xml parsability +XmlSyntaxChecker.occurredWhile= occurred while checking xml parsability JobConfigHistory.deleteEntryPermission=DeleteEntry JobConfigHistory.deleteEntryPermissionDescription=This permission allows for deletion of history entries. diff --git a/src/main/resources/hudson/plugins/jobConfigHistory/Messages_de.properties b/src/main/resources/hudson/plugins/jobConfigHistory/Messages_de.properties new file mode 100644 index 00000000..9ed5684f --- /dev/null +++ b/src/main/resources/hudson/plugins/jobConfigHistory/Messages_de.properties @@ -0,0 +1,19 @@ +displayName=Job Konfigurationsverlauf +agentDisplayName=Knoten Konfigurationsverlauf + +ConfigHistoryListenerHelper.CREATED=Erstellt +ConfigHistoryListenerHelper.RENAMED=Umbenannt +ConfigHistoryListenerHelper.CHANGED=Geändert +ConfigHistoryListenerHelper.DELETED=Gelöscht + +ConfigHistoryListenerHelper.anonymous=anonym + +JobConfigBadgeAction.ToolTip=Die Konfiguration wurde seit dem letzten Build geändert + +XmlSyntaxChecker.error=Während der XML Syntax-Prüfung ist ein Fehler aufgetreten +XmlSyntaxChecker.warning=Während der XML Syntax-Prüfung ist eine Warnung aufgetreten +XmlSyntaxChecker.fatalError=Während der XML Syntax-Prüfung ist ein schwerwiegender Fehler aufgetreten +XmlSyntaxChecker.occurredWhile= ist während der XML Syntax-Prüfung aufgetreten + +JobConfigHistory.deleteEntryPermission=DeleteEntry +JobConfigHistory.deleteEntryPermissionDescription=Diese Berechtigung erlaubt es, einen Eintrag zu löschen. diff --git a/src/site/site.xml b/src/site/site.xml index be5cc761..8716a2d2 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -8,15 +8,15 @@ 1.1 - - + + - - + +
${%Warning}: ${%Corrupt xml file(s)}: ${%Warning}: ${%Corrupt XML file(s)}:
- ⚠ + ❗
@@ -40,7 +40,7 @@
- ⚠ + ❗
... ... ${line.left.lineNumber}... ... ${line.left.lineNumber}