mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added alternative re/fwd texts

This commit is contained in:
M66B 2021-04-11 09:22:24 +02:00
parent 13c744e74e
commit 8c8ac653e7
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@ -3819,9 +3819,12 @@ public class FragmentCompose extends FragmentBase {
// Subject
String subject = (ref.subject == null ? "" : ref.subject);
if ("reply".equals(action) || "reply_all".equals(action)) {
if (prefix_once)
if (prefix_once) {
for (String re : Helper.getStrings(context, ref.language, R.string.title_subject_reply, ""))
subject = unprefix(subject, re);
for (String re : Helper.getStrings(context, ref.language, R.string.title_subject_reply_alt, ""))
subject = unprefix(subject, re);
}
data.draft.subject = Helper.getString(context, ref.language, R.string.title_subject_reply, subject);
String t = args.getString("text");
@ -3836,9 +3839,12 @@ public class FragmentCompose extends FragmentBase {
document.body().appendChild(div);
}
} else if ("forward".equals(action)) {
if (prefix_once)
if (prefix_once) {
for (String fwd : Helper.getStrings(context, ref.language, R.string.title_subject_forward, ""))
subject = unprefix(subject, fwd);
for (String fwd : Helper.getStrings(context, ref.language, R.string.title_subject_forward_alt, ""))
subject = unprefix(subject, fwd);
}
data.draft.subject = Helper.getString(context, ref.language, R.string.title_subject_forward, subject);
} else if ("editasnew".equals(action)) {
if (ref.from != null && ref.from.length == 1) {

3
app/src/main/res/values/strings.xml
View File

@ -863,6 +863,9 @@
<string name="title_subject_reply">Re: %1$s</string>
<string name="title_subject_forward">Fwd: %1$s</string>
<string name="title_subject_reply_alt">Re: %1$s</string>
<string name="title_subject_forward_alt">Fwd: %1$s</string>
<string name="title_seen">Mark read</string>
<string name="title_unseen">Mark unread</string>
<string name="title_toggle_seen">Toggle read</string>