Skip to content

Commit

Permalink
Merge pull request #672 from quran/fix-transliteration-not-showing
Browse files Browse the repository at this point in the history
Fix transliteration not showing
  • Loading branch information
osamasayed authored Jun 21, 2024
2 parents 2b93e77 + 0cb6552 commit e92df40
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion app/controllers/api/qdc/resources_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ def tafsirs
end

def word_by_word_translations
list = ResourceContent.eager_load(:translated_name).approved.one_word.translations.order('priority ASC')
list = ResourceContent.eager_load(:translated_name).approved.one_word.translations_only.order('priority ASC')

@word_by_word_translations = eager_load_translated_name(list)

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/api/v4/resources_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def translation_info
end

def word_by_word_translations
list = ResourceContent.eager_load(:translated_name).approved.one_word.translations.order('priority ASC')
list = ResourceContent.eager_load(:translated_name).approved.one_word.translations_only.order('priority ASC')

@word_by_word_translations = eager_load_translated_name(list)

Expand Down
2 changes: 1 addition & 1 deletion app/finders/qdc/verse_finder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ def load_words(word_translation_lang, mushaf)
language = Language.find_with_id_or_iso_code(word_translation_lang)

@results = @results.where(mushaf_words: { mushaf_id: mushaf.id })
approved_word_by_word_translations = ResourceContent.approved.one_word.translations
approved_word_by_word_translations = ResourceContent.approved.one_word.translations_only
words_with_default_translation = @results.where(word_translations: { language_id: Language.default.id, resource_content_id: approved_word_by_word_translations })

if language.nil? || language.default?
Expand Down
2 changes: 1 addition & 1 deletion app/finders/v4/verse_finder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def verse_pagination_end(start, total_verses)
def load_words(word_translation_lang)
language = Language.find_with_id_or_iso_code(word_translation_lang)

approved_word_by_word_translations = ResourceContent.approved.one_word.translations
approved_word_by_word_translations = ResourceContent.approved.one_word.translations_only
words_with_default_translation = @results.where(word_translations: { language_id: Language.default.id })

if language
Expand Down
2 changes: 1 addition & 1 deletion app/finders/verse_finder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def fetch_verses_range
def load_words(word_translation_lang)
language = Language.find_with_id_or_iso_code(word_translation_lang)

approved_word_by_word_translations = ResourceContent.approved.one_word.translations
approved_word_by_word_translations = ResourceContent.approved.one_word.translations_only
words_with_default_translation = results.where(word_translations: { language_id: Language.default.id, resource_content_id: approved_word_by_word_translations })

if language
Expand Down
2 changes: 1 addition & 1 deletion app/models/resource_content.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class ResourceContent < ApplicationRecord

scope :translations, -> { where sub_type: [SubType::Translation, SubType::Transliteration] }
scope :media, -> { where sub_type: SubType::Video }
scope :translations, -> { where sub_type: SubType::Translation }
scope :translations_only, -> { where sub_type: SubType::Translation }
scope :tafsirs, -> { where sub_type: SubType::Tafsir }
scope :chapter_info, -> { where sub_type: SubType::Info }
scope :one_verse, -> { where cardinality_type: CardinalityType::OneVerse }
Expand Down

0 comments on commit e92df40

Please sign in to comment.