X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=e-DoKo.git;a=blobdiff_plain;f=digest.php;h=284f61bc61bf516f333835ed5320e05fd6d4ceda;hp=07625192fd57e90ca9f18d69f1d1459c8bb12e3a;hb=be205de31c62e22c4347e2c3514efe945645d946;hpb=1e258af4136567ab30ce9b54aee751077f80590e

diff --git a/digest.php b/digest.php
index 0762519..284f61b 100644
--- a/digest.php
+++ b/digest.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012 Arun Persaud <arun@nubati.net>
+/* Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Arun Persaud <arun@nubati.net>
  *
  *   This file is part of e-DoKo.
  *
@@ -53,21 +53,7 @@ foreach($users as $uid)
     $PREF = DB_get_PREF($uid);
 
     // set users language preference
-    $language = $PREF['language'];
-
-    switch($language)
-      {
-      case 'de':
-	putenv("LC_ALL=de_DE");
-	setlocale(LC_ALL, "de_DE");
-	// Specify location of translation tables
-	bindtextdomain("edoko", "./locale");
-	// Choose domain
-	textdomain("edoko");
-	break;
-      default:
-	/* do nothing */
-      }
+    set_language($PREF['language']);
 
     // calculate mod by digest-time
     switch($PREF['digest'])
@@ -105,6 +91,16 @@ foreach($users as $uid)
 	// get messages
 	$messages = DB_get_digest_message_by_email($email);
 
+	// check messages for outdated ones and delete those
+	foreach ($messages as $key=>$mess)
+	  {
+	    if($mess[2] == 'your_turn' && $uid != DB_get_player_by_gameid($mess[3]) )
+	      {
+		DB_digest_delete_message($mess[0]);
+		unset($messages[$key]);
+	      }
+	  }
+
 	// add them together
 	if(sizeof($messages))
 	  {
@@ -120,14 +116,14 @@ foreach($users as $uid)
 
 	    // add header, footer, sent out
 	    $name    = DB_get_name('userid',$uid);
-	    $header  = "Hello $name\n\nHere is a digest of the latest emails:\n\n";
+	    $header  = _("Hello")." $name\n\n"._("Here is a digest of the latest emails:")."\n\n";
 
-	    $footer  = "\nHave a nice day\n".
-	      "   your E-Doko digester\n\n".
+	    $footer  = "\n"._('Have a nice day')."\n".
+	      "   ".('your E-Doko digester')."\n\n".
 	      "-- \n".
-	      "You can change your mail delivery mode in the preference menu.\n".
-	      'web: http://doko.nubati.net   '.
-	      "help, bugs, etc.: $WIKI";
+	      _('You can change your mail delivery mode in the preference menu.')."\n".
+	      _('web').': http://doko.nubati.net   '.
+	      _('help, bugs, etc.').": $WIKI";
 
 	    $subject = "$EmailName Digest";