wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Changed string in options to say "reply header" instead of "reply quotes". Normalized locale in reply header when Hide timezone option is selected.

Browse source
This commit is contained in:
ndew623 2017-03-26 13:52:12 -05:00
parent aac3b69c4f
commit b1f9b9ac6c
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
k9mail/src/main/java/com/fsck/k9/message/quote/QuoteHelper.java
View file

@ -28,10 +28,15 @@ class QuoteHelper {
final int dateStyle = DateFormat.LONG;
final int timeStyle = DateFormat.LONG;
Date date = message.getSentDate();
Locale locale = resources.getConfiguration().locale;
DateFormat dateFormat = DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
DateFormat dateFormat;
Locale locale;
if (K9.hideTimeZone()) {
locale=Locale.ROOT;
dateFormat = DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
} else {
locale = resources.getConfiguration().locale;
dateFormat = DateFormat.getDateTimeInstance(dateStyle, timeStyle, locale);
}
return dateFormat.format(date);
} catch (Exception e) {

2
k9mail/src/main/res/values/strings.xml
View file

@ -342,7 +342,7 @@ Please submit bug reports, contribute new features and ask questions at
<string name="global_settings_privacy_hide_useragent">Hide mail client</string>
<string name="global_settings_privacy_hide_useragent_detail">Remove K-9 User-Agent from mail headers</string>
<string name="global_settings_privacy_hide_timezone">Hide timezone</string>
<string name="global_settings_privacy_hide_timezone_detail">Use UTC instead of local timezone in mail headers and reply quotes</string>
<string name="global_settings_privacy_hide_timezone_detail">Use UTC instead of local timezone in mail headers and reply header</string>
<string name="global_settings_notification_hide_subject_title">Hide subject in notifications</string>
<string name="global_settings_notification_hide_subject_never">Never</string>
<string name="global_settings_notification_hide_subject_when_locked">When device is locked</string>