From 954f38d589212753e1c767f56b3a3fed9cfacfe2 Mon Sep 17 00:00:00 2001 From: Lucas Larson Date: Fri, 14 Apr 2023 10:37:01 -0400 Subject: [PATCH] use less surprising input for clock option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit for the three clock options (no clock, a 12-hour clock, or a 24-hour clock), use the first character of the option as the input to fix #2266. This pull request is a reissue of – and supersession of – #2267, which was pushed on a branch with non-ASCII characters in the name. Signed-off-by: Lucas Larson --- internal/wizard.zsh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/wizard.zsh b/internal/wizard.zsh index c2079e5..a89b40f 100644 --- a/internal/wizard.zsh +++ b/internal/wizard.zsh @@ -1037,19 +1037,19 @@ function ask_time() { add_widget 0 flowing -c "%BShow current time?%b" add_widget 0 print add_widget 1 - add_widget 0 print -P "%B(1) No.%b" + add_widget 0 print -P "%B(n) No.%b" add_prompt time= + add_widget 0 print -P "%B(1) 12-hour format.%b" + add_prompt time=$time_12h add_widget 0 print -P "%B(2) 24-hour format.%b" add_prompt time=$time_24h - add_widget 0 print -P "%B(3) 12-hour format.%b" - add_prompt time=$time_12h add_widget 0 print -P "(r) Restart from the beginning." - ask 123r + ask n12r case $choice in r) return 1;; - 1) time=;; + n) time=;; + 1) time=$time_12h; options+='12h time';; 2) time=$time_24h; options+='24h time';; - 3) time=$time_12h; options+='12h time';; esac return 0 }