English formulation fix

This has really bugged me all year - I hope I got the syntax correctly, but please fix this <3
ReCodEx · Nov 9, 2021 · 6ce5bda · 6ce5bda
1 parent 8902845
commit 6ce5bda
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js b/src/components/Assignments/Assignment/AssignmentsTable/AssignmentsTable.js
@@ -163,7 +163,7 @@ class AssignmentsTable extends Component {
                     {this.state.showAll ? (
                       <FormattedMessage
                         id="app.assignments.hidePastAssignments"
-                        defaultMessage="Total {count} {count, plural, one {assignment} other {assignments}} {count, plural, one {has} other {have}} pass the deadline. <a>Hide old assignments.</a>"
+                        defaultMessage="Total {count} {count, plural, one {assignment} other {assignments}} of which the {count, plural, one {deadline has} other {deadlines have}} passed. <a>Hide old assignments.</a>"
                         values={{
                           count: assignmentsPreprocessedAll.length - assignmentsPreprocessedCurrent.length,
                           a: content => (
@@ -176,7 +176,7 @@ class AssignmentsTable extends Component {
                     ) : (
                       <FormattedMessage
                         id="app.assignments.showHiddenPastAssignments"
-                        defaultMessage="There are {count} hidden {count, plural, one {assignment} other {assignments}} which {count, plural, one {has} other {have}} pass the deadline. <a>Show all.</a>"
+                        defaultMessage="There {count, plural, one {is} other {are}} {count} hidden {count, plural, one {assignment} other {assignments}} of which the {count, plural, one {deadline has} other {deadlines have}} passed. <a>Show all.</a>"
                         values={{
                           count: assignmentsPreprocessedAll.length - assignmentsPreprocessedCurrent.length,
                           a: content => (

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -139,13 +139,13 @@
   "app.assignments.deadline": "Deadline",
   "app.assignments.discussionModalTitle": "Public Discussion",
   "app.assignments.group": "Assigned in group",
-  "app.assignments.hidePastAssignments": "Total {count} {count, plural, one {assignment} other {assignments}} {count, plural, one {has} other {have}} pass the deadline. <a>Hide old assignments.</a>",
+  "app.assignments.hidePastAssignments": "Total {count} {count, plural, one {assignment} other {assignments}} of which the {count, plural, one {deadline has} other {deadlines have}} passed. <a>Hide old assignments.</a>",
   "app.assignments.maxPoints": "Max. Points",
   "app.assignments.maxPointsShort": "Max. points",
   "app.assignments.name": "Assignment name",
   "app.assignments.points": "Points",
   "app.assignments.secondDeadline": "Second deadline",
-  "app.assignments.showHiddenPastAssignments": "There are {count} hidden {count, plural, one {assignment} other {assignments}} which {count, plural, one {has} other {have}} pass the deadline. <a>Show all.</a>",
+  "app.assignments.showHiddenPastAssignments": "There {count, plural, one {is} other {are}} {count} hidden {count, plural, one {assignment} other {assignments}} of which the {count, plural, one {deadline has} other {deadlines have}} passed. <a>Show all.</a>",
   "app.assignmentsTable.noAssignments": "There are no assignments yet.",
   "app.assignmentsTable.noAssignmentsInAnyGroup": "This exercise has no assigments in any of the groups you can see.",
   "app.assignmentsTableRow.loading": "Loading assignments...",