Skip to content

Next-prayer message: show time remaining, drop the timezone #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
escalopa merged 1 commit into from
Aug 3, 2026
Merged

Next-prayer message: show time remaining, drop the timezone #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion global/internal/adapter/in/telegram/commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,14 +101,32 @@ func (h *Handler) sendNext(ctx context.Context, chatID int64, locale i18n.Locale
at, found := schedule.At(prayer)
if found && at.After(now) {
return h.send(ctx, chatID, fmt.Sprintf(
locale.Message("next_prayer"), escape(locale.Prayer(prayer)), at.Format("15:04"), escape(profile.Timezone),
locale.Message("next_prayer"), escape(locale.Prayer(prayer)), at.Format("15:04"), escape(untilNext(locale, at.Sub(now))),
), mainKeyboard(locale))
}
}
}
return fmt.Errorf("could not find the next prayer")
}

// untilNext renders the localized countdown to the next prayer. Sub-minute
// remainders round up so the message never claims "0 min".
func untilNext(locale i18n.Locale, until time.Duration) string {
minutes := int((until + time.Minute - 1) / time.Minute)
if minutes < 1 {
minutes = 1
}
hours, minutes := minutes/60, minutes%60
switch {
case hours > 0 && minutes > 0:
return fmt.Sprintf(locale.Message("next_in_hm"), hours, minutes)
case hours > 0:
return fmt.Sprintf(locale.Message("next_in_h"), hours)
default:
return fmt.Sprintf(locale.Message("next_in_m"), minutes)
}
}

func (h *Handler) sendSettings(ctx context.Context, chatID int64, locale i18n.Locale) error {
profile, ok, err := h.profileOrPrompt(ctx, chatID, locale)
if err != nil || !ok {
Expand Down
18 changes: 18 additions & 0 deletions global/internal/adapter/in/telegram/ui_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,21 @@ func TestAdjustmentCallbacksStayWithinTelegramLimit(t *testing.T) {
}
}
}

func TestUntilNextRendersLocalizedCountdown(t *testing.T) {
locale := i18n.Resolve("en")
cases := []struct {
until time.Duration
want string
}{
{30 * time.Second, "in 1 min"},
{15 * time.Minute, "in 15 min"},
{90*time.Minute + time.Second, "in 1 h 31 min"},
{2 * time.Hour, "in 2 h"},
}
for _, c := range cases {
if got := untilNext(locale, c.until); got != c.want {
t.Errorf("untilNext(%v) = %q, want %q", c.until, got, c.want)
}
}
}
24 changes: 24 additions & 0 deletions global/internal/core/i18n/catalog_extensions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ func init() {
},
text: map[string]string{
"jamaat_schedule": "Pre-prayer reminder becomes a poll",
"next_in_h": "in %d h",
"next_in_m": "in %d min",
"next_in_hm": "in %d h %d min",
"jamaat_poll_question": "🕌 %s is in %d min (%s) — who is joining the jamaa'ah?",
"jamaat_join": "I'll join prayer",
"jamaat_late": "I might be late",
Expand All @@ -37,6 +40,9 @@ func init() {
buttons: map[string]string{"hijri": "🌙 تصحيح التاريخ الهجري", "prayer_reminders": "مواقيت الصلاة", "fasting_reminders": "صيام الاثنين والخميس", "kahf_reminders": "سورة الكهف يوم الجمعة", "white_days_reminders": "صيام الأيام البيض (13–15)", "jamaat_poll_reminders": "🕌 استطلاع الجماعة"},
text: map[string]string{
"jamaat_schedule": "يتحول تنبيه ما قبل الصلاة إلى استطلاع",
"next_in_h": "بعد %d س",
"next_in_m": "بعد %d د",
"next_in_hm": "بعد %d س %d د",
"jamaat_poll_question": "🕌 %s بعد %d دقيقة (%s) — من سينضم إلى الجماعة؟",
"jamaat_join": "سأنضم إلى الصلاة",
"jamaat_late": "قد أتأخر",
Expand All @@ -54,6 +60,9 @@ func init() {
buttons: map[string]string{"hijri": "🌙 Corrección de fecha hiyri", "prayer_reminders": "Horarios de oración", "fasting_reminders": "Ayuno lunes y jueves", "kahf_reminders": "Al-Kahf del viernes", "white_days_reminders": "Ayuno de los días blancos (13–15)", "jamaat_poll_reminders": "🕌 Encuesta de yamaa"},
text: map[string]string{
"jamaat_schedule": "El aviso previo se convierte en encuesta",
"next_in_h": "en %d h",
"next_in_m": "en %d min",
"next_in_hm": "en %d h %d min",
"jamaat_poll_question": "🕌 %s en %d min (%s), ¿quién se une a la oración en yamaa?",
"jamaat_join": "Me uniré a la oración",
"jamaat_late": "Podría llegar tarde",
Expand All @@ -71,6 +80,9 @@ func init() {
buttons: map[string]string{"hijri": "🌙 Correction de date hégirienne", "prayer_reminders": "Horaires de prière", "fasting_reminders": "Jeûne lundi et jeudi", "kahf_reminders": "Al-Kahf du vendredi", "white_days_reminders": "Jeûne des jours blancs (13–15)", "jamaat_poll_reminders": "🕌 Sondage jamaa"},
text: map[string]string{
"jamaat_schedule": "Le rappel préalable devient un sondage",
"next_in_h": "dans %d h",
"next_in_m": "dans %d min",
"next_in_hm": "dans %d h %d min",
"jamaat_poll_question": "🕌 %s dans %d min (%s) — qui rejoint la prière en jamaa ?",
"jamaat_join": "Je rejoindrai la prière",
"jamaat_late": "Je pourrais être en retard",
Expand All @@ -88,6 +100,9 @@ func init() {
buttons: map[string]string{"hijri": "🌙 Поправка даты Хиджры", "prayer_reminders": "Время намаза", "fasting_reminders": "Пост в понедельник и четверг", "kahf_reminders": "Аль-Кахф в пятницу", "white_days_reminders": "Пост в белые дни (13–15)", "jamaat_poll_reminders": "🕌 Опрос на джамаат"},
text: map[string]string{
"jamaat_schedule": "Напоминание перед намазом станет опросом",
"next_in_h": "через %d ч",
"next_in_m": "через %d мин",
"next_in_hm": "через %d ч %d мин",
"jamaat_poll_question": "🕌 %s через %d мин. (%s) — кто присоединится к джамаату?",
"jamaat_join": "Я присоединюсь к молитве",
"jamaat_late": "Я могу опоздать",
Expand All @@ -105,6 +120,9 @@ func init() {
buttons: map[string]string{"hijri": "🌙 Hicri tarih düzeltmesi", "prayer_reminders": "Namaz vakitleri", "fasting_reminders": "Pazartesi ve Perşembe orucu", "kahf_reminders": "Cuma Kehf Suresi", "white_days_reminders": "Beyaz günler orucu (13–15)", "jamaat_poll_reminders": "🕌 Cemaat anketi"},
text: map[string]string{
"jamaat_schedule": "Namaz öncesi hatırlatma ankete dönüşür",
"next_in_h": "%d sa sonra",
"next_in_m": "%d dk sonra",
"next_in_hm": "%d sa %d dk sonra",
"jamaat_poll_question": "🕌 %s vaktine %d dk (%s) — cemaate kim katılıyor?",
"jamaat_join": "Namaza katılacağım",
"jamaat_late": "Gecikebilirim",
Expand All @@ -122,6 +140,9 @@ func init() {
buttons: map[string]string{"hijri": "🌙 Hijriy sana tuzatishi", "prayer_reminders": "Namoz vaqtlari", "fasting_reminders": "Dushanba va payshanba ro‘zasi", "kahf_reminders": "Juma kuni Kahf surasi", "white_days_reminders": "Oq kunlar ro‘zasi (13–15)", "jamaat_poll_reminders": "🕌 Jamoat so‘rovi"},
text: map[string]string{
"jamaat_schedule": "Namozdan oldingi eslatma so‘rovnomaga aylanadi",
"next_in_h": "%d soatdan keyin",
"next_in_m": "%d daqiqadan keyin",
"next_in_hm": "%d soat %d daqiqadan keyin",
"jamaat_poll_question": "🕌 %s gacha %d daqiqa (%s) — jamoatga kim qo‘shiladi?",
"jamaat_join": "Namozga qo‘shilaman",
"jamaat_late": "Kechikishim mumkin",
Expand All @@ -139,6 +160,9 @@ func init() {
buttons: map[string]string{"hijri": "🌙 Һиҗри дата төзәтмәсе", "prayer_reminders": "Намаз вакытлары", "fasting_reminders": "Дүшәмбе һәм пәнҗешәмбе уразасы", "kahf_reminders": "Җомга Кәһф сүрәсе", "white_days_reminders": "Ак көннәр уразасы (13–15)", "jamaat_poll_reminders": "🕌 Җәмәгать сораштыруы"},
text: map[string]string{
"jamaat_schedule": "Намаз алдыннан искәртү сораштыруга әйләнә",
"next_in_h": "%d сәгатьтән соң",
"next_in_m": "%d минуттан соң",
"next_in_hm": "%d сәгать %d минуттан соң",
"jamaat_poll_question": "🕌 %s га %d минут калды (%s) — җәмәгатькә кем кушыла?",
"jamaat_join": "Мин догага кушылам",
"jamaat_late": "Соңга калырга мөмкинмен",
Expand Down
8 changes: 6 additions & 2 deletions global/internal/core/i18n/catalog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ func TestResolveNormalizesTelegramLanguageTags(t *testing.T) {
func TestLocalizedFormatStringsAcceptExpectedArguments(t *testing.T) {
samples := map[string][]any{
"location_set": {"Cairo", "Africa/Cairo", "Egyptian"},
"next_prayer": {"Fajr", "04:15", "Africa/Cairo"},
"next_prayer": {"Fajr", "04:15", "in 2 h 15 min"},
"next_in_h": {2},
"next_in_m": {15},
"next_in_hm": {2, 15},
"adjust_prayer": {"Fajr", 2},
"method_saved": {"Egyptian"},
"madhab_saved": {"Hanafi"},
Expand Down Expand Up @@ -52,7 +55,8 @@ func TestLocalesAreCompleteAndWithinTelegramLimits(t *testing.T) {
"prayer_reminders", "fasting_reminders", "kahf_reminders")
textKeys := []string{
"welcome", "location_prompt", "location_group", "location_set", "invalid_location", "need_location",
"today_title", "tomorrow_title", "next_prayer", "settings_title", "timezone", "method", "madhab",
"today_title", "tomorrow_title", "next_prayer", "next_in_h", "next_in_m", "next_in_hm",
"settings_title", "timezone", "method", "madhab",
"highlat", "adjustments", "choose_method", "choose_madhab", "choose_highlat", "choose_adjustment",
"adjust_prayer", "method_saved", "madhab_saved", "highlat_saved", "adjust_saved", "reminders_title",
"reminders_on", "reminders_off", "reminders_enabled", "reminders_disabled", "choose_language",
Expand Down