enable failback when empty localisation string are found

SVN revision: 35184
This commit is contained in:
Miculcy Brian 2008-07-22 13:30:25 +00:00
parent 6a87729269
commit cf33734edf
1 changed files with 4 additions and 5 deletions

View File

@ -509,29 +509,28 @@ efreet_ini_localestring_get(Efreet_Ini *ini, const char *key)
{ {
snprintf(buf, maxlen, "%s[%s_%s@%s]", key, lang, country, modifier); snprintf(buf, maxlen, "%s[%s_%s@%s]", key, lang, country, modifier);
val = efreet_ini_string_get(ini, buf); val = efreet_ini_string_get(ini, buf);
if (val) found = 1; if (val && (*val != '\0')) found = 1;
} }
if (!found && lang && country) if (!found && lang && country)
{ {
snprintf(buf, maxlen, "%s[%s_%s]", key, lang, country); snprintf(buf, maxlen, "%s[%s_%s]", key, lang, country);
val = efreet_ini_string_get(ini, buf); val = efreet_ini_string_get(ini, buf);
if (val) found = 1; if (val && (*val != '\0')) found = 1;
} }
if (!found && lang && modifier) if (!found && lang && modifier)
{ {
snprintf(buf, maxlen, "%s[%s@%s]", key, lang, modifier); snprintf(buf, maxlen, "%s[%s@%s]", key, lang, modifier);
val = efreet_ini_string_get(ini, buf); val = efreet_ini_string_get(ini, buf);
if (val) found = 1; if (val && (*val != '\0')) found = 1;
} }
if (!found && lang) if (!found && lang)
{ {
snprintf(buf, maxlen, "%s[%s]", key, lang); snprintf(buf, maxlen, "%s[%s]", key, lang);
val = efreet_ini_string_get(ini, buf); val = efreet_ini_string_get(ini, buf);
if (val) found = 1; if (val && (*val != '\0')) found = 1;
} }
if (!found) if (!found)