X-Git-Url: https://git.cworth.org/git?p=lmno.games;a=blobdiff_plain;f=empathy%2Fempathy.jsx;h=163b977cbb8c474560a4dfa9cf24c1a03926e56b;hp=d7e6f6f63df15514bfcec0758616797c54655fdc;hb=f9c9dec19b3ee6e272683301d49c3add6fb176f8;hpb=34fdb156080fd1c5fead664ab06a175884e1efa5

diff --git a/empathy/empathy.jsx b/empathy/empathy.jsx
index d7e6f6f..163b977 100644
--- a/empathy/empathy.jsx
+++ b/empathy/empathy.jsx
@@ -569,19 +569,18 @@ class Ambiguities extends React.PureComponent {
       );
     }
 
-    if (this.props.players_judged.has(this.props.player.name)) {
-      return (
-        <div className="please-wait">
-          <h2>Submission received</h2>
-          <p>
-            The following players have completed judging:{' '}
-            {[...this.props.players_judged].join(', ')}
-          </p>
+    let still_waiting = null;
+    const judging_players = Object.keys(this.props.players_judging);
+    if (judging_players.length) {
+      still_waiting = (
+        <div>
           <p>
-            Still waiting for the following players:
+            Still waiting for the following player
+            {judging_players.length > 1 ? 's' : '' }
+            :
           </p>
           <ul>
-            {Object.keys(this.props.players_judging).map(player => {
+            {judging_players.map(player => {
               return (
                 <li
                   key={player}
@@ -593,6 +592,19 @@ class Ambiguities extends React.PureComponent {
               );
             })}
           </ul>
+        </div>
+      );
+    }
+
+    if (this.props.players_judged.has(this.props.player.name)) {
+      return (
+        <div className="please-wait">
+          <h2>Submission received</h2>
+          <p>
+            The following players have completed judging:{' '}
+            {[...this.props.players_judged].join(', ')}
+          </p>
+          {still_waiting}
           {move_on_button}
 
         </div>
@@ -732,19 +744,18 @@ class ActivePrompt extends React.PureComponent {
       );
     }
 
-    if (this.props.players_answered.has(this.props.player.name)) {
-      return (
-        <div className="please-wait">
-          <h2>Submission received</h2>
-          <p>
-            The following players have submitted their answers:{' '}
-            {[...this.props.players_answered].join(', ')}
-          </p>
+    let still_waiting = null;
+    const answering_players = Object.keys(this.props.players_answering);;
+    if (answering_players.length) {
+      still_waiting = (
+        <div>
           <p>
-          Still waiting for the following players:
+            Still waiting for the following player
+            {answering_players.length > 1 ? 's' : ''}
+            :
           </p>
           <ul>
-            {Object.keys(this.props.players_answering).map(player => {
+            {answering_players.map(player => {
               return (
                 <li
                   key={player}
@@ -756,6 +767,19 @@ class ActivePrompt extends React.PureComponent {
               );
             })}
           </ul>
+        </div>
+      );
+    }
+
+    if (this.props.players_answered.has(this.props.player.name)) {
+      return (
+        <div className="please-wait">
+          <h2>Submission received</h2>
+          <p>
+            The following players have submitted their answers:{' '}
+            {[...this.props.players_answered].join(', ')}
+          </p>
+          {still_waiting}
           {move_on_button}
 
         </div>
@@ -768,7 +792,8 @@ class ActivePrompt extends React.PureComponent {
         <p>
           Remember, you're trying to match your answers with
           what the other players submit.
-          Give {this.props.prompt.items} answers for the following prompt:
+          Give {this.props.prompt.items} answer
+          {this.props.prompt.items > 1 ? 's' : ''} for the following prompt:
         </p>
         <h2>{this.props.prompt.prompt}</h2>
         <form onSubmit={this.handle_submit}>