round numbers in result protocol entries

diff --git a/resources/js/components/protocol/Item.js b/resources/js/components/protocol/Item.js
index 2ea8ea77ea774e7588651ca97fe2378d9ed713b1..dba32f52a67533df289eb8ff9dd057d0b81c7976 100644 (file)
--- a/resources/js/components/protocol/Item.js
+++ b/resources/js/components/protocol/Item.js
@@ -53,13 +53,17 @@ const getEntryDescription = entry => {
                        );
                case 'result.comment': {
                        const comment = getEntryResultComment(entry);
                        );
                case 'result.comment': {
                        const comment = getEntryResultComment(entry);

+                       const number = getEntryRoundNumber(entry);

                        return <Trans i18nKey={`protocol.description.${entry.type}`}>
                        return <Trans i18nKey={`protocol.description.${entry.type}`}>

+                               {{number}}

                                <Spoiler>{{comment}}</Spoiler>,
                        </Trans>;
                }
                case 'result.report': {
                                <Spoiler>{{comment}}</Spoiler>,
                        </Trans>;
                }
                case 'result.report': {

+                       const number = getEntryRoundNumber(entry);

                        const time = getEntryResultTime(entry);
                        return <Trans i18nKey={`protocol.description.${entry.type}`}>
                        const time = getEntryResultTime(entry);
                        return <Trans i18nKey={`protocol.description.${entry.type}`}>

+                               {{number}}

                                <Spoiler>{{time}}</Spoiler>,
                        </Trans>;
                }
                                <Spoiler>{{time}}</Spoiler>,
                        </Trans>;
                }

diff --git a/resources/js/i18n/de.js b/resources/js/i18n/de.js
index 5bac532419b35fb05fb22a342ab4aa72596c63f0..fc15a690af8f24a0068b5ad9b0d844661aa78892 100644 (file)
--- a/resources/js/i18n/de.js
+++ b/resources/js/i18n/de.js
@@ -144,8 +144,8 @@ export default {
                                        rejected: 'Anmeldung von {{username}} abgelehnt',
                                },
                                result: {
                                        rejected: 'Anmeldung von {{username}} abgelehnt',
                                },
                                result: {

-                                       comment: 'Ergebnis kommentiert: <0>{{comment}}</0>',
-                                       report: 'Ergebnis von <0>{{time}}</0> eingetragen',
+                                       comment: 'Ergebnis von Runde {{number}} kommentiert: <1>{{comment}}</1>',
+                                       report: 'Ergebnis von <1>{{time}}</1> bei Runde {{number}} eingetragen',

                                },
                                round: {
                                        create: 'Runde #{{number}} hinzugefügt',
                                },
                                round: {
                                        create: 'Runde #{{number}} hinzugefügt',

diff --git a/resources/js/i18n/en.js b/resources/js/i18n/en.js
index fb050d1695235ebe9b64741bafac99699b2c3f64..0acab1a739233b89d55c4ff64c09d7b71b3a8c1f 100644 (file)
--- a/resources/js/i18n/en.js
+++ b/resources/js/i18n/en.js
@@ -144,8 +144,8 @@ export default {
                                        rejected: 'Application from {{username}} rejected',
                                },
                                result: {
                                        rejected: 'Application from {{username}} rejected',
                                },
                                result: {

-                                       comment: 'Result commented: <0>{{comment}}</0>',
-                                       report: 'Result of <0>{{time}}</0> reported',
+                                       comment: 'Result of round {{number}} commented: <1>{{comment}}</1>',
+                                       report: 'Result of <1>{{time}}</1> reported for round {{number}}',

                                },
                                round: {
                                        create: 'Round #{{number}} added',
                                },
                                round: {
                                        create: 'Round #{{number}} added',