diff --git a/config/locales/names.yml b/config/locales/names.yml
index 2692cbe0416..66409176d97 100644
--- a/config/locales/names.yml
+++ b/config/locales/names.yml
@@ -62,7 +62,7 @@ bo:
 br:
   name: Breton
   nativeName: brezhoneg
-bs:
+bs_BA:
   name: Bosnian
   nativeName: bosanski jezik
 ca:
@@ -128,7 +128,7 @@ et:
 eu:
   name: Basque
   nativeName: euskara
-fa:
+fa_IR:
   name: Persian
   nativeName: فارسی
 ff:
@@ -335,7 +335,7 @@ my:
 na:
   name: Nauru
   nativeName: Ekakairũ Naoero
-nb:
+nb_NO:
   name: Norwegian Bokmål
   nativeName: Norsk bokmål
 nd:
@@ -386,7 +386,7 @@ pa:
 pi:
   name: Pāli
   nativeName: पाऴि
-pl:
+pl_PL:
   name: Polish
   nativeName: polski
 ps:
@@ -497,7 +497,7 @@ tn:
 to:
   name: Tonga
   nativeName: faka Tonga
-tr:
+tr_TR:
   name: Turkish
   nativeName: Türkçe
 ts:
@@ -551,12 +551,12 @@ yo:
 za:
   name: Zhuang
   nativeName: Saɯ cueŋƅ
-zh:
-  name: Chinese
-  nativeName: 简体中文
 zh_TW:
   name: Chinese
   nativeName: 繁體中文
+zh_CN:
+  name: Chinese Simplified
+  nativeName: 简体中文
 zu:
   name: Zulu
   nativeName: isiZulu
diff --git a/spec/models/locale_site_setting_spec.rb b/spec/models/locale_site_setting_spec.rb
index 87d555e8986..90509efc874 100644
--- a/spec/models/locale_site_setting_spec.rb
+++ b/spec/models/locale_site_setting_spec.rb
@@ -108,4 +108,12 @@ RSpec.describe LocaleSiteSetting do
       expect(LocaleSiteSetting.fallback_locale("en_GB")).to eq(:en)
     end
   end
+
+  describe ".supported_locales" do
+    it "has a language name for each supported locale" do
+      LocaleSiteSetting.supported_locales.each do |locale|
+        expect(LocaleSiteSetting.language_names[locale]).to be_present
+      end
+    end
+  end
 end