Skip to content

Commit 8cd4abe

Browse files
committed
settings [nfc]: Remove settings/languages.js.
Move the last remaining functional item in this file into its only client, `settings/LanguagePicker.js`.
1 parent f1862a3 commit 8cd4abe

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

src/settings/LanguagePicker.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ import { FlatList } from 'react-native';
55
import type { GetText } from '../types';
66
import { TranslationContext } from '../boot/TranslationProvider';
77
import { OptionDivider } from '../common';
8-
import languages from './languages';
9-
import type { Language } from './languages';
8+
import { type Language, languageData } from '../i18n/language_list';
109
import LanguagePickerItem from './LanguagePickerItem';
1110

1211
type Props = $ReadOnly<{|
@@ -15,6 +14,13 @@ type Props = $ReadOnly<{|
1514
filter: string,
1615
|}>;
1716

17+
const sortForDisplay = (arr: $ReadOnlyArray<Language>): $ReadOnlyArray<Language> =>
18+
[...arr].sort((a, b) =>
19+
a.locale === 'en' ? -1 : b.locale === 'en' ? +1 : a.name < b.name ? -1 : +1,
20+
);
21+
22+
const languages: $ReadOnlyArray<Language> = sortForDisplay(languageData);
23+
1824
export default class LanguagePicker extends PureComponent<Props> {
1925
static contextType = TranslationContext;
2026
context: GetText;

src/settings/languages.js

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)