diff options
| author | Robin Jarry <robin@jarry.cc> | 2022-09-25 10:51:22 +0200 |
|---|---|---|
| committer | Robin Jarry <robin@jarry.cc> | 2022-09-25 11:42:05 +0200 |
| commit | 24e30f7f1fd4d4f35a46b613b941c83d84dea8e8 (patch) | |
| tree | 0c723d92a93f73b6a71bafc4c0f726f315dfbebe /config | |
| parent | 9fdc7acf5b4842b95ab2b53c9baf69ab085b9e79 (diff) | |
| download | aerc-24e30f7f1fd4d4f35a46b613b941c83d84dea8e8.tar.gz | |
config: remove default values for this-*-time-format
Having a default value is confusing because to disable the dynamic time
format, the users need to explicitly configure these settings to the
empty string.
Do not set default values for these settings when they are unset in the
configuration. Comment the default config file values to serve as
examples.
Fixes: aae29324fdf5 ("config: fix default time format values")
Reported-by: Nicolai Dagestad <nicolai@dagestad.fr>
Signed-off-by: Robin Jarry <robin@jarry.cc>
Acked-by: Moritz Poldrack <moritz@poldrack.dev>
Diffstat (limited to 'config')
| -rw-r--r-- | config/aerc.conf | 12 | ||||
| -rw-r--r-- | config/config.go | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/config/aerc.conf b/config/aerc.conf index 6208f5d8..316e7f33 100644 --- a/config/aerc.conf +++ b/config/aerc.conf @@ -35,22 +35,22 @@ timestamp-format=2006-01-02 03:04 PM # Index-only time format for messages that were received/sent today. # If this is not specified, timestamp-format is used instead. # -# Default: "03:04 PM" (12 hour time) -this-day-time-format=03:04 PM +# Default: "" +#this-day-time-format=03:04 PM # # Index-only time format for messages that were received/sent within the last # 7 days. If this is not specified, timestamp-format is used instead. # -# Default: "Monday 03:04 PM" (Week day + 12 hour time) -this-week-time-format=Monday 03:04 PM +# Default: "" +#this-week-time-format=Monday 03:04 PM # # Index-only time format for messages that were received/sent this year. # If this is not specified, timestamp-format is used instead. # -# Default: "January 02" (Month + month day) -this-year-time-format=January 02 +# Default: "" +#this-year-time-format=January 02 # # Width of the sidebar, including the border. diff --git a/config/config.go b/config/config.go index 61ee3b3f..24a1b507 100644 --- a/config/config.go +++ b/config/config.go @@ -736,9 +736,9 @@ func LoadConfigFromFile(root *string, accts []string) (*AercConfig, error) { Ui: UIConfig{ IndexFormat: "%-20.20D %-17.17n %Z %s", TimestampFormat: "2006-01-02 03:04 PM", - ThisDayTimeFormat: "03:04 PM", - ThisWeekTimeFormat: "Monday 03:04 PM", - ThisYearTimeFormat: "January 02", + ThisDayTimeFormat: "", + ThisWeekTimeFormat: "", + ThisYearTimeFormat: "", ShowHeaders: []string{ "From", "To", "Cc", "Bcc", "Subject", "Date", }, |