From 9540a486ec858233d18fbae980a9bd7cec2fb235 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Mon, 2 Nov 2020 11:22:54 +0100 Subject: [PATCH] Fix About page crashing when instance language is not supported Use the languages defined by CLDR on server instead, and fallback to english if not defined Signed-off-by: Thomas Citharel --- js/src/graphql/admin.ts | 9 +++++++++ js/src/views/About/AboutInstance.vue | 22 ++++++++++++++++++++-- lib/graphql/resolvers/admin.ex | 16 ++++++++++++++++ lib/graphql/schema/admin.ex | 1 + 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/js/src/graphql/admin.ts b/js/src/graphql/admin.ts index b93624ebb..f6aa1978a 100644 --- a/js/src/graphql/admin.ts +++ b/js/src/graphql/admin.ts @@ -128,6 +128,15 @@ export const LANGUAGES = gql` } `; +export const LANGUAGES_CODES = gql` + query LanguagesCodes($codes: [String!]) { + languages(codes: $codes) { + code + name + } + } +`; + export const ADMIN_SETTINGS_FRAGMENT = gql` fragment adminSettingsFragment on AdminSettings { instanceName diff --git a/js/src/views/About/AboutInstance.vue b/js/src/views/About/AboutInstance.vue index fdad1e4d8..bd3139989 100644 --- a/js/src/views/About/AboutInstance.vue +++ b/js/src/views/About/AboutInstance.vue @@ -44,7 +44,7 @@ - + @@ -78,6 +78,8 @@
{{ $t("Instance languages") }}{{ formatList(config.languages.map((lang) => getLanguageNameForCode(lang))) }}{{ formattedLanguageList }}
{{ $t("Mobilizon version") }}