Merge pull request #47 from kishikawakatsumi/lang

Fix language filter duplication
kishikawakatsumi · Sep 25, 2023 · bb92e8c · bb92e8c
2 parents ce29ae1 + bd4ac86
commit bb92e8c
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 64 deletions.
diff --git a/backend/models/ios15/language_mappings.ts b/backend/models/ios15/language_mappings.ts
@@ -58,6 +58,21 @@ export const languageMapping: { [key: string]: string[] } = {
   Catalan: [
     "ca",
   ],
+  "Simplified Chinese": [
+    "zh-Hans",
+    "zh_CN",
+  ],
+  "Traditional Chinese": [
+    "zh-Hant",
+    "zh_HK",
+    "zh_TW",
+  ],
+  Cantonese: [
+    "yue_CN",
+  ],
+  Croatian: [
+    "hr",
+  ],
   Czech: [
     "cs",
   ],
@@ -84,9 +99,6 @@ export const languageMapping: { [key: string]: string[] } = {
     "hi",
     "hi_Latn",
   ],
-  Croatian: [
-    "hr",
-  ],
   Hungarian: [
     "hu",
   ],
@@ -158,16 +170,4 @@ export const languageMapping: { [key: string]: string[] } = {
   Vietnamese: [
     "vi",
   ],
-  "Simplified Chinese": [
-    "zh-Hans",
-    "zh_CN",
-  ],
-  "Traditional Chinese": [
-    "zh-Hant",
-    "zh_HK",
-    "zh_TW",
-  ],
-  Cantonese: [
-    "yue_CN",
-  ],
 };
diff --git a/backend/models/ios16/language_mappings.ts b/backend/models/ios16/language_mappings.ts
@@ -139,9 +139,6 @@ export const languageMapping: { [key: string]: string[] } = {
     "ca~applewatch",
     "ca~iphone",
   ],
-  "Central Khmer": [
-    "km",
-  ],
   Croatian: [
     "hr",
     "hr-iphoneos",
@@ -248,6 +245,9 @@ export const languageMapping: { [key: string]: string[] } = {
     "kk~applewatch",
     "kk~iphone",
   ],
+  "Central Khmer": [
+    "km",
+  ],
   Korean: [
     "ko",
     "ko-iphoneos",

diff --git a/backend/models/macos12/language_mappings.ts b/backend/models/macos12/language_mappings.ts
@@ -59,6 +59,18 @@ export const languageMapping: { [key: string]: string[] } = {
   Catalan: [
     "ca",
   ],
+  "Simplified Chinese": [
+    "zh-Hans",
+    "zh_CN",
+  ],
+  "Traditional Chinese": [
+    "zh-Hant",
+    "zh_HK",
+    "zh_TW",
+  ],
+  Cantonese: [
+    "yue-CN",
+  ],
   Croatian: [
     "hr",
   ],
@@ -204,16 +216,4 @@ export const languageMapping: { [key: string]: string[] } = {
   Vietnamese: [
     "vi",
   ],
-  "Simplified Chinese": [
-    "zh-Hans",
-    "zh_CN",
-  ],
-  "Traditional Chinese": [
-    "zh-Hant",
-    "zh_HK",
-    "zh_TW",
-  ],
-  Cantonese: [
-    "yue-CN",
-  ],
 };
diff --git a/backend/models/macos13/language_mappings.ts b/backend/models/macos13/language_mappings.ts
@@ -134,6 +134,36 @@ export const languageMapping: { [key: string]: string[] } = {
     "ca~ipad",
     "ca~iphone",
   ],
+  "Simplified Chinese": [
+    "zh-Hans",
+    "zh_CN",
+    "zh_CN-iphoneos",
+    "zh_CN-macos",
+    "zh_CN-tvos",
+    "zh_CN~applewatch",
+    "zh_CN~ipad",
+    "zh_CN~iphone",
+  ],
+  "Traditional Chinese": [
+    "zh-Hant",
+    "zh_HK",
+    "zh_HK-iphoneos",
+    "zh_HK-macos",
+    "zh_HK-tvos",
+    "zh_HK~applewatch",
+    "zh_HK~ipad",
+    "zh_HK~iphone",
+    "zh_TW",
+    "zh_TW-iphoneos",
+    "zh_TW-macos",
+    "zh_TW-tvos",
+    "zh_TW~applewatch",
+    "zh_TW~ipad",
+    "zh_TW~iphone",
+  ],
+  Cantonese: [
+    "yue-CN",
+  ],
   Croatian: [
     "hr",
     "hr-iphoneos",
@@ -421,34 +451,4 @@ export const languageMapping: { [key: string]: string[] } = {
     "vi~ipad",
     "vi~iphone",
   ],
-  "Simplified Chinese": [
-    "zh-Hans",
-    "zh_CN",
-    "zh_CN-iphoneos",
-    "zh_CN-macos",
-    "zh_CN-tvos",
-    "zh_CN~applewatch",
-    "zh_CN~ipad",
-    "zh_CN~iphone",
-  ],
-  "Traditional Chinese": [
-    "zh-Hant",
-    "zh_HK",
-    "zh_HK-iphoneos",
-    "zh_HK-macos",
-    "zh_HK-tvos",
-    "zh_HK~applewatch",
-    "zh_HK~ipad",
-    "zh_HK~iphone",
-    "zh_TW",
-    "zh_TW-iphoneos",
-    "zh_TW-macos",
-    "zh_TW-tvos",
-    "zh_TW~applewatch",
-    "zh_TW~ipad",
-    "zh_TW~iphone",
-  ],
-  Cantonese: [
-    "yue-CN",
-  ],
 };
diff --git a/frontend/templates/language-filter.html b/frontend/templates/language-filter.html
@@ -110,10 +110,6 @@
   <input id="checkbox-hindi" name="language" type="checkbox" value="Hindi">
   <label class="checkbox" for="checkbox-hindi">Hindi</label>
 </div>
-<div class="column is-1 px-1 py-0 pb-1 switch">
-  <input id="checkbox-croatian" name="language" type="checkbox" value="Croatian">
-  <label class="checkbox" for="checkbox-croatian">Croatian</label>
-</div>
 <div class="column is-1 px-1 py-0 pb-1 switch">
   <input id="checkbox-hungarian" name="language" type="checkbox" value="Hungarian">
   <label class="checkbox" for="checkbox-hungarian">Hungarian</label>