move duplicate code into called function
This commit is contained in:
parent
2aaa84ddf7
commit
54f180094a
1 changed files with 6 additions and 11 deletions
|
|
@ -679,6 +679,12 @@ static void set_current_language(void)
|
||||||
#endif
|
#endif
|
||||||
int lang, i, found;
|
int lang, i, found;
|
||||||
|
|
||||||
|
bindtextdomain("tuxpaint", LOCALEDIR);
|
||||||
|
/* Old version of glibc does not have bind_textdomain_codeset() */
|
||||||
|
#if defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >=2 || __GLIBC__ > 2
|
||||||
|
bind_textdomain_codeset("tuxpaint", "UTF-8");
|
||||||
|
#endif
|
||||||
|
textdomain("tuxpaint");
|
||||||
|
|
||||||
/* Default... */
|
/* Default... */
|
||||||
|
|
||||||
|
|
@ -1171,15 +1177,6 @@ static void setup_language(const char * const prg)
|
||||||
free(langstr);
|
free(langstr);
|
||||||
}
|
}
|
||||||
|
|
||||||
bindtextdomain("tuxpaint", LOCALEDIR);
|
|
||||||
|
|
||||||
/* Old version of glibc does not have bind_textdomain_codeset() */
|
|
||||||
#if defined __GLIBC__ && __GLIBC__ == 2 && __GLIBC_MINOR__ >=2 || __GLIBC__ > 2
|
|
||||||
bind_textdomain_codeset("tuxpaint", "UTF-8");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
textdomain("tuxpaint");
|
|
||||||
|
|
||||||
set_current_language();
|
set_current_language();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1248,8 +1245,6 @@ static TTF_Font *load_locale_font(TTF_Font *fallback)
|
||||||
putenv((char *) "OUTPUT_CHARSET=C");
|
putenv((char *) "OUTPUT_CHARSET=C");
|
||||||
setlocale(LC_ALL, "C");
|
setlocale(LC_ALL, "C");
|
||||||
|
|
||||||
bindtextdomain("tuxpaint", LOCALEDIR);
|
|
||||||
textdomain("tuxpaint");
|
|
||||||
set_current_language();
|
set_current_language();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue