From 5d45846fdd21d8b25a83755f1f683be4521d7804 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Mon, 29 Aug 2022 07:39:25 +0200
Subject: [PATCH] Prevent panic in locale/LocalizedList fn

---
 pkg/locale/service.go | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkg/locale/service.go b/pkg/locale/service.go
index 9e0b8a1af..2e18f3ec0 100644
--- a/pkg/locale/service.go
+++ b/pkg/locale/service.go
@@ -331,14 +331,19 @@ func (svc *service) LocalizedList(ctx context.Context) []*Language {
 		}
 
 		l = &Language{
-			Tag:           l.Tag,
-			Name:          l.Name,
-			LocalizedName: display.Languages(reqLang).Name(l.Tag),
+			Tag:  l.Tag,
+			Name: l.Name,
+		}
+
+		if nl := display.Languages(reqLang); nl != nil {
+			l.LocalizedName = nl.Name(l.Tag)
 		}
 
 		if l.Name == "" {
-			// for cases when language name is not configured
-			l.Name = display.Languages(l.Tag).Name(l.Tag)
+			if nl := display.Languages(l.Tag); nl != nil {
+				// for cases when language name is not configured
+				l.Name = nl.Name(l.Tag)
+			}
 		}
 
 		ll = append(ll, l)