From cec94c1c58a8967e391bd4772f9d5f5521c0dd37 Mon Sep 17 00:00:00 2001 From: mohsentaba Date: Sat, 31 Oct 2026 15:29:35 +0330 Subject: [PATCH] feat(quran): add multilingual ayah transliteration support for standalone Quran section --- .../commands/import_quran_master.py | 57 ++++++++++++- .../0071_quranayah_transliteration.py | 18 +++++ apps/hadis/models/quran.py | 79 +++++++++++++++++++ apps/hadis/serializers/category.py | 10 ++- apps/hadis/serializers/serializers_admin.py | 22 ++++-- apps/hadis/views_admin.py | 2 + 6 files changed, 179 insertions(+), 9 deletions(-) create mode 100644 apps/hadis/migrations/0071_quranayah_transliteration.py diff --git a/apps/hadis/management/commands/import_quran_master.py b/apps/hadis/management/commands/import_quran_master.py index 94a3d90..ff1d9f0 100644 --- a/apps/hadis/management/commands/import_quran_master.py +++ b/apps/hadis/management/commands/import_quran_master.py @@ -351,6 +351,45 @@ class Command(BaseCommand): ), ] + default_transliterations = { + (1, 1): [ + {"language_code": "ru", "text": "Бисмилляхи р-Рахмани р-Рахим"}, + {"language_code": "en", "text": "Bismillāhi r-raḥmāni r-raḥīm"}, + {"language_code": "az", "text": "Bismilləhir-Rəhmanir-Rəhim"}, + {"language_code": "tr", "text": "Bismillâhirrahmânirrahîm"}, + ], + (2, 255): [ + {"language_code": "ru", "text": "Аллаху ля иляха илля хуваль-хайюль-кайюм, ля тахузуху синатун ва ля наум, ляху ма фис-самавати ва ма филь-ард, ман заллязи яшфау индаху илля би-изних, яляму ма байна айдихим ва ма хальфахум ва ля юхитуна би-шайим-мин ильмихи илля би-ма шаа, васиа курсийюхус-самавати валь-ард, ва ля яудуху хифзухума ва хуваль-алийюль-азым"}, + {"language_code": "en", "text": "Allāhu lā ilāha illā huwa l-ḥayyu l-qayyūm, lā ta’khudhuhū sinatun wa-lā nawm, lahū mā fī s-samāwāti wa-mā fī l-arḍ..."}, + ], + (3, 61): [ + {"language_code": "ru", "text": "Фа-ман хадджака фихи мин бади ма джаака миналь-ильми фа-куль тааляу наду абнаана ва абнаакум ва нисаана ва нисаакум ва анфусана ва анфусакум сумма набтахыль фа-наджаль лянаталлахи аляль-казибин"}, + {"language_code": "en", "text": "Fa-man ḥājjaka fīhi min baʿdi mā jāʾaka mina l-ʿilmi fa-qul taʿālaw nadʿu abnāʾanā wa-abnāʾakum wa-nisāʾanā wa-nisāʾakum wa-anfusanā wa-anfusakum thumma nabtahil fa-najʿal laʿnata llāhi ʿalā l-kādhibīn"}, + ], + (4, 59): [ + {"language_code": "ru", "text": "Йа айюхаллязина аману атыуллаха ва атыур-расуля ва улиль-амри минкум, фа-ин таназатум фи шайин фа-руддуху иляллахи вар-расули ин кунтум туминуна билляхи валь-яумиль-ахир, залика хайрун ва ахсану тавиля"}, + {"language_code": "en", "text": "Yā ayyuhā lladhīna āmanū aṭīʿū llāha wa-aṭīʿū r-rasūla wa-ulī l-amri minkum..."}, + ], + (5, 55): [ + {"language_code": "ru", "text": "Иннама валийюкумуллаху ва расулюху валлязина амануллязина юкымунас-салята ва ютуназ-закята ва хум ракиун"}, + {"language_code": "en", "text": "Innamā waliyyukumu llāhu wa-rasūluhū wa-lladhīna āmanū lladhīna yuqīmūna ṣ-ṣalāta wa-yuʾtūna z-zakāta wa-hum rākiʿūn"}, + {"language_code": "az", "text": "İnnəmə vəliyyukumullahu və rəsuluhu vəlləzinə amənulləzinə yuqimunəs-salətə və yutunəz-zəkətə və hum rakiun"}, + {"language_code": "tr", "text": "İnnemâ veliyyukumullâhu ve resûluhû vellezîne âmenûllezîne yukîmûnes salâte ve yu’tûnez zekâte ve hum râkiûn"}, + ], + (5, 67): [ + {"language_code": "ru", "text": "Йа айюхар-расулю баллиг ма унзиля иляйка мин раббик, ва ин лям тафаль фа-ма баллягта рисалятах, валлаху ясымука минан-нас, инналлаха ля яхдиль-каумаль-кафирин"}, + {"language_code": "en", "text": "Yā ayyuhā r-rasūlu balligh mā unzila ilayka min rabbika wa-in lam tafʿal fa-mā ballaghta risālatahū wa-llāhu yaʿṣimuka mina n-nās..."}, + ], + (33, 33): [ + {"language_code": "ru", "text": "Ва карна фи буютикунна ва ля табарраджна табарруджаль-джахилийятиль-уля ва акымнас-салята ва атиназ-закята ва атыналлаха ва расулях, иннама юридуллаху ли-юзхиба анкумур-риджса ахляль-байти ва ютаххиракум татхира"}, + {"language_code": "en", "text": "Wa-qarna fī buyūtikunna wa-lā tabarrajna tabarruja l-jāhiliyyati l-ūlā... Innamā yurīdu llāhu li-yudhhiba ʿankumu r-rijsa ahla l-bayti wa-yuṭahhirakum taṭhīrā"}, + ], + (42, 23): [ + {"language_code": "ru", "text": "Заликаллязи юбашшируллаху ибадахуллязина аману ва амилюс-салихат, куль ля асалюкум аляйхи аджран илляль-маваддата филь-курба..."}, + {"language_code": "en", "text": "Dhālika lladhī yubashshiru llāhu ʿibādahu lladhīna āmanū wa-ʿamilū ṣ-ṣāliḥāti qul lā asʾalukum ʿalayhi ajran illā l-mawaddata fī l-qurbā..."}, + ], + } + ayah_objs = [] trans_objs = [] for s_id, a_num, ar_text, tr_dict in key_ayahs: @@ -361,6 +400,7 @@ class Command(BaseCommand): surah_id=s_id, ayah_number=a_num, text=ar_text, + transliteration=default_transliterations.get((s_id, a_num), []), normalized_text=QuranAyah.normalize_arabic(ar_text), ) ) @@ -379,7 +419,7 @@ class Command(BaseCommand): ayah_objs, update_conflicts=True, unique_fields=["id"], - update_fields=["surah_id", "ayah_number", "text", "normalized_text"], + update_fields=["surah_id", "ayah_number", "text", "transliteration", "normalized_text"], ) QuranAyahTranslation.objects.bulk_create( trans_objs, @@ -716,6 +756,18 @@ class Command(BaseCommand): elif s_id and a_num and not a_id: a_id = QuranAyah.compute_id(int(s_id), int(a_num)) a_text = str(row.get("text") or row.get("arabic_text") or "").strip() + raw_translit = row.get("transliteration") + translit_list = [] + if isinstance(raw_translit, list): + translit_list = raw_translit + elif isinstance(raw_translit, dict): + translit_list = [ + {"language_code": normalize_quran_lang_code(k), "text": str(v).strip()} + for k, v in raw_translit.items() + if v and str(v).strip() + ] + elif isinstance(raw_translit, str) and raw_translit.strip(): + translit_list = [{"language_code": "ru", "text": raw_translit.strip()}] if a_id and s_id and a_num: ayahs_to_create.append( QuranAyah( @@ -723,6 +775,7 @@ class Command(BaseCommand): surah_id=int(s_id), ayah_number=int(a_num), text=a_text, + transliteration=translit_list, ) ) @@ -731,7 +784,7 @@ class Command(BaseCommand): ayahs_to_create, update_conflicts=True, unique_fields=["id"], - update_fields=["surah_id", "ayah_number", "text"], + update_fields=["surah_id", "ayah_number", "text", "transliteration"], ) self.stdout.write(f"Imported {len(ayahs_to_create)} ayahs from {path.name}.") diff --git a/apps/hadis/migrations/0071_quranayah_transliteration.py b/apps/hadis/migrations/0071_quranayah_transliteration.py new file mode 100644 index 0000000..6703519 --- /dev/null +++ b/apps/hadis/migrations/0071_quranayah_transliteration.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.30 on 2026-10-31 15:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('hadis', '0070_qurantranslator_translations'), + ] + + operations = [ + migrations.AddField( + model_name='quranayah', + name='transliteration', + field=models.JSONField(blank=True, default=list, help_text='List of {"language_code": "ru", "text": "..."} entries', verbose_name='Transliteration'), + ), + ] diff --git a/apps/hadis/models/quran.py b/apps/hadis/models/quran.py index ca41e1f..4b6141d 100644 --- a/apps/hadis/models/quran.py +++ b/apps/hadis/models/quran.py @@ -138,6 +138,12 @@ class QuranAyah(models.Model): text = models.TextField( verbose_name=_("Arabic Text (Uthmani)"), ) + transliteration = models.JSONField( + default=list, + blank=True, + verbose_name=_("Transliteration"), + help_text=_('List of {"language_code": "ru", "text": "..."} entries'), + ) normalized_text = models.TextField( blank=True, null=True, @@ -168,6 +174,79 @@ class QuranAyah(models.Model): from utils.text_normalizer import build_search_blob return build_search_blob(text or "", ref or "") + def get_transliteration(self, lang: str = "ru") -> str: + target = normalize_quran_lang_code(lang or "ru") + if isinstance(self.transliteration, str): + return self.transliteration.strip() + if isinstance(self.transliteration, dict): + for k, v in self.transliteration.items(): + if normalize_quran_lang_code(k) == target and v and str(v).strip(): + return str(v).strip() + if isinstance(self.transliteration, list): + for item in self.transliteration: + if isinstance(item, dict): + item_lang = normalize_quran_lang_code( + item.get("language_code") or item.get("languages_code") or "" + ) + if item_lang == target: + val = item.get("text") or item.get("title") or item.get("name") + if val and str(val).strip(): + return str(val).strip() + for fallback in ("ru", "en", "az", "tr"): + for item in self.transliteration: + if isinstance(item, dict): + item_lang = normalize_quran_lang_code( + item.get("language_code") or item.get("languages_code") or "" + ) + if item_lang == fallback: + val = item.get("text") or item.get("title") or item.get("name") + if val and str(val).strip(): + return str(val).strip() + for item in self.transliteration: + if isinstance(item, dict): + val = item.get("text") or item.get("title") or item.get("name") + if val and str(val).strip(): + return str(val).strip() + return "" + + def to_localized_transliteration_list(self) -> list: + result = [] + seen = set() + if isinstance(self.transliteration, list): + for item in self.transliteration: + if isinstance(item, dict): + raw_lang = item.get("language_code") or item.get("languages_code") or "" + if not raw_lang: + continue + lang = normalize_quran_lang_code(raw_lang) + val = str(item.get("text") or item.get("title") or item.get("name") or "").strip() + if val and lang not in seen: + seen.add(lang) + result.append({ + "language_code": lang, + "text": val, + "title": val, + }) + elif isinstance(self.transliteration, dict): + for raw_lang, raw_val in self.transliteration.items(): + lang = normalize_quran_lang_code(raw_lang) + val = str(raw_val or "").strip() + if val and lang not in seen: + seen.add(lang) + result.append({ + "language_code": lang, + "text": val, + "title": val, + }) + elif isinstance(self.transliteration, str) and self.transliteration.strip(): + val = self.transliteration.strip() + result.append({ + "language_code": "ru", + "text": val, + "title": val, + }) + return result + def save(self, *args, **kwargs): if self.surah_id and self.ayah_number: self.id = self.compute_id(self.surah_id, self.ayah_number) diff --git a/apps/hadis/serializers/category.py b/apps/hadis/serializers/category.py index 29d847f..7eb5376 100644 --- a/apps/hadis/serializers/category.py +++ b/apps/hadis/serializers/category.py @@ -615,6 +615,7 @@ class PublicQuranSurahSerializer(serializers.ModelSerializer): class PublicQuranAyahSerializer(serializers.ModelSerializer): surah_name = serializers.SerializerMethodField() + transliteration = serializers.SerializerMethodField() translations = serializers.SerializerMethodField() def get_surah_name(self, obj): @@ -622,6 +623,11 @@ class PublicQuranAyahSerializer(serializers.ModelSerializer): lang = _resolve_request_lang(request) return obj.surah.get_name(lang) if obj.surah_id and obj.surah else "" + def get_transliteration(self, obj): + request = self.context.get("request") + lang = _resolve_request_lang(request) + return obj.get_transliteration(lang) + def get_translations(self, obj): request = self.context.get("request") lang = _resolve_request_lang(request) @@ -642,7 +648,7 @@ class PublicQuranAyahSerializer(serializers.ModelSerializer): { "id": tr.id, "translator_id": tr.translator_id, - "translator": tr.translator.name, + "translator": tr.translator.get_name(lang), "language_code": tr.translator.language_code, "priority": tr.translator.priority, "text": tr.text, @@ -652,4 +658,4 @@ class PublicQuranAyahSerializer(serializers.ModelSerializer): class Meta: model = QuranAyah - fields = ["id", "surah_id", "surah_name", "ayah_number", "text", "translations"] + fields = ["id", "surah_id", "surah_name", "ayah_number", "text", "transliteration", "translations"] diff --git a/apps/hadis/serializers/serializers_admin.py b/apps/hadis/serializers/serializers_admin.py index f79caa3..3b82375 100644 --- a/apps/hadis/serializers/serializers_admin.py +++ b/apps/hadis/serializers/serializers_admin.py @@ -6904,6 +6904,7 @@ class AdminQuranAyahSerializer(serializers.ModelSerializer): surah = serializers.PrimaryKeyRelatedField(queryset=QuranSurah.objects.all()) surah_detail = AdminQuranSurahSerializer(source="surah", read_only=True) verse_key = serializers.SerializerMethodField() + transliteration = serializers.JSONField(default=list, required=False) translations = AdminQuranAyahTranslationSerializer(many=True, required=False) topic_categories = serializers.SerializerMethodField() @@ -6916,12 +6917,18 @@ class AdminQuranAyahSerializer(serializers.ModelSerializer): "ayah_number", "verse_key", "text", + "transliteration", "translations", "topic_categories", ] read_only_fields = ["id", "verse_key", "topic_categories"] validators = [] + def to_representation(self, instance): + data = super().to_representation(instance) + data["transliteration"] = instance.to_localized_transliteration_list() + return data + def get_verse_key(self, obj): return f"{obj.surah_id}:{obj.ayah_number}" @@ -7004,13 +7011,16 @@ class AdminQuranAyahSerializer(serializers.ModelSerializer): surah = validated_data["surah"] ayah_num = validated_data["ayah_number"] ayah_id = QuranAyah.compute_id(surah.id, ayah_num) + defaults = { + "surah": surah, + "ayah_number": ayah_num, + "text": validated_data.get("text", ""), + } + if "transliteration" in validated_data: + defaults["transliteration"] = validated_data.get("transliteration") or [] ayah_obj, _ = QuranAyah.objects.update_or_create( id=ayah_id, - defaults={ - "surah": surah, - "ayah_number": ayah_num, - "text": validated_data.get("text", ""), - }, + defaults=defaults, ) self._sync_translations(ayah_obj, translations_data) self._sync_linked_topic_verses(ayah_obj) @@ -7024,6 +7034,8 @@ class AdminQuranAyahSerializer(serializers.ModelSerializer): instance.surah = validated_data.get("surah", instance.surah) instance.ayah_number = validated_data.get("ayah_number", instance.ayah_number) instance.text = validated_data.get("text", instance.text) + if "transliteration" in validated_data: + instance.transliteration = validated_data.get("transliteration") or [] instance.save() self._sync_translations(instance, translations_data) self._sync_linked_topic_verses(instance) diff --git a/apps/hadis/views_admin.py b/apps/hadis/views_admin.py index 0e92435..9f92d1a 100644 --- a/apps/hadis/views_admin.py +++ b/apps/hadis/views_admin.py @@ -2520,6 +2520,7 @@ class AdminQuranAyahViewSet(ModelViewSet): queryset = queryset.filter( Q(text__icontains=search_q) | Q(normalized_text__icontains=norm_q) + | Q(transliteration__icontains=search_q) | Q(surah__translations__icontains=search_q) | Q(translations__text__icontains=search_q) ).distinct() @@ -2584,6 +2585,7 @@ class AdminQuranAyahViewSet(ModelViewSet): "ayah_number": first_num, "verse_key": f"{surah.id}:{first_num}", "text": "", + "transliteration": [], "translations": [], "topic_categories": [], "exists_in_master_db": False,