From 1653a8f4996be297ec1a26a3877b2927fdd2ba57 Mon Sep 17 00:00:00 2001 From: William Kendrick Date: Tue, 5 Aug 2003 07:40:53 +0000 Subject: [PATCH] Added ".UTF8" to Russian locale request. Support for "--lang russkiy" to get Russian, too. --- docs/CHANGES.txt | 3 +++ src/manpage/tuxpaint.1 | 2 +- src/tuxpaint.c | 13 +++++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index c5395fe7b..9d5c49d0e 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -66,6 +66,9 @@ http://www.newbreedsoftware.com/tuxpaint/ * (About to be) translated to Russian Dmitriy Ivanov + * Fixed prompt bug for larger window sizes + TOYAMA Shin-ichi + 2003.Jun.17 (0.9.11) * Windows bugfixes. diff --git a/src/manpage/tuxpaint.1 b/src/manpage/tuxpaint.1 index 65e4a2856..e6ef2ed91 100644 --- a/src/manpage/tuxpaint.1 +++ b/src/manpage/tuxpaint.1 @@ -292,7 +292,7 @@ portuguese | portugues romanian .TP 2 - -russian +russian | russkiy .TP 2 - spanish | espanol diff --git a/src/tuxpaint.c b/src/tuxpaint.c index acb1ca62c..d678260dc 100644 --- a/src/tuxpaint.c +++ b/src/tuxpaint.c @@ -3391,7 +3391,7 @@ void show_usage(FILE * f, char * prg) " polish polski\n" " portuguese portugues\n" " romanian\n" - " russian\n" + " russian russkiy\n" " slovak\n" " spanish espanol\n" " swedish svenska\n" @@ -3997,10 +3997,11 @@ void setup(int argc, char * argv[]) putenv("LANG=ro_RO"); putenv("LC_ALL=ro_RO"); } - else if (strcmp(langstr, "russian") == 0) + else if (strcmp(langstr, "russian") == 0 || + strcmp(langstr, "russkiy") == 0) { - putenv("LANG=ru_RU"); - putenv("LC_ALL=ru_RU"); + putenv("LANG=ru_RU.UTF-8"); + putenv("LC_ALL=ru_RU.UTF-8"); } else if (strcmp(langstr, "slovak") == 0) { @@ -7531,7 +7532,7 @@ int do_prompt(char * text, char * btn_yes, char * btn_no) /* Draw the question: */ wordwrap_text(font, text, black, - 166 + PROMPTOFFSETX, 100 + PROMPTOFFSETY, 475, 0, 0, 1); + 166 + PROMPTOFFSETX, 100 + PROMPTOFFSETY, 475 + PROMPTOFFSETX, 0, 0, 1); /* Draw yes button: */ @@ -7541,7 +7542,7 @@ int do_prompt(char * text, char * btn_yes, char * btn_no) SDL_BlitSurface(img_yes, NULL, screen, &dest); wordwrap_text(font, btn_yes, black, 166 + PROMPTOFFSETX + 48 + 4, - 183 + PROMPTOFFSETY, 475, 0, 0, 1); + 183 + PROMPTOFFSETY, 475 + PROMPTOFFSETX, 0, 0, 1); /* Draw no button: */