summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Oliver <git@mavit.org.uk>2017-11-24 22:24:43 +0000
committerRichard Hughes <richard@hughsie.com>2017-11-30 16:55:54 +0000
commita6f4295ba012d51e7c1f676932b1a2a8062bd3f5 (patch)
treed1160c022e4e60b673e60ed99c9d038c678e69fe
parent7e597065a8024743dde63354355388e7ac7f9855 (diff)
downloadappstream-glib-a6f4295ba012d51e7c1f676932b1a2a8062bd3f5.tar.gz
Don’t fall back to en if other languages are available.
Languages may have been pre-added based on the information in `metainfo.xml` files, so just because we didn’t auto-detect a language doesn’t mean that none are present. Fixes #207.
-rw-r--r--libappstream-builder/plugins/asb-plugin-font.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libappstream-builder/plugins/asb-plugin-font.c b/libappstream-builder/plugins/asb-plugin-font.c
index eae0016..1d1ef47 100644
--- a/libappstream-builder/plugins/asb-plugin-font.c
+++ b/libappstream-builder/plugins/asb-plugin-font.c
@@ -517,7 +517,6 @@ asb_font_add_languages (AsbApp *app, const FcPattern *pattern)
FcStrSet *langs;
FcValue fc_value;
gint i;
- gboolean any_added = FALSE;
gboolean skip_langs;
skip_langs = g_getenv ("ASB_IS_SELF_TEST") != NULL;
@@ -529,7 +528,6 @@ asb_font_add_languages (AsbApp *app, const FcPattern *pattern)
FcStrListFirst (list);
while ((tmp = (const gchar*) FcStrListNext (list)) != NULL) {
as_app_add_language (AS_APP (app), 0, tmp);
- any_added = TRUE;
}
FcStrListDone (list);
FcStrSetDestroy (langs);
@@ -537,7 +535,7 @@ asb_font_add_languages (AsbApp *app, const FcPattern *pattern)
}
/* assume 'en' is available */
- if (!any_added)
+ if (g_list_length (as_app_get_languages (AS_APP (app))) == 0)
as_app_add_language (AS_APP (app), 0, "en");
}