From 89cc0422c005aa0c77c798657cece97ba4790e38 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Wed, 2 Jun 2021 12:11:47 +1000 Subject: [PATCH] Use ordinal rules for retries Make the retries read a little better by using correct ordinal rules. Apparently, this is the way to do it with modern javascript. [1] https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/PluralRules/PluralRules Change-Id: I6e38d27fb5a96ed846ad8ab611ef4890c0014c3f --- web/src/containers/status/ChangePanel.jsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web/src/containers/status/ChangePanel.jsx b/web/src/containers/status/ChangePanel.jsx index 495f37699d..64d9df9e9c 100644 --- a/web/src/containers/status/ChangePanel.jsx +++ b/web/src/containers/status/ChangePanel.jsx @@ -253,8 +253,15 @@ class ChangePanel extends React.Component { renderJob (job) { const { tenant } = this.props let job_name = job.name + let ordinal_rules = new Intl.PluralRules('en', {type: 'ordinal'}) + const suffixes = { + one: 'st', + two: 'nd', + few: 'rd', + other: 'th' + } if (job.tries > 1) { - job_name = job_name + ' (' + job.tries + '. attempt)' + job_name = job_name + ' (' + job.tries + suffixes[ordinal_rules.select(job.tries)] + ' attempt)' } let name = '' if (job.result !== null) {