From d275e487e62462576a1d54a4335e9c3859b1ac27 Mon Sep 17 00:00:00 2001 From: Marc Auberer Date: Sun, 6 Dec 2020 21:36:18 +0100 Subject: [PATCH] Apply minor fixes (#67) --- package.json | 12 +----------- src/app/pages/poll/poll.component.ts | 10 +++++----- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 9e679161..655e7b13 100644 --- a/package.json +++ b/package.json @@ -3,17 +3,7 @@ "version": "0.1.0", "description": "Platform for providing surveys with live display features", "main": "src/electron/main.js", - "keywords": [ - "Live", - "Poll", - "Survey", - "Question", - "Answer", - "Quiz", - "Mulitple Choice", - "Open Text", - "Rating" - ], + "keywords": ["Live", "Poll", "Survey", "Question", "Answer", "Quiz", "Mulitple Choice", "Open Text", "Rating"], "repository": "https://github.com/livepoll/live-poll", "author": "Marc Auberer", "license": "MIT", diff --git a/src/app/pages/poll/poll.component.ts b/src/app/pages/poll/poll.component.ts index 9cb65925..b809f7d9 100644 --- a/src/app/pages/poll/poll.component.ts +++ b/src/app/pages/poll/poll.component.ts @@ -280,16 +280,16 @@ export class PollComponent { switch (this.pollStatus) { case 1: { // Pending if (startDate.getTime() === 0 && endDate.getTime() === 0) return 'Manual opening, manual closing'; - if (startDate.getTime() === 0) return 'Manual opening, automatically closing at' + endDateString; - if (endDate.getTime() === 0) return 'Automatically opening at ' + startDateString + ', manual closing'; - return 'Automatically opening at ' + startDateString + ', automatically closing at ' + endDateString; + if (startDate.getTime() === 0) return 'Manual opening, auto closing at' + endDateString; + if (endDate.getTime() === 0) return 'Auto opening at ' + startDateString + ', manual closing'; + return 'Auto opening at ' + startDateString + ', auto closing at ' + endDateString; } case 2: { // Running if (endDate.getTime() === 0) return 'Running since ' + startDateString + ', manual closing'; - return 'Running since ' + startDateString + ', automatically closing at ' + endDateString; + return 'Running since ' + startDateString + ', auto closing at ' + endDateString; } case 3: { // Finished - return 'Poll ran from ' + startDateString + ' to ' + endDateString; + return 'Ran from ' + startDateString + ' to ' + endDateString; } default: return ''; // Unknown state, return empty string }