Util: Get rid of language matching

2 files changed, 0 insertions, 94 deletions

diff --git a/internal/util/util.go b/internal/util/util.go
index 907f85f..ebda183 100644
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -55,53 +55,3 @@ func ReplaceWAYF(template string, authURL string, orgID string) string {
 	template = strings.Replace(template, "@ORG_ID@", url.QueryEscape(orgID), 1)
 	return template
 }
-
-// GetLanguageMatched uses a map from language tags to strings to extract the right language given the tag
-// It implements it according to https://github.com/eduvpn/documentation/blob/dc4d53c47dd7a69e95d6650eec408e16eaa814a2/SERVER_DISCOVERY.md#language-matching
-func GetLanguageMatched(langMap map[string]string, langTag string) string {
-	// If no map is given, return the empty string
-	if len(langMap) == 0 {
-		return ""
-	}
-	// Try to find the exact match
-	if val, ok := langMap[langTag]; ok {
-		return val
-	}
-	// Try to find a key that starts with the OS language setting
-	for k := range langMap {
-		if strings.HasPrefix(k, langTag) {
-			return langMap[k]
-		}
-	}
-	// Try to find a key that starts with the first part of the OS language (e.g. de-)
-	pts := strings.Split(langTag, "-")
-	// We have a "-"
-	if len(pts) > 1 {
-		for k := range langMap {
-			if strings.HasPrefix(k, pts[0]+"-") {
-				return langMap[k]
-			}
-		}
-	}
-	// search for just the language (e.g. de)
-	for k := range langMap {
-		if k == pts[0] {
-			return langMap[k]
-		}
-	}
-
-	// Pick one that is deemed best, e.g. en-US or en, but note that not all languages are always available!
-	// We force an entry that is english exactly or with an english prefix
-	for k := range langMap {
-		if k == "en" || strings.HasPrefix(k, "en-") {
-			return langMap[k]
-		}
-	}
-
-	// Otherwise just return one
-	for k := range langMap {
-		return langMap[k]
-	}
-
-	return ""
-}
diff --git a/internal/util/util_test.go b/internal/util/util_test.go
index c3d1cee..5e19f57 100644
--- a/internal/util/util_test.go
+++ b/internal/util/util_test.go
@@ -65,47 +65,3 @@ func TestReplaceWAYF(t *testing.T) {
 		t.Fatalf("Got: %s, want: %s", replaced, wantReplaced)
 	}
 }
-
-func TestGetLanguageMatched(t *testing.T) {
-	// exact match
-	returned := GetLanguageMatched(map[string]string{"en": "test", "de": "test2"}, "en")
-	if returned != "test" {
-		t.Fatalf("Got: %s, want: %s", returned, "test")
-	}
-
-	// starts with language tag
-	returned = GetLanguageMatched(map[string]string{"en-US-test": "test", "de": "test2"}, "en-US")
-	if returned != "test" {
-		t.Fatalf("Got: %s, want: %s", returned, "test")
-	}
-
-	// starts with en-
-	returned = GetLanguageMatched(map[string]string{"en-UK": "test", "en": "test2"}, "en-US")
-	if returned != "test" {
-		t.Fatalf("Got: %s, want: %s", returned, "test")
-	}
-
-	// exact match for en
-	returned = GetLanguageMatched(map[string]string{"de": "test", "en": "test2"}, "en-US")
-	if returned != "test2" {
-		t.Fatalf("Got: %s, want: %s", returned, "test2")
-	}
-
-	// We default to english
-	returned = GetLanguageMatched(map[string]string{"es": "test", "en": "test2"}, "nl-NL")
-	if returned != "test2" {
-		t.Fatalf("Got: %s, want: %s", returned, "test2")
-	}
-
-	// We default to english with a - as well
-	returned = GetLanguageMatched(map[string]string{"est": "test", "en-": "test2"}, "en-US")
-	if returned != "test2" {
-		t.Fatalf("Got: %s, want: %s", returned, "test2")
-	}
-
-	// None found just return one
-	returned = GetLanguageMatched(map[string]string{"es": "test"}, "en-US")
-	if returned != "test" {
-		t.Fatalf("Got: %s, want: %s", returned, "test")
-	}
-}