diff --git a/src/components/auth/AuthQrCode.tsx b/src/components/auth/AuthQrCode.tsx index e601fea16..bd2491470 100644 --- a/src/components/auth/AuthQrCode.tsx +++ b/src/components/auth/AuthQrCode.tsx @@ -1,11 +1,11 @@ import React, { - memo, useCallback, useEffect, useLayoutEffect, useRef, + memo, useCallback, useLayoutEffect, useRef, } from '../../lib/teact/teact'; import { getActions, withGlobal } from '../../global'; import type { GlobalState } from '../../global/types'; -import { DEFAULT_LANG_CODE, STRICTERDOM_ENABLED } from '../../config'; +import { STRICTERDOM_ENABLED } from '../../config'; import { disableStrict, enableStrict } from '../../lib/fasterdom/stricterdom'; import buildClassName from '../../util/buildClassName'; import { oldSetLanguage } from '../../util/oldLangProvider'; @@ -125,12 +125,6 @@ const AuthCode = ({ return undefined; }, [isConnected, authQrCode, isQrMounted, markQrMounted, unmarkQrMounted, qrCode]); - useEffect(() => { - if (isConnected) { - void oldSetLanguage(DEFAULT_LANG_CODE); - } - }, [isConnected]); - const handleLangChange = useCallback(() => { markIsLoading(); diff --git a/src/config.ts b/src/config.ts index 0be46c2ee..b7efaf536 100644 --- a/src/config.ts +++ b/src/config.ts @@ -322,7 +322,6 @@ export const DELETED_COMMENTS_CHANNEL_ID = '-1000000000777'; export const MAX_MEDIA_FILES_FOR_ALBUM = 10; export const MAX_ACTIVE_PINNED_CHATS = 5; export const SCHEDULED_WHEN_ONLINE = 0x7FFFFFFE; -export const DEFAULT_LANG_CODE = 'en'; export const LANG_PACKS = ['android', 'ios', 'tdesktop', 'macos'] as const; export const FEEDBACK_URL = 'https://bugs.telegram.org/?tag_ids=41&sort=time'; export const FAQ_URL = 'https://telegram.org/faq'; diff --git a/src/hooks/useLangString.ts b/src/hooks/useLangString.ts index fe47c3078..481e7eebd 100644 --- a/src/hooks/useLangString.ts +++ b/src/hooks/useLangString.ts @@ -17,7 +17,7 @@ export default function useLangString(key: RegularLangKey, langCode?: string) { langPack: LANG_PACK, keys: [key], }); - const langString = result?.strings[0]; + const langString = result?.strings[key]; if (!langString || typeof langString !== 'string') return undefined; return langString; }); diff --git a/src/util/oldLangProvider.ts b/src/util/oldLangProvider.ts index 1b63e1c98..ec031acae 100644 --- a/src/util/oldLangProvider.ts +++ b/src/util/oldLangProvider.ts @@ -4,7 +4,7 @@ import type { ApiOldLangPack, ApiOldLangString } from '../api/types'; import type { LangCode, TimeFormat } from '../types'; import { - DEFAULT_LANG_CODE, LANG_CACHE_NAME, LANG_PACKS, + LANG_CACHE_NAME, LANG_PACKS, } from '../config'; import { callApi } from '../api/gramjs'; import * as cacheApi from './cacheApi'; @@ -229,7 +229,7 @@ async function fetchRemote(langCode: string): Promise