Fix bug in code to say French time

it was unable to say 23:45 correctly
This commit is contained in:
narspt 2021-06-03 18:02:35 +01:00 committed by GitHub
parent bbc233fcc4
commit 3a3089c629
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -618,8 +618,12 @@ wxArrayString CTimeServerThread::sendTimeFrFR(unsigned int hour, unsigned int mi
words.Add(wxT("il_est")); words.Add(wxT("il_est"));
if (min == 45U) if (min == 45U) {
if (hour == 23U)
hour = 0U;
else
hour++; hour++;
}
if (hour == 0U) { if (hour == 0U) {
words.Add(wxT("minuit")); words.Add(wxT("minuit"));
@ -660,10 +664,6 @@ wxArrayString CTimeServerThread::sendTimeFrFR(unsigned int hour, unsigned int mi
words.Add(wxT("et_demie")); words.Add(wxT("et_demie"));
} else if (min == 45U) { } else if (min == 45U) {
words.Add(wxT("moins_le_quart")); words.Add(wxT("moins_le_quart"));
if (hour == 23U)
hour = 0U;
else
hour++;
} }
return words; return words;