X-Git-Url: https://code.wpia.club/?p=gigi.git;a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Fpages%2Fadmin%2Fsupport%2FSupportUserDetailsForm.java;h=a85952f658d5afacbf89e8c5687e6fb4ad89985a;hp=74fb02bb706f76a5fded7b5bd89a0f3b11e638a6;hb=80a10fc035deef98dc2e839ca11b68ab1a6ff80e;hpb=6b7d6a59d006d1d252ccbe86a4f5ab7099c6c002

diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
index 74fb02bb..a85952f6 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.java
@@ -75,7 +75,8 @@ public class SupportUserDetailsForm extends Form {
                 Language l = Language.getInstance(user.getTargetUser().getPreferredLocale());
                 StringBuffer body = new StringBuffer();
                 body.append(l.getTranslation("Hi,") + "\n\n");
-                body.append(l.getTranslation("A password reset was triggered. Please enter the required text sent to you by support on this page: \nhttps://"));
+                body.append(l.getTranslation("A password reset was triggered. Please enter the required text sent to you by support on this page:"));
+                body.append("\n\nhttps://");
                 body.append(ServerConstants.getWwwHostNamePortSecure() + PasswordResetPage.PATH);
                 body.append("?id=");
                 body.append(id);
@@ -85,8 +86,8 @@ public class SupportUserDetailsForm extends Form {
                 body.append("\n");
                 body.append(l.getTranslation("Best regards"));
                 body.append("\n");
-                body.append(l.getTranslation("CAcert.org Support!"));
-                Sendmail.getInstance().sendmail(user.getTargetUser().getEmail(), "[CAcert.org] " + l.getTranslation("Password reset by support."), body.toString(), "support@cacert.org", null, null, null, null, false);
+                body.append(l.getTranslation("SomeCA.org Support!"));
+                Sendmail.getInstance().sendmail(user.getTargetUser().getEmail(), "[SomeCA.org] " + l.getTranslation("Password reset by support."), body.toString(), "support@cacert.org", null, null, null, null, false);
                 out.println(Page.getLanguage(req).getTranslation("Password reset successful."));
             } catch (IOException e) {
                 e.printStackTrace();
@@ -138,7 +139,7 @@ public class SupportUserDetailsForm extends Form {
                     return false;
                 }
                 Group g = i.next();
-                vars.put("group_name", l.getTranslation("Group: " + g.getDatabaseName()));
+                vars.put("group_name", g.getName());
                 return true;
             }
         });