Merge branch 'español' into HEAD

This commit is contained in:
hueso 2025-12-16 11:55:09 -03:00
commit b996ae61bd
2 changed files with 11 additions and 11 deletions

View File

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

View File

@ -28,12 +28,12 @@
#include "zones.h" #include "zones.h"
const char * watch_utility_get_weekday(watch_date_time_t date_time) { const char * watch_utility_get_weekday(watch_date_time_t date_time) {
static const char weekdays[7][3] = {"MO", "TU", "WE", "TH", "FR", "SA", "SU"}; static const char weekdays[7][3] = {"LU", "MA", "MI", "JU", "VI", "SA", "do"};
return weekdays[watch_utility_get_iso8601_weekday_number(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day) - 1]; return weekdays[watch_utility_get_iso8601_weekday_number(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day) - 1];
} }
const char * watch_utility_get_long_weekday(watch_date_time_t date_time) { const char * watch_utility_get_long_weekday(watch_date_time_t date_time) {
static const char weekdays[7][4] = {"MON", "TUE", "WED", "THU", "FRI", "SAT", "SUN"}; static const char weekdays[7][4] = {"LUN", "MAR", "MIE", "JUE", "VIE", "SAB", "DOM"};
return weekdays[watch_utility_get_iso8601_weekday_number(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day) - 1]; return weekdays[watch_utility_get_iso8601_weekday_number(date_time.unit.year + WATCH_RTC_REFERENCE_YEAR, date_time.unit.month, date_time.unit.day) - 1];
} }