Skip to content

Commit 074c989

Browse files
authored
Merge pull request #12204 from ethereum/intl-empty-strings
Fix fallback for locale display names
2 parents 386d5fb + d85fe5b commit 074c989

File tree

6 files changed

+8
-7
lines changed

6 files changed

+8
-7
lines changed

src/components/LanguagePicker/useLanguagePicker.tsx

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,14 @@ export const useLanguagePicker = (
7171
const fallbackSource =
7272
intlSource !== localeOption ? intlSource : englishName
7373
const i18nKey = "language-" + localeOption.toLowerCase()
74-
const i18nSource = t(i18nKey)
75-
const sourceName = i18nSource === i18nKey ? fallbackSource : i18nSource
74+
const i18nSource = t(i18nKey) // Falls back to English namespace if not found
75+
76+
// If i18nSource (fetched from `language-{locale}` in current namespace)
77+
// is not translated (output === englishName), or not available
78+
// (output === i18nKey), use the Intl.DisplayNames result as fallback
79+
const sourceName = [i18nKey, englishName].includes(i18nSource)
80+
? fallbackSource
81+
: i18nSource
7682

7783
// Get "target" display name (Language choice displayed in that language)
7884
const fallbackTarget = new Intl.DisplayNames([localeOption], {

src/intl/ar/page-languages.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"langauge-be": "البيلاروسية",
2424
"language-bg": "البلغارية",
2525
"language-bn": "البنغالية",
26-
"language-bs": "",
2726
"language-ca": "الكتالونية",
2827
"language-cs": "التشيكية",
2928
"language-da": "الدانماركية",

src/intl/fa/page-languages.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"page-languages-translated": "ترجمه‌شده",
1818
"page-languages-words": "کلمات",
1919
"page-languages-recruit-community": "به ما در ترجمه ethereum.org کمک کنید.",
20-
"langauge-am": "",
2120
"language-ar": "عربی",
2221
"language-az": "آذربایجانی",
2322
"langauge-be": "بلاروسی",

src/intl/fil/page-languages.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
"page-languages-translated": "naisalin",
1818
"page-languages-words": "mga salita",
1919
"page-languages-recruit-community": "Tulungan kaming isalin ang ethereum.org.",
20-
"langauge-am": "",
2120
"language-ar": "Arabic",
2221
"language-az": "Azerbaijani",
2322
"langauge-be": "Belarusian",

src/intl/sl/common.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@
164164
"search-box-blank-state-text": "Začnite iskati!",
165165
"search-eth-address": "To je videti kot naslov Ethereum. Ne zagotavljamo podatkov za posamezne naslove. Poskusite ga poiskati v pregledovalniku blokov, kot je",
166166
"search-no-results": "Ni rezultatov iskanja",
167-
"single-slot-finality": "",
168167
"statelessness": "Brezdomovinstvo",
169168
"see-contributors": "Pokaži sodelavce",
170169
"set-up-local-env": "Nastavitev lokalnega okolja",

src/intl/uk/page-languages.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
"language-mr": "Маратхі",
5656
"language-ms": "Малайзійська",
5757
"language-nb": "Норвезька",
58-
"language-ne-np": "",
5958
"language-nl": "Нідерландська",
6059
"language-pcm": "Нігерійський піджин",
6160
"language-fil": "Філіппінська",

0 commit comments

Comments
 (0)