summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2014-11-23 15:21:16 +0100
committerBenny Baumann <BenBE@geshi.org>2014-11-23 15:21:16 +0100
commit1cc5257aba1e6ae883caf464eaadf25783d2279d (patch)
treec9274d32c2cdee6af9b7fafab759c3862f3f693f /includes
parent0bae20ba9f726c964eaee62a3b41c2da65bb8f0b (diff)
parent0950de5691c8f3e6b3115413e54d4932a2c923c7 (diff)
downloadcacert-devel-1cc5257aba1e6ae883caf464eaadf25783d2279d.tar.gz
cacert-devel-1cc5257aba1e6ae883caf464eaadf25783d2279d.tar.xz
cacert-devel-1cc5257aba1e6ae883caf464eaadf25783d2279d.zip
Merge branch 'bug-28' into release
Conflicts: includes/account.php scripts/cron/warning.php www/disputes.php www/wot.php
Diffstat (limited to 'includes')
-rw-r--r--includes/account.php4
-rw-r--r--includes/lib/l10n.php19
2 files changed, 21 insertions, 2 deletions
diff --git a/includes/account.php b/includes/account.php
index e004ce2..26845cd 100644
--- a/includes/account.php
+++ b/includes/account.php
@@ -2780,7 +2780,8 @@ function buildSubjectFromSession() {
$row = mysql_fetch_assoc(mysql_query("select * from `users` where `id`='".intval($_REQUEST['userid'])."'"));
printf(_("The password for %s has been updated successfully in the system."), sanitizeHTML($row['email']));
-
+ $my_translation = L10n::get_translation();
+ L10n::set_recipient_language(intval($_REQUEST['userid']));
$body = sprintf(_("Hi %s,"),$row['fname'])."\n\n";
$body .= _("You are receiving this email because a CAcert administrator ".
"has changed the password on your account.")."\n\n";
@@ -2789,6 +2790,7 @@ function buildSubjectFromSession() {
sendmail($row['email'], "[CAcert.org] "._("Password Update Notification"), $body,
"support@cacert.org", "", "", "CAcert Support");
+ L10n::set_translation($my_translation);
}
showfooter();
diff --git a/includes/lib/l10n.php b/includes/lib/l10n.php
index e325add..4859946 100644
--- a/includes/lib/l10n.php
+++ b/includes/lib/l10n.php
@@ -355,4 +355,21 @@ class L10n {
bindtextdomain($domain, $_SESSION['_config']['filepath'].'/locale');
textdomain($domain);
}
-} \ No newline at end of file
+
+ public static function set_recipient_language($accountid) {
+ //returns the language of a recipient to make sure that the language is correct
+ //use together with
+ $query = "select `language` from `users` where `id`='".intval($accountid)."'";
+ $res = mysql_query($query);
+ if (mysql_num_rows($res)>=0) {
+ $row = mysql_fetch_assoc($res);
+ if (NULL==$row['language'] || $row['language']=='') {
+ self::set_translation('en');
+ } else {
+ self::set_translation($row['language']);
+ }
+ } else {
+ self::set_translation('en');
+ }
+ }
+}