Skip to content

Commit

Permalink
Show appropriate language in ref in display
Browse files Browse the repository at this point in the history
  • Loading branch information
@patricksptang
patricksptang committed Oct 25, 2024
1 parent b867be2 commit 6cff513
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 20 deletions.
17 changes: 17 additions & 0 deletions step-core/src/main/java/com/tyndalehouse/step/core/utils/JSwordUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.crosswire.jsword.book.basic.AbstractPassageBook;
import org.crosswire.jsword.passage.*;
import org.crosswire.jsword.versification.BibleBook;
import org.crosswire.jsword.versification.BibleNames;
import org.crosswire.jsword.versification.Versification;
import org.jdom2.Element;
import org.jdom2.filter.ElementFilter;
Expand Down Expand Up @@ -206,6 +207,22 @@ public static Key getSafeKey(final Versification v11n, final String reference) {
}
}

public static String getBookNameForLang(String bk, String lang1, String lang2){
//if(lang.equals("ar")) {

String bookName = bk;
String lang = lang1;
if(lang.isEmpty())
lang = lang2;
if(!lang.isEmpty())
bookName = BibleNames.instance().getShortBibleNameForLocale(new Locale(lang), bk);

return bookName;
//}
//else
// return bk;
}

/**
* Checks for the presence of the book first. If the book is present, then continues to check that at least 1 verse
* in the scope is present. If it is, then returns true immediately.
Expand Down
91 changes: 71 additions & 20 deletions step-core/src/main/resources/com/tyndalehouse/step/core/service/jsword/impl/default.xsl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,18 +465,19 @@
<xsl:variable name="book" select="substring-before($firstOsisID, '.')"/>
<xsl:variable name="chapter"
select="jsword:shape($shaper, substring-before(substring-after($firstOsisID, '.'), '.'))"/>
<xsl:variable name="verse">
<xsl:variable name="myverse">
<xsl:choose>
<xsl:when test="@n">
<!-- SM -->
<xsl:if test="$XVRef = 'true'">
<xsl:value-of
select="jsword:shape($shaper, substring-after(substring-after($firstOsisID, '.'), '.'))"/>
</xsl:if>
<!-- SM -->
<xsl:if test="$XVRef != 'true'">
<xsl:value-of select="jsword:shape($shaper, string(@n))"/>
</xsl:if>
<xsl:choose>
<xsl:when test="$XVRef = 'true'">
<xsl:value-of
select="jsword:shape($shaper, substring-after(substring-after($firstOsisID, '.'), '.'))"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="jsword:shape($shaper, string(@n))"/>
</xsl:otherwise>
</xsl:choose>
<!-- <xsl:value-of select="jsword:shape($shaper, string(@n))"/>-->
</xsl:when>
<xsl:otherwise>
Expand All @@ -486,15 +487,30 @@
</xsl:choose>
</xsl:variable>

<!-- SM book name to match the language -->
<xsl:variable name="language1" select="cell/@xml:lang"/>
<xsl:variable name="language2" select="@xml:lang"/>
<xsl:variable name="thebook" select="jswordUtils:getBookNameForLang($book, $language1, $language2)"/>

<xsl:choose>
<xsl:when test="$includeBook = true()">
<span class="verseNumber">
<xsl:value-of select="concat($book, ' ', $chapter, ':', $verse)"/>
<xsl:choose>
<xsl:when test="$language1 = 'ar' or $language2 = 'ar'">
<xsl:value-of select="concat($thebook, ' ', $chapter, ': ', $myverse)"/>
</xsl:when>
<xsl:otherwise>
<!-- <xsl:value-of select="concat($thebook, ' ', $chapter, ':', $myverse)"/>-->
<xsl:variable name="ch" select="substring-before(substring-after($firstOsisID, '.'), '.')"/>
<xsl:variable name="vs" select="substring-after(substring-after($firstOsisID, '.'), '.')"/>
<xsl:value-of select="concat($book, ' ', $ch, ': ', $vs)"/>
</xsl:otherwise>
</xsl:choose>
</span>
</xsl:when>
<xsl:otherwise>
<span class="verseNumber">
<xsl:value-of select="concat($chapter, ':', $verse)"/>
<xsl:value-of select="concat($chapter, ':', $myverse)"/>
</span>
</xsl:otherwise>
</xsl:choose>
Expand All @@ -506,19 +522,54 @@
<!-- SM -->
<xsl:variable name="verse" select="(div[@osisID] | verse)[1]"/>
<xsl:variable name="firstOsisID" select="substring-before(concat($verse/@osisID, ' '), ' ')"/>

<!-- SM book name match lang ============== -->
<xsl:variable name="book" select="substring-before($firstOsisID, '.')"/>
<xsl:variable name="language1" select="cell/@xml:lang"/>
<xsl:variable name="language2" select="@xml:lang"/>
<xsl:variable name="thebook" select="jswordUtils:getBookNameForLang($book, $language1, $language2)"/>
<xsl:variable name="chapter"
select="jsword:shape($shaper, substring-before(substring-after($firstOsisID, '.'), '.'))"/>
<xsl:variable name="myverse">
<xsl:choose>
<xsl:when test="@n">
<!-- SM -->
<xsl:if test="$XVRef = 'true'">
<xsl:value-of
select="jsword:shape($shaper, substring-after(substring-after($firstOsisID, '.'), '.'))"/>
</xsl:if>
<!-- SM -->
<xsl:if test="$XVRef != 'true'">
<xsl:value-of select="jsword:shape($shaper, string(@n))"/>
</xsl:if>
<!-- <xsl:value-of select="jsword:shape($shaper, string(@n))"/>-->
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="jsword:shape($shaper, substring-after(substring-after($firstOsisID, '.'), '.'))"/>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<!-- SM =================================== -->
<xsl:if test="$Interleave = 'true'">
<xsl:variable name="version" select="interleaving:getNextVersion($interleavingProvider)"/>
<span class="smallResultKey" data-version="{$version}">
<!-- SM -->
<xsl:if test="$XVRef = 'true'">
<xsl:value-of select="concat('(', $version, ': ', $firstOsisID, ')')"/>
</xsl:if>
<!-- SM -->
<xsl:if test="$XVRef != 'true'">
(<xsl:value-of select="$version"/>)
</xsl:if>
</span>
<xsl:choose>
<xsl:when test="$XVRef = 'true'">
<xsl:choose>
<xsl:when test="$language1 = 'ar' or $language2 = 'ar'">
<xsl:value-of select="concat('(', $version, ': ', $thebook, ' ', $chapter, ': ', $myverse, ')')"/>
</xsl:when>
<xsl:otherwise>
<xsl:value-of select="concat('(', $version, ': ', $firstOsisID, ')')"/>
</xsl:otherwise>
</xsl:choose>
</xsl:when>
<xsl:otherwise>
(<xsl:value-of select="$version"/>)
</xsl:otherwise>
</xsl:choose>
</span>
</xsl:if>
</xsl:template>

Expand Down

0 comments on commit 6cff513

Please sign in to comment.