LAYOUT: fixed layout bugs due to newer version of jquery

[e-DoKo.git] / include / game.php

diff --git a/include/game.php b/include/game.php
index 3890c0299b2660b377ab838a3104e8c0aa134acc..93144a6e4c9f75e0d8fb87d83f674b7fc98bc2b3 100644 (file)
--- a/include/game.php
+++ b/include/game.php
@@ -57,6 +57,9 @@ $playid   = DB_get_current_playid($gameid); /* might be -1 at beginning of the g
 
 /* get prefs and save them in a variable*/
 $PREF = DB_get_PREF(isset($_SESSION['id'])?$_SESSION['id']:$myid);
+/* set language chosen in preferences, will become active on the next reload (see index.php)*/
+$_SESSION['language'] = $PREF['language'];
+
 
 /* get rule set for this game */
 $RULES = DB_get_RULES($gameid);
@@ -323,7 +326,7 @@ if($session)
 
     /* check for solo, add game type to session number */
     echo "    Game $session.$j";
-    if($GT !='normal')
+    if($gamestatus != 'pre' && $GT !='normal' )
       echo " ($GT)";
     if(isset($_SESSION['id']) && $_SESSION['id']==$myid)
       {
@@ -2083,7 +2086,7 @@ switch($mystatus)
     /* check if game is over, display results */
     if(DB_get_game_status_by_gameid($gameid)=='play')
       {
-       echo _('The game is over for you... other people still need to play though');
+       $messages[] = _('The game is over for you... other people still need to play though');
       }
     break;
   default: