blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

config: remove default values for this-*-time-format

Browse source 
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: aae29324fd ("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>
This commit is contained in:
Robin Jarry 2022-09-25 10:51:22 +02:00
parent 9fdc7acf5b
commit 24e30f7f1f
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
config/aerc.conf
View file

@ -35,22 +35,22 @@ timestamp-format=2006-01-02 03:04 PM
# Index-only time format for messages that were received/sent today. # Index-only time format for messages that were received/sent today.
# If this is not specified, timestamp-format is used instead. # If this is not specified, timestamp-format is used instead.
# #
# Default: "03:04 PM" (12 hour time) # Default: ""
this-day-time-format=03:04 PM #this-day-time-format=03:04 PM
# #
# Index-only time format for messages that were received/sent within the last # 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. # 7 days. If this is not specified, timestamp-format is used instead.
# #
# Default: "Monday 03:04 PM" (Week day + 12 hour time) # Default: ""
this-week-time-format=Monday 03:04 PM #this-week-time-format=Monday 03:04 PM
# #
# Index-only time format for messages that were received/sent this year. # Index-only time format for messages that were received/sent this year.
# If this is not specified, timestamp-format is used instead. # If this is not specified, timestamp-format is used instead.
# #
# Default: "January 02" (Month + month day) # Default: ""
this-year-time-format=January 02 #this-year-time-format=January 02
# #
# Width of the sidebar, including the border. # Width of the sidebar, including the border.

6
config/config.go
View file

@ -736,9 +736,9 @@ func LoadConfigFromFile(root *string, accts []string) (*AercConfig, error) {
Ui: UIConfig{ Ui: UIConfig{
IndexFormat: "%-20.20D %-17.17n %Z %s", IndexFormat: "%-20.20D %-17.17n %Z %s",
TimestampFormat: "2006-01-02 03:04 PM", TimestampFormat: "2006-01-02 03:04 PM",
ThisDayTimeFormat: "03:04 PM", ThisDayTimeFormat: "",
ThisWeekTimeFormat: "Monday 03:04 PM", ThisWeekTimeFormat: "",
ThisYearTimeFormat: "January 02", ThisYearTimeFormat: "",
ShowHeaders: []string{ ShowHeaders: []string{
"From", "To", "Cc", "Bcc", "Subject", "Date", "From", "To", "Cc", "Bcc", "Subject", "Date",
}, },

6
doc/aerc-config.5.scd
View file

@ -106,20 +106,20 @@ These options are configured in the *[ui]* section of aerc.conf.
Index-only time format for messages that were received/sent today. Index-only time format for messages that were received/sent today.
If this is not specified, *timestamp-format* is used instead. If this is not specified, *timestamp-format* is used instead.
Default: "03:04 PM" (12 hour time) Default: ""
*this-week-time-format* *this-week-time-format*
Index-only time format for messages that were received/sent within the Index-only time format for messages that were received/sent within the
last 7 days. If this is not specified, *timestamp-format* is used last 7 days. If this is not specified, *timestamp-format* is used
instead. instead.
Default: "Monday 03:04 PM" (Week day + 12 hour time) Default: ""
*this-year-time-format* *this-year-time-format*
Index-only time format for messages that were received/sent this year. Index-only time format for messages that were received/sent this year.
If this is not specified, *timestamp-format* is used instead. If this is not specified, *timestamp-format* is used instead.
Default: "January 02" (Month + month day) Default: ""
*sidebar-width* *sidebar-width*
Width of the sidebar, including the border. Set to zero to disable the Width of the sidebar, including the border. Set to zero to disable the