Merge pull request #857 from hackclub/fix-pluralization

Fix missing or bugged pluralizeation using lib
hackclub · Nov 25, 2024 · 8d10b87 · 8d10b87
2 parents ec20b4b + 37a56a6
commit 8d10b87
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/app/harbor/battles/battles.tsx b/src/app/harbor/battles/battles.tsx
@@ -20,6 +20,7 @@ import { HsSession } from '@/app/utils/auth'
 import SpeechToText from '@/components/speech-to-text'
 import Blessed from './blessed'
 import Cursed from './cursed'
+import pluralize from '../../../../lib/pluralize'
 
 interface Matchup {
   project1: Ships
@@ -490,8 +491,8 @@ export default function Matchups({ session }: { session: HsSession }) {
 
           {voteBalance > 0 && (
             <div className="flex justify-center items-center space-x-4">
-              {voteBalance} more vote{voteBalance == 1 ? '' : 's'} until your
-              next ship's payout!
+              {voteBalance} more {pluralize(voteBalance, 'vote', false)} until
+              your next ship's payout!
             </div>
           )}
         </header>

diff --git a/src/components/ui/ship-pill-cluster.tsx b/src/components/ui/ship-pill-cluster.tsx
@@ -3,6 +3,7 @@ import Pill from './pill'
 
 import DoubloonsImage from '/public/doubloon.svg'
 import Image from 'next/image'
+import pluralize from '../../../lib/pluralize'
 
 export default function ShipPillCluster({
   ship,
@@ -15,11 +16,12 @@ export default function ShipPillCluster({
     ? shipChains.get(ship.wakatimeProjectNames.join(','))
     : null
   const shipUpdateCount = shipUpdates ? shipUpdates.length - 1 : null
-  const unit = ship.doubloonPayout == 1 || '1' ? 'Doubloon' : 'Doubloons'
+  const roundedPayout = Math.floor(ship.doubloonPayout)
+  const roundedHr = ship.total_hours?.toFixed(1)
   return (
     <>
       {ship.shipStatus === 'shipped' ? (
-        <Pill msg={`${ship.total_hours?.toFixed(1) ?? 0} hr`} glyph="clock" />
+        <Pill msg={pluralize(roundedHr, 'hr', true)} glyph="clock" />
       ) : (
         <Pill msg="pending ship" glyph="clock" />
       )}
@@ -28,17 +30,19 @@ export default function ShipPillCluster({
         (ship.voteRequirementMet ? (
           ship.doubloonPayout != null ? (
             <Pill
-              msg={`${Math.floor(ship.doubloonPayout)} ${unit}`}
+              msg={pluralize(roundedPayout, 'doubloon', true)}
               color="green"
               glyphImage={
                 <Image src={DoubloonsImage} alt="doubloons" height={20} />
               }
             />
           ) : (
             <Pill
-              msg={`Awaiting ${10 - ship.matchups_count} more vote${
-                10 - ship.matchups_count === 1 ? '' : 's'
-              } from other pirates…`}
+              msg={`Awaiting ${10 - ship.matchups_count} more ${pluralize(
+                10 - ship.matchups_count,
+                'vote',
+                false,
+              )} from other pirates…`}
               color="blue"
               glyph="event-add"
               percentage={Math.max(ship.matchups_count * 10, 5)}
@@ -54,9 +58,7 @@ export default function ShipPillCluster({
 
       {shipUpdateCount && shipUpdateCount > 0 ? (
         <Pill
-          msg={`${shipUpdateCount} Ship update${
-            shipUpdateCount === 1 ? '' : 's'
-          }`}
+          msg={pluralize(shipUpdateCount, 'update', true)}
           color="purple"
           glyph="reply"
           glyphStyles={{ transform: 'scaleX(-1)' }}