kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fixes to BLF_locale_explode, was not handling all cases correctly (own fault) :/

Browse Source
This commit is contained in:
Bastien Montagne 2013-01-21 10:46:01 +00:00
parent 88dd983f3c
commit a679f6399f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenfont/intern/blf_lang.c
View File

@ -284,7 +284,7 @@ void BLF_locale_explode(const char *locale, char **language, char **country, cha
*language = _t;
}
else if (language) {
*language = NULL;
*language = BLI_strdup(locale);
}
}
if (country) {
@ -300,14 +300,14 @@ void BLF_locale_explode(const char *locale, char **language, char **country, cha
*variant = NULL;
}
if (language_country) {
if (m2)
*language_country = BLI_strdupn(locale, m2 - locale);
if (m1)
*language_country = m2 ? BLI_strdupn(locale, m2 - locale) : BLI_strdup(locale);
else
*language_country = NULL;
}
if (language_variant) {
if (m2)
*language_variant = m1 ? BLI_strdupcat(_t, m2 + 1) : BLI_strdup(locale);
*language_variant = m1 ? BLI_strdupcat(_t, m2) : BLI_strdup(locale);
else
*language_variant = NULL;
}