From 985d0184ab1e079881a4e469c783cc381d5794bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Sat, 25 Aug 2012 00:08:55 +0200 Subject: bug 860: Reunite split up strings for translation. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Tänzer --- includes/account.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'includes/account.php') diff --git a/includes/account.php b/includes/account.php index f84eb63..32132bb 100644 --- a/includes/account.php +++ b/includes/account.php @@ -123,9 +123,9 @@ exit; } $row = mysql_fetch_assoc($res); - $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n"; - $body .= _("You are receiving this email because you or someone else")."\n"; - $body .= _("has changed the default email on your account.")."\n\n"; + $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n\n"; + $body .= _("You are receiving this email because you or someone else ". + "has changed the default email on your account.")."\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); @@ -1331,9 +1331,10 @@ where `id`='".$_SESSION['profile']['id']."'"); echo '

', _("Pass Phrase Changed Successfully"), '

', "\n"; echo _("Your Pass Phrase has been updated and your primary email account has been notified of the change."); - $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n"; - $body .= _("You are receiving this email because you or someone else")."\n"; - $body .= _("has changed the password on your account.")."\n"; + $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n\n"; + $body .= _("You are receiving this email because you or ". + "someone else has changed the password on your ". + "account.")."\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); @@ -2592,9 +2593,10 @@ printf(_("The password for %s has been updated successfully in the system."), sanitizeHTML($row['email'])); - $body = sprintf(_("Hi %s,"),$row['fname'])."\n"; - $body .= _("You are receiving this email because a CAcert administrator")."\n"; - $body .= _("has changed the password on your account.")."\n"; + $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"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); -- cgit v1.2.1 From d8f6a8160f62314dc94b9037089193d4ab295c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20T=C3=A4nzer?= Date: Tue, 30 Oct 2012 23:51:14 +0100 Subject: bug 860: Add changes requested in comment ~3277 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - add full stop at end of sentence - more sensible word wrapping Signed-off-by: Michael Tänzer --- includes/account.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'includes/account.php') diff --git a/includes/account.php b/includes/account.php index 32132bb..b137c57 100644 --- a/includes/account.php +++ b/includes/account.php @@ -1332,9 +1332,8 @@ echo '

', _("Pass Phrase Changed Successfully"), '

', "\n"; echo _("Your Pass Phrase has been updated and your primary email account has been notified of the change."); $body = sprintf(_("Hi %s,"),$_SESSION['profile']['fname'])."\n\n"; - $body .= _("You are receiving this email because you or ". - "someone else has changed the password on your ". - "account.")."\n\n"; + $body .= _("You are receiving this email because you or someone else ". + "has changed the password on your account.")."\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); @@ -2594,9 +2593,8 @@ $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"; + $body .= _("You are receiving this email because a CAcert administrator ". + "has changed the password on your account.")."\n\n"; $body .= _("Best regards")."\n"._("CAcert.org Support!"); -- cgit v1.2.1