notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forgot to gettext() color mixer tip text fmt str

Browse source 
Forgot to wrap the color mixer's tip text printf() format string
in gettext(), which caused the static part of the text
("Your color is...") to not be translated.  h/t to Shin-ichi for
pointing it out.
This commit is contained in:
Bill Kendrick 2022-02-03 22:42:19 -08:00
parent 00b2751cdd
commit 5203c16d34
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/tuxpaint.c
View file

@ -22967,7 +22967,7 @@ static void draw_color_mixer_tooltip(void) {
{
if (used_colors_amount[0] == 1)
{
snprintf(tip_txt, sizeof(tip_txt), color_mixer_color_tips[0],
snprintf(tip_txt, sizeof(tip_txt), gettext(color_mixer_color_tips[0]),
/* Color mixer; e.g., "Your color is entirely grey." */ gettext("entirely"),
gettext(color_mixer_color_names[used_colors_color[0]]));
}
@ -22978,7 +22978,7 @@ static void draw_color_mixer_tooltip(void) {
gettext("entirely"),
used_colors_amount[0], used_colors_amount[0]);
snprintf(tip_txt, sizeof(tip_txt), color_mixer_color_tips[0],
snprintf(tip_txt, sizeof(tip_txt), gettext(color_mixer_color_tips[0]),
tip_txt_proportions[0],
gettext(color_mixer_color_names[used_colors_color[0]]));
}
@ -23013,20 +23013,20 @@ static void draw_color_mixer_tooltip(void) {
tip_txt[0] = '\0'; /* Just in case! */
if (num_colors_used == 2)
{
snprintf(tip_txt, sizeof(tip_txt), color_mixer_color_tips[num_colors_used - 1],
snprintf(tip_txt, sizeof(tip_txt), gettext(color_mixer_color_tips[num_colors_used - 1]),
tip_txt_proportions[0], gettext(color_mixer_color_names[used_colors_color[0]]),
tip_txt_proportions[1], gettext(color_mixer_color_names[used_colors_color[1]]));
}
else if (num_colors_used == 3)
{
snprintf(tip_txt, sizeof(tip_txt), color_mixer_color_tips[num_colors_used - 1],
snprintf(tip_txt, sizeof(tip_txt), gettext(color_mixer_color_tips[num_colors_used - 1]),
tip_txt_proportions[0], gettext(color_mixer_color_names[used_colors_color[0]]),
tip_txt_proportions[1], gettext(color_mixer_color_names[used_colors_color[1]]),
tip_txt_proportions[2], gettext(color_mixer_color_names[used_colors_color[2]]));
}
else if (num_colors_used == 4)
{
snprintf(tip_txt, sizeof(tip_txt), color_mixer_color_tips[num_colors_used - 1],
snprintf(tip_txt, sizeof(tip_txt), gettext(color_mixer_color_tips[num_colors_used - 1]),
tip_txt_proportions[0], gettext(color_mixer_color_names[used_colors_color[0]]),
tip_txt_proportions[1], gettext(color_mixer_color_names[used_colors_color[1]]),
tip_txt_proportions[2], gettext(color_mixer_color_names[used_colors_color[2]]),
@ -23034,7 +23034,7 @@ static void draw_color_mixer_tooltip(void) {
}
else if (num_colors_used == 5)
{
snprintf(tip_txt, sizeof(tip_txt), color_mixer_color_tips[num_colors_used - 1],
snprintf(tip_txt, sizeof(tip_txt), gettext(color_mixer_color_tips[num_colors_used - 1]),
tip_txt_proportions[0], gettext(color_mixer_color_names[used_colors_color[0]]),
tip_txt_proportions[1], gettext(color_mixer_color_names[used_colors_color[1]]),
tip_txt_proportions[2], gettext(color_mixer_color_names[used_colors_color[2]]),
@ -23043,7 +23043,7 @@ static void draw_color_mixer_tooltip(void) {
}
else if (num_colors_used == 6)
{
snprintf(tip_txt, sizeof(tip_txt), color_mixer_color_tips[num_colors_used - 1],
snprintf(tip_txt, sizeof(tip_txt), gettext(color_mixer_color_tips[num_colors_used - 1]),
tip_txt_proportions[0], gettext(color_mixer_color_names[used_colors_color[0]]),
tip_txt_proportions[1], gettext(color_mixer_color_names[used_colors_color[1]]),
tip_txt_proportions[2], gettext(color_mixer_color_names[used_colors_color[2]]),
@ -23053,6 +23053,8 @@ static void draw_color_mixer_tooltip(void) {
}
}
printf("%s\n", tip_txt);
draw_tux_text(TUX_GREAT, tip_txt, 1);
}