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

Updated texts

This commit is contained in:
M66B 2019-08-20 16:52:02 +02:00
parent 29578dd25c
commit 4c90be2192
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -234,7 +234,7 @@ public class FragmentCompose extends FragmentBase {
style = prefs.getBoolean("style_toolbar", true);
setTitle(R.string.page_compose);
setSubtitle(R.string.page_compose_message);
setSubtitle(getResources().getQuantityString(R.plurals.page_message, 1));
}
@Override

34
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -299,22 +299,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
primary = args.getLong("primary", -1);
connected = args.getBoolean("connected", false);
if (TextUtils.isEmpty(query))
if (thread == null) {
if (folder < 0)
viewType = AdapterMessage.ViewType.UNIFIED;
else
viewType = AdapterMessage.ViewType.FOLDER;
setTitle(getResources().getQuantityString(R.plurals.page_conversation, 10));
} else {
viewType = AdapterMessage.ViewType.THREAD;
setTitle(getResources().getQuantityString(R.plurals.page_conversation, 1));
}
else {
viewType = AdapterMessage.ViewType.SEARCH;
setTitle(R.string.title_search);
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
swipenav = prefs.getBoolean("swipenav", true);
@ -330,6 +314,24 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
colorPrimary = Helper.resolveColor(getContext(), R.attr.colorPrimary);
colorAccent = Helper.resolveColor(getContext(), R.attr.colorAccent);
if (TextUtils.isEmpty(query))
if (thread == null) {
if (folder < 0)
viewType = AdapterMessage.ViewType.UNIFIED;
else
viewType = AdapterMessage.ViewType.FOLDER;
setTitle(getResources().getQuantityString(
threading ? R.plurals.page_conversation : R.plurals.page_message, 10));
} else {
viewType = AdapterMessage.ViewType.THREAD;
setTitle(getResources().getQuantityString(
threading ? R.plurals.page_conversation : R.plurals.page_message, 1));
}
else {
viewType = AdapterMessage.ViewType.SEARCH;
setTitle(R.string.title_search);
}
}
@Override

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

@ -23,9 +23,13 @@
<item quantity="other">Conversations</item>
</plurals>
<plurals name="page_message">
<item quantity="one">Message</item>
<item quantity="other">Messages</item>
</plurals>
<string name="page_folders">Folders</string>
<string name="page_compose">Compose</string>
<string name="page_compose_message">Message</string>
<string name="tile_synchronize">Synchronize</string>
<string name="tile_unseen">New messages</string>