From 44eea3e9ed28a68fb2fbdc684f566fcf4a85e22d Mon Sep 17 00:00:00 2001 From: Sergei Zhernosek Date: Mon, 27 Aug 2018 16:52:06 +0300 Subject: [PATCH] Use destructuring and template string for formatDuration (#720) --- snippets/formatDuration.md | 2 +- test/formatDuration/formatDuration.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/snippets/formatDuration.md b/snippets/formatDuration.md index 1be419892..ff983fff3 100644 --- a/snippets/formatDuration.md +++ b/snippets/formatDuration.md @@ -19,7 +19,7 @@ const formatDuration = ms => { }; return Object.entries(time) .filter(val => val[1] !== 0) - .map(val => val[1] + ' ' + (val[1] !== 1 ? val[0] + 's' : val[0])) + .map(([key, val]) => `${val} ${key}${val !== 1 ? 's' : ''}`) .join(', '); }; ``` diff --git a/test/formatDuration/formatDuration.js b/test/formatDuration/formatDuration.js index 0da56ed15..79014859d 100644 --- a/test/formatDuration/formatDuration.js +++ b/test/formatDuration/formatDuration.js @@ -9,7 +9,7 @@ const formatDuration = ms => { }; return Object.entries(time) .filter(val => val[1] !== 0) - .map(val => val[1] + ' ' + (val[1] !== 1 ? val[0] + 's' : val[0])) + .map(([key, val]) => `${val} ${key}${val !== 1 ? 's' : ''}`) .join(', '); }; module.exports = formatDuration;