]>
Commit | Line | Data |
---|---|---|
4d1bed36 | 1 | --- poldek-0.30-cvs20080820.23/pkgdir/pndir/description.c.old 2008-12-09 16:11:51.000000000 +0100 |
2 | +++ poldek-0.30-cvs20080820.23/pkgdir/pndir/description.c 2008-12-09 16:11:57.000000000 +0100 | |
3 | @@ -162,10 +162,8 @@ struct pkguinf *pndir_load_pkguinf(tn_al | |
4 | if (pkgu && langs) { | |
5 | int i; | |
6 | ||
7 | - /* start from the end => the last loaded one will be set as | |
8 | - pkguinf default (see pkguinf_restore_i18n()) */ | |
9 | - for (i = n_array_size(langs) - 1; i >= 0; i--) { | |
10 | - const char *lang, *loaded_lang = NULL; | |
11 | + for (i = 0; i < n_array_size(langs); i++) { | |
12 | + const char *lang, *loaded_lang; | |
13 | struct tndb *db; | |
14 | char lang_utf8[32]; | |
15 | char dkey[512]; | |
16 | @@ -178,19 +176,19 @@ struct pkguinf *pndir_load_pkguinf(tn_al | |
17 | if ((db = pndir_db_dscr_h_get(db_dscr_h, lang)) == NULL) | |
18 | continue; | |
19 | ||
20 | - n_snprintf(lang_utf8, sizeof(lang_utf8), "%s.UTF-8", lang); | |
21 | - loaded_lang = lang_utf8; | |
22 | - | |
23 | - dklen = n_snprintf(dkey, sizeof(dkey), "%s%s", key, lang_utf8); | |
24 | + dklen = n_snprintf(dkey, sizeof(dkey), "%s%s", key, lang); | |
25 | vlen = tndb_get(db, dkey, dklen, val, sizeof(val)); | |
26 | - | |
27 | - if (vlen == 0) { /* not exists */ | |
28 | - dklen = n_snprintf(dkey, sizeof(dkey), "%s%s", key, lang); | |
29 | + loaded_lang = lang; | |
30 | + | |
31 | +/* | |
32 | + if (vlen == 0) { | |
33 | + n_snprintf(lang_utf8, sizeof(lang_utf8), "%s.UTF-8", lang); | |
34 | + loaded_lang = lang_utf8; | |
35 | + dklen = n_snprintf(dkey, sizeof(dkey), "%s%s", key, lang_utf8); | |
36 | vlen = tndb_get(db, dkey, dklen, val, sizeof(val)); | |
37 | - loaded_lang = lang; | |
38 | } | |
39 | - | |
40 | - DBGF("ld %s: %s (%d)\n", pkg_id(pkg), loaded_lang ? loaded_lang : lang, vlen); | |
41 | +*/ | |
42 | + DBGF("ld %s: %s (%d)\n", pkg_id(pkg), loaded_lang, vlen); | |
43 | ||
44 | if (vlen > 0) { | |
45 | tn_buf_it it; |