From c2cd61c679b5cd771ffe3842a14faa7fbad8c7eb Mon Sep 17 00:00:00 2001 From: Mekan1206 Date: Wed, 17 Sep 2025 19:25:49 +0500 Subject: [PATCH] Refactor localization and simplify HomeScreen functionality - Removed English and Russian localization files, focusing solely on Turkmen. - Simplified language initialization in i18n.ts to default to Turkmen. - Cleaned up HomeScreen by removing modal for language selection and related state management. --- .i18n.ts.swp | Bin 0 -> 12288 bytes app/(tabs)/home.tsx | 28 +---------------------- i18n.ts | 17 ++------------ locales/en.json | 53 -------------------------------------------- locales/ru.json | 53 -------------------------------------------- 5 files changed, 3 insertions(+), 148 deletions(-) create mode 100644 .i18n.ts.swp delete mode 100644 locales/en.json delete mode 100644 locales/ru.json diff --git a/.i18n.ts.swp b/.i18n.ts.swp new file mode 100644 index 0000000000000000000000000000000000000000..ebf6518819c33dbb8ca0d985c1a888e451fda816 GIT binary patch literal 12288 zcmeI&F-sgl6bJBkNo^9$7kDwnDdcuNZ6b#$ECeA3X_8Wy+Z(;T-JMx>XGzR)rc0A= zphc=Qeg;E|bbgEICrB5;B5&3eMYu{3g#W;wy<_G*W`A(S-p*k8!&aZyf@PBNjOg$0 zlhM)YugBf(7G)|LSexX9^^>zlf8$-JuSVIP3sPlfuiL+F7)Exe!zwFON9B1KcVC;p zm9tAR0|5x!SzwM_(d9Kzv;$Ps{#{yEbZ&>P?lV0~ICG%N3RGUC!Ow z2Thm!7G3g+n!QK^sWAE@Z*|S$L|SI`ow { if (!lang) return; - setModalVisible(false); if (lang === i18n.locale.substring(0, 2)) return; await AsyncStorage.setItem('user-language', lang); i18n.locale = lang; - I18nManager.forceRTL(false); // Assuming LTR for all three languages Updates.reloadAsync(); }; @@ -44,31 +41,8 @@ export default function HomeScreen() { {i18n.t('home')} - setModalVisible(true)} style={pickerSelectStyles.inputIOS}> - {currentLanguage} - - { - setModalVisible(!modalVisible); - }}> - setModalVisible(false)}> - - {languages.map((lang) => ( - changeLanguage(lang.value as 'en' | 'tk' | 'ru')}> - {lang.label} - - ))} - - - {/* { - const savedLanguage = await AsyncStorage.getItem('user-language'); - if (savedLanguage) { - i18n.locale = savedLanguage; - } else { - // If no language is saved, detect from device and default to Turkmen - const userLanguageCode = Localization.getLocales()[0]?.languageCode; - i18n.locale = ['en', 'tk', 'ru'].includes(userLanguageCode || '') ? userLanguageCode! : 'tk'; - } + i18n.locale = 'tk'; }; export default i18n; diff --git a/locales/en.json b/locales/en.json deleted file mode 100644 index 33a01ed..0000000 --- a/locales/en.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "home": "Home", - "services": "Services", - "supplications": "Supplications", - "yourJourneyToHajj": "Your Journey to Hajj", - "hajjEssentials": "Everything you need for Hajj essentials.", - "umrah": "Umrah", - "bookPermit": "Book Permit", - "nobleRawdah": "Noble Rawdah", - "newExperience": "New Experience", - "prayerTimes": "Prayer Times", - "programs": "Programs", - "Programs": "Schedule", - "leftOnPrayer": "Left on {{prayerName}} prayer", - "servicesToEnrich": "Services to Enrich Your Spiritual Experience", - "quran": "Qur'an", - "hadith": "Hadith", - "dua": "Dua", - "currencyConverter": "Currency Converter", - "hotelCard": "Hotel Card", - "lostKey": "Lost Key?", - "translator": "Translator", - "adhkar": "Adhkar", - "hisnAlMuslim": "Hisn Al-Muslim", - "Makkah": "Makkah", - "Medina": "Medina", - "Jeddah": "Jeddah", - "fajr": "Fajr", - "sunrise": "Sunrise", - "dhuhr": "Dhuhr", - "asr": "Asr", - "maghrib": "Maghrib", - "isha": "Isha", - "morningEveningThikr": "Thikr said in the morning and evening", - "beforeSleepingThikr": "Thikr before sleeping", - "afterSalamThikr": "Thikr after salam", - "breakingFastSupplication": "Upon breaking fast", - "fastingPersonSupplication": "Supplication said by one fasting when presented with food and does not break his fast", - "insultedWhileFasting": "When insulted while fasting", - "seeingFruitSupplication": "Supplication upon seeing the early or premature fruit", - "sneezingSupplication": "Supplication upon sneezing", - "sarToTmt": "SAR to TMT", - "hotelBusinessCard": "Hotel Business Card", - "masterkeyBox": "Masterkey Box", - "Money": "Money", - "Hotel": "Hotel", - "Lost room key": "Lost room key", - "Phrasebook": "Phrasebook", - "Enter text in Turkmen": "Enter text", - "Translate": "Translate", - "Salah": "Salah", - "menuSalah": "Salah" -} diff --git a/locales/ru.json b/locales/ru.json deleted file mode 100644 index e9ead34..0000000 --- a/locales/ru.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "home": "Главная", - "services": "Сервисы", - "supplications": "Молитвы", - "yourJourneyToHajj": "Ваше путешествие в Хадж", - "hajjEssentials": "Все, что вам нужно для Хаджа.", - "umrah": "Умра", - "bookPermit": "Забронировать разрешение", - "nobleRawdah": "Благородная Равда", - "newExperience": "Новый опыт", - "prayerTimes": "Время молитв", - "programs": "Программы", - "Programs": "Расписание", - "leftOnPrayer": "Осталось до молитвы {{prayerName}}", - "servicesToEnrich": "Услуги для обогащения вашего духовного опыта", - "quran": "Коран", - "hadith": "Хадис", - "dua": "Дуа", - "currencyConverter": "Конвертер валют", - "hotelCard": "Карта отеля", - "lostKey": "Потеряли ключ?", - "translator": "Переводчик", - "adhkar": "Азкар", - "hisnAlMuslim": "Крепость мусульманина", - "Makkah": "Мекка", - "Medina": "Медина", - "Jeddah": "Джидда", - "fajr": "Фаджр", - "sunrise": "Восход", - "dhuhr": "Зухр", - "asr": "Аср", - "maghrib": "Магриб", - "isha": "Иша", - "morningEveningThikr": "Зикр, читаемый утром и вечером", - "beforeSleepingThikr": "Зикр перед сном", - "afterSalamThikr": "Зикр после салама", - "breakingFastSupplication": "При разговении", - "fastingPersonSupplication": "Мольба, произносимая постящимся, когда ему преподносят еду, и он не прерывает свой пост", - "insultedWhileFasting": "Когда оскорбляют во время поста", - "seeingFruitSupplication": "Мольба при виде ранних или незрелых плодов", - "sneezingSupplication": "Мольба при чихании", - "sarToTmt": "SAR в TMT", - "hotelBusinessCard": "Визитная карточка отеля", - "masterkeyBox": "Ящик для мастер-ключей", - "Money": "Деньги", - "Hotel": "Отель", - "Lost room key": "Ключ от номера утерян", - "Phrasebook": "Разговорник", - "Enter text in Turkmen": "Введите текст", - "Translate": "Перевести", - "Salah": "Намаз", - "menuSalah": "Намаз" -}