Merge branch 'español'

This commit is contained in:
hueso
2025-12-16 16:03:45 -03:00
2 changed files with 13 additions and 13 deletions

View File

@@ -40,20 +40,20 @@ static const char *words[12] = {
" ",
" 5",
"10",
"15",
"CU",
"20",
"25",
"30",
"35",
"Me",
"ME",
"mE",
"40",
"45",
"50",
"55",
};
static const char *past_word = " P";
static const char *to_word = " 2";
static const char *oclock_word = "OC";
static const char *past_word = " y";
static const char *to_word = " -";
static const char *oclock_word = "EP";
// sets when in the five minute period we switch
// from "X past HH" to "X to HH+1"
@@ -189,14 +189,14 @@ bool close_enough_face_loop(movement_event_t event, void *context) {
char second_word[3];
char third_word[3];
if (five_minute_period == 0) { // " HH OC",
sprintf(first_word, " ");
sprintf(second_word, "%2d", close_enough_hour);
sprintf(first_word, "%2d", close_enough_hour);
sprintf(second_word, " ");
strncpy(third_word, oclock_word, 3);
} else { // "MM P HH" or "MM 2 HH+1"
int words_length = sizeof(words) / sizeof(words[0]);
strncpy(
first_word,
third_word,
show_next_hour ?
words[words_length - five_minute_period] :
words[five_minute_period],
@@ -207,7 +207,7 @@ bool close_enough_face_loop(movement_event_t event, void *context) {
show_next_hour ? to_word : past_word,
3
);
sprintf(third_word, "%2d", close_enough_hour);
sprintf(first_word, "%2d", close_enough_hour);
}
watch_display_text_with_fallback(