summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-05-01 14:48:48 +0200
committerBenny Baumann <BenBE@geshi.org>2013-05-01 14:48:48 +0200
commitf6744f8ecb4e82f88ed1e8063f7c0e13c4d41408 (patch)
tree9b1baca9f74eaba537f30366f58a0a3a5ff23ed4
parent6b97435a79acfca58d62bfab62262bde179f6fe0 (diff)
parent20163e4ce613dd0da91b11fb962a5bba31e84a67 (diff)
downloadcacert-devel-f6744f8ecb4e82f88ed1e8063f7c0e13c4d41408.tar.gz
cacert-devel-f6744f8ecb4e82f88ed1e8063f7c0e13c4d41408.tar.xz
cacert-devel-f6744f8ecb4e82f88ed1e8063f7c0e13c4d41408.zip
Merge branch 'bug-1065' into testserver-stable
-rw-r--r--www/wot.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/www/wot.php b/www/wot.php
index e44e39e..6e368fa 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -398,9 +398,10 @@ $iecho= "c";
$my_translation = L10n::get_translation();
L10n::set_translation($_SESSION['_config']['notarise']['language']);
- $body = sprintf(_("You are receiving this email because you have been assured by %s %s (%s)."), $_SESSION['profile']['fname'], $_SESSION['profile']['lname'], $_SESSION['profile']['email'])."\n\n";
+ $assurer = $_SESSION['profile']['fname'].' '.$_SESSION['profile']['lname'];
+ $body = sprintf(_("You are receiving this email because you have been assured by %s (%s)."), $assurer, $_SESSION['profile']['email'])."\n\n";
if($_POST['points'] != $newpoints)
- $body .= sprintf(_("You were issued %s points however the system has rounded this down to %s and you now have %s points in total."), $_POST['points'], $newpoints, ($newpoints + $drow['total']))."\n\n";
+ $body .= sprintf(_("You were issued %s points however the system only counts up to 100 assurance points. You now have 100 countable assurance points and %s countable expierence points."), $_POST['points'], ($newpoints + $drow['total']-100))."\n\n";
else
$body .= sprintf(_("You were issued %s points and you now have %s points in total."), $newpoints, ($newpoints + $drow['total']))."\n\n";
@@ -428,11 +429,12 @@ $iecho= "c";
L10n::set_translation($my_translation);
- $body = sprintf(_("You are receiving this email because you have assured %s %s (%s)."), $_SESSION['_config']['notarise']['fname'], $_SESSION['_config']['notarise']['lname'], $_SESSION['_config']['notarise']['email'])."\n\n";
+ $assuree = $_SESSION['_config']['notarise']['fname'].' '.$_SESSION['_config']['notarise']['lname'];
+ $body = sprintf(_("You are receiving this email because you have assured %s (%s)."), $assuree, $_SESSION['_config']['notarise']['email'])."\n\n";
if($_POST['points'] != $newpoints)
- $body .= sprintf(_("You issued %s points however the system has rounded this down to %s and they now have %s points in total."), $_POST['points'], $newpoints, ($newpoints + $drow['total']))."\n\n";
+ $body .= sprintf(_("You issued %s points however the system only counts up to 100 assurance points. %s has now 100 countable assurance points and %s countable expierence points."), $_POST['points'], $assuree, ($newpoints + $drow['total']-100))."\n\n";
else
- $body .= sprintf(_("You issued %s points and they now have %s points in total."), $newpoints, ($newpoints + $drow['total']))."\n\n";
+ $body .= sprintf(_("You issued %s points and %s now has %s points in total."), $newpoints, $assuree, ($newpoints + $drow['total']))."\n\n";
if($_SESSION['profile']['board'] == 1 && intval($_POST['expire']) > 0)
$body .= sprintf(_("Please Note: this is a temporary increase for %s days only. After that time their points will be reduced to 150 points."), intval($_POST['expire']))."\n\n";