Skip to content

Commit 0d9c404

Browse files
committed
Merge branch 'rtl-client' of https://github.com/Sefaria/Sefaria-Project into rtl-client
2 parents bd79ad3 + 29c8fd3 commit 0d9c404

File tree

7 files changed

+21
-13
lines changed

7 files changed

+21
-13
lines changed

sefaria/model/text_reuqest_adapter.py

+1
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ def make_named_entities_dict():
193193
version['text'] = ja.modify_by_function(composite_func)
194194

195195
def get_versions_for_query(self) -> dict:
196+
self.oref = self.oref.default_child_ref()
196197
for lang, vtitle in self.versions_params:
197198
self._append_required_versions(lang, vtitle)
198199
self._add_ref_data_to_return_obj()

static/css/s2.css

+2-1
Original file line numberDiff line numberDiff line change
@@ -1527,7 +1527,8 @@ div.interfaceLinks-row a {
15271527
.readerPanel.english .contentSpan.primary,
15281528
.readerPanel.english .languageToggle .he,
15291529
.readerPanel.hebrew .contentSpan.translation,
1530-
.readerPanel.hebrew .languageToggle .en {
1530+
.readerPanel.hebrew .languageToggle .en,
1531+
.readerPanel.hebrew .en .englishAvailableTag {
15311532
display: none;
15321533
}
15331534
.readerPanel.english .versionsTextList .primary,

static/js/ConnectionsPanel.jsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -1269,17 +1269,18 @@ WebPagesList.propTypes = {
12691269
const AdvancedToolsList = ({srefs, canEditText, currVersions, setConnectionsMode, masterPanelLanguage, toggleSignUpModal}) => {
12701270
const {textsData} = useContext(ReaderPanelContext);
12711271
const editText = canEditText && textsData ? function () {
1272-
const {primaryLang, translationLang} = textsData;
12731272
let refString = srefs[0];
1274-
let currentPath = Sefaria.util.currentPath();
1275-
const language = (masterPanelLanguage === 'english') ? translationLang : primaryLang;
1276-
const langCode = language.slice(0, 2);
1277-
const currVersionsLangCode = masterPanelLanguage.slice(0, 2);
1273+
const {primaryDirection, translationDirection} = textsData;
1274+
const currVersionsLangCode = masterPanelLanguage.slice(0,2);
12781275
const versionTitle = currVersions[currVersionsLangCode]?.versionTitle;
1276+
const direction = (masterPanelLanguage === 'english') ? translationDirection : primaryDirection;
1277+
const langCode = direction === 'rtl' ? 'he': 'en';
12791278
if (versionTitle) {
12801279
refString += "/" + encodeURIComponent(langCode) + "/" + encodeURIComponent(versionTitle);
12811280
}
1281+
12821282
let path = "/edit/" + refString;
1283+
let currentPath = Sefaria.util.currentPath();
12831284
let nextParam = "?next=" + encodeURIComponent(currentPath);
12841285
path += nextParam;
12851286
//console.log(path);

static/js/NavSidebar.jsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ const RecentlyViewedItem = ({oref}) => {
9292
const trackItem = () => {
9393
gtag('event', 'recently_viewed', {link_text: oref.ref, link_type: 'ref'})
9494
}
95+
const params = Sefaria.util.getUrlVersionsParams(oref.versions);
96+
const url = "/" + Sefaria.normRef(oref.ref) + (params ? "?" + params : "");
9597
return <li>
96-
<a href={oref.ref} onClick={() => trackItem()}>{Sefaria._v({"he": oref.he_ref, "en": oref.ref})}</a>
98+
<a href={url} onClick={() => trackItem()}>{Sefaria._v({"he": oref.he_ref, "en": oref.ref})}</a>
9799
</li>;
98100
}
99101
const RecentlyViewedList = ({items}) => {

static/js/TextList.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class TextList extends Component {
5050
}
5151
getSectionRef() {
5252
var ref = this.props.srefs[0]; // TODO account for selections spanning sections
53-
var sectionRef = Sefaria.sectionRef(ref) || ref;
53+
var sectionRef = Sefaria.sectionRef(ref, true) || ref;
5454
return sectionRef;
5555
}
5656
loadConnections() {

static/js/TextRange.jsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -590,12 +590,13 @@ class TextSegment extends Component {
590590
he = this.props.formatHeAsPoetry ? this.addPoetrySpans(he) : he
591591

592592
const hasNoTranslation = !this.props.en;
593+
const hasNoPrimarry = !this.props.he; //when connectionsMode is 'Translation Open' there is no he
593594

594595
const hasOnlyRtl = (hasNoTranslation && this.props?.primaryDirection === 'rtl');
595596
const hasOnlyLtr = hasNoTranslation && this.props?.primaryDirection === 'ltr';
596597
let sidebarRtl, sidebarLtr;
597598
if (panelMode === 'Connections') {
598-
const directionAttr = (language === 'hebrew') ? 'primaryDirection' : 'translationDirection';
599+
const directionAttr = (language === 'hebrew' && !hasNoPrimarry) ? 'primaryDirection' : 'translationDirection';
599600
const direction = this.props?.[directionAttr];
600601
sidebarRtl = direction === 'rtl';
601602
sidebarLtr = direction === 'ltr';
@@ -633,7 +634,7 @@ class TextSegment extends Component {
633634
direction: this.props.primaryDirection,
634635
text: he + " ",
635636
} : {};
636-
const shouldTranslationShow = language !== 'hebrew';
637+
const shouldTranslationShow = language !== 'hebrew' || hasNoPrimarry;
637638
const translation = shouldTranslationShow ? {
638639
direction: this.props.translationDirection,
639640
text: en + " ",

static/js/sefaria/sefaria.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -548,10 +548,12 @@ Sefaria = extend(Sefaria, {
548548
const versions = requiredVersions.map(obj =>
549549
Sefaria.makeParamsStringForAPIV3(obj.languageFamilyName, obj.versionTitle)
550550
);
551+
versions.sort();
552+
551553
const mergeTextInt = mergeText ? 1 : 0;
552554
const return_format_string = (return_format) ? `&return_format=${return_format}` : '';
553-
versions.sort();
554-
const url = `${host}${endPoint}${ref}?version=${versions.join('&version=')}&fill_in_missing_segments=${mergeTextInt}${return_format_string}`;
555+
const encodedRef = Sefaria.normRef(ref);
556+
const url = `${host}${endPoint}${encodedRef}?version=${versions.join('&version=')}&fill_in_missing_segments=${mergeTextInt}${return_format_string}`;
555557
return url;
556558
},
557559
_textsStore: {},
@@ -2529,7 +2531,7 @@ _media: {},
25292531
//This is temporary for RTL - we check savedVersion?.[key] for old data and savedVersion?.[key]?.versionTitle for new data
25302532
//also we currently don't check the languageFamilyName to fit old data
25312533
const savedVersionTitle = savedVersion?.[key]?.versionTitle ?? savedVersion?.[key] ?? '';
2532-
const currVersionTitle = currVersion?.[key]?.versionTitle ?? '';
2534+
const currVersionTitle = currVersion?.[key]?.versionTitle ?? currVersion?.[key] ?? '';
25332535
return savedVersionTitle === currVersionTitle;
25342536
}
25352537
return checkEquality("en") && checkEquality("he");

0 commit comments

Comments
 (0)