mirror/flatpak
1
0
Fork 0
mirror of https://github.com/flatpak/flatpak.git synced 2026-05-18 21:55:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

dir: Expose flatpak_get_user_locales, flatpak_get_system_locales for testing

Browse Source 
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie
2023-11-14 16:31:18 +00:00
parent 4c32ffecd5
commit 974eadafdb
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/flatpak-dir-private.h
View File

@@ -1053,4 +1053,7 @@ char ** flatpak_dir_list_unused_refs (Fla
GCancellable *cancellable,
GError **error);
const GPtrArray *flatpak_get_system_locales (void);
const GPtrArray *flatpak_get_user_locales (void);
#endif /* __FLATPAK_DIR_H__ */

16
common/flatpak-dir.c
View File

@@ -16363,8 +16363,8 @@ flatpak_dir_get_config_strv (FlatpakDir *self, char *key)
return NULL;
}
static const GPtrArray *
get_system_locales (FlatpakDir *self)
const GPtrArray *
flatpak_get_system_locales (void)
{
static GPtrArray *cached = NULL;
@@ -16399,8 +16399,8 @@ get_system_locales (FlatpakDir *self)
return (const GPtrArray *)cached;
}
static const GPtrArray *
get_user_locales (FlatpakDir *self)
const GPtrArray *
flatpak_get_user_locales (void)
{
static GPtrArray *cached = NULL;
@@ -16435,14 +16435,14 @@ flatpak_dir_get_default_locales (FlatpakDir *self)
g_auto(GStrv) locale_langs = flatpak_get_current_locale_langs ();
g_auto(GStrv) merged = NULL;
langs = get_user_locales (self);
langs = flatpak_get_user_locales ();
merged = flatpak_strv_merge (extra_languages, (char **) langs->pdata);
return sort_strv (flatpak_strv_merge (merged, locale_langs));
}
/* Then get the system default locales */
langs = get_system_locales (self);
langs = flatpak_get_system_locales ();
return sort_strv (flatpak_strv_merge (extra_languages, (char **) langs->pdata));
}
@@ -16468,14 +16468,14 @@ flatpak_dir_get_default_locale_languages (FlatpakDir *self)
g_auto(GStrv) locale_langs = flatpak_get_current_locale_langs ();
g_auto(GStrv) merged = NULL;
langs = get_user_locales (self);
langs = flatpak_get_user_locales ();
merged = flatpak_strv_merge (extra_languages, (char **) langs->pdata);
return sort_strv (flatpak_strv_merge (merged, locale_langs));
}
/* Then get the system default locales */
langs = get_system_locales (self);
langs = flatpak_get_system_locales ();
return sort_strv (flatpak_strv_merge (extra_languages, (char **) langs->pdata));
}