Rtl #1859

YishaiGlasner · 2024-03-31T10:03:27Z

comment: this commit remove the APIResult attributes from currVersions object. the currVersions are indeed theoretical currVersions, but the real shown version can be different due to language and version preferences, so the APIResult reflected the real shown versions. i've removed it, for it has no use anymore, but there is a logic in javing this data, so Akiva had suggested to flag it on the review.

…g them to fit the expected old api response.

… to include an object for any language (he and en) rather than a string. The idea is to enable it to include other details and not only versionTitle.

…nts.

…mbers and use it rather than placeSegmentNuncers.

…ng together).

…itle should be displayed.

…use anymore.

…n there is more than one source.

…n the aources attribute is in the response.

…anslation.

…o components (rather than get it from cache objects).

…tData.

…ng the translation VersionTitle.

…ned object in ssr processing.

…on rtl.

…ation'.

… has only one text.

…tate.

…nt language if it's hebrew or english and in the interdace language otherwise.

…ual and not wide enough.

… rtl

… when connections panel shows text.

…nel when showing rtl texts.

YishaiGlasner · 2024-05-29T08:07:25Z

reader/views.py

@@ -280,6 +281,18 @@ def user_credentials(request):
        return {"user_type": "API", "user_id": apikey["uid"]}


+def _reader_redirect_add_languages(request, tref):


YishaiGlasner · 2024-05-29T08:14:06Z

sefaria/datatype/jagged_array.py

@@ -659,12 +659,13 @@ def modify_by_function(self, func, start_sections=None, _cur=None, _curSections=
        Func should accept two parameters: 1) text of current segment 2) zero-indexed indices of segment
        :param start_sections: array(int), optional param. Sections passed to `func` will be offset by `start_sections`, if passed
        """
-        _curSections = _curSections or []


YishaiGlasner · 2024-05-29T08:20:21Z

static/css/s2.css

@@ -1484,7 +1484,8 @@ div.interfaceLinks-row a {
 .readerPanel .content {
  direction: ltr; /* Even in Hebrew Interface, we want scroll bars on the right */
 }
-.readerPanel .he {


YishaiGlasner · 2024-05-29T08:20:44Z

static/css/s2.css

@@ -4708,14 +4712,17 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus
 .tagsList .enOnly {
  direction: ltr;
 }
+.readerControlsOuter {


YishaiGlasner · 2024-05-29T08:21:13Z

static/css/s2.css

@@ -5315,7 +5323,7 @@ body .ui-autocomplete.dictionary-toc-autocomplete .ui-menu-item a.ui-state-focus
 .bilingual .sheetContent .title .he {
  display: none;
 }
-.interface-hebrew .readerPanel.english .textRange,


YishaiGlasner · 2024-06-02T12:03:56Z

static/js/sefaria/sefaria.js

@@ -2144,11 +2193,13 @@ _media: {},
          return x;
      })
  },
-  sectionString: function(ref) {


data fetching (enable function to be used wihtout cache but with passed data. making it always do so would be better, for util function should not get data for itself)

YishaiGlasner · 2024-06-02T12:04:21Z

static/js/sefaria/sefaria.js

@@ -2351,7 +2402,7 @@ _media: {},
  },
  areVersionsEqual(v1, v2) {
    // v1, v2 are `currVersions` objects stored like {en: ven, he: vhe}
-    return v1.en == v2.en && v1.he == v2.he;


currVersions refactor

YishaiGlasner · 2024-06-02T12:05:32Z

static/js/sefaria/sefaria.js

@@ -3156,15 +3207,15 @@ Sefaria.unpackDataFromProps = function(props) {
        let settings = {context: 1, enVersion: panel.enVersion, heVersion: panel.heVersion};
        //save versions first, so their new format is also saved on text cache
        if(panel.text?.versions?.length){
-            let versions = Sefaria._saveVersions(panel.text.sectionRef, panel.text.versions);


data fetching (response is different)

we use saveVersions outside

YishaiGlasner · 2024-06-02T12:10:26Z

static/js/sefaria/util.js

@@ -48,30 +48,22 @@ class Util {
    static encodeVtitle(vtitle) {
      return vtitle.replace(/\s/g, '_').replace(/;/g, '%3B');
    }
+    static _getVersionParams(version) {


data fetching

YishaiGlasner · 2024-06-02T12:11:24Z

static/js/sefaria/util.js

          .join("");
      } else {
        return "";
      }
    }
-    static getCurrVersionsWithoutAPIResultFields(currVersions) {


currVersions refactor

akiva10b · 2024-05-29T08:14:10Z

reader/views.py

@@ -330,23 +347,16 @@ def get_connections_mode(filter):
    else:
        return "TextList", False

-def make_panel_dict(oref, versionEn, versionHe, filter, versionFilter, mode, **kwargs):
+def make_panel_dict(oref, primaryVersion, translationVersion, filter, versionFilter, mode, **kwargs):


akiva10b · 2024-05-29T08:14:27Z

reader/views.py

-                "en": versionEn,
-                "he": versionHe,
-            },
+            "currVersions": {"en": translationVersion, "he": primaryVersion},


akiva10b · 2024-05-29T08:14:43Z

reader/views.py

-            text_family["next"] = oref.next_section_ref().normal() if oref.next_section_ref() else None
-            text_family["prev"] = oref.prev_section_ref().normal() if oref.prev_section_ref() else None
-            panel["text"] = text_family
+            primary_params = [primaryVersion['languageFamilyName'], primaryVersion['versionTitle']]


akiva10b · 2024-05-29T08:14:57Z

reader/views.py

@@ -490,24 +511,30 @@ def make_sheet_panel_dict(sheet_id, filter, **kwargs):
        return panels


-def make_panel_dicts(oref, versionEn, versionHe, filter, versionFilter, multi_panel, **kwargs):
+def make_panel_dicts(oref, primaryVersion, translationVersion, filter, versionFilter, multi_panel, **kwargs):


akiva10b · 2024-05-29T08:15:13Z

reader/views.py

@@ -564,7 +583,7 @@ def text_panels(request, ref, version=None, lang=None, sheet=None):
        kwargs["sidebarSearchQuery"] = request.GET.get("sbsq", None)
        kwargs["selectedNamedEntity"] = request.GET.get("namedEntity", None)
        kwargs["selectedNamedEntityText"] = request.GET.get("namedEntityText", None)
-        panels += make_panel_dicts(oref, versionEn, versionHe, filter, versionFilter, multi_panel, **kwargs)
+        panels += make_panel_dicts(oref, primaryVersion, translationVersion, filter, versionFilter, multi_panel, **kwargs)


akiva10b · 2024-06-03T12:41:31Z

reader/views.py

@@ -280,6 +281,18 @@ def user_credentials(request):
        return {"user_type": "API", "user_id": apikey["uid"]}


+def _reader_redirect_add_languages(request, tref):
+    versions = Ref(tref).version_list()


ssr: how expensive is this operation? is it problematic for us?

akiva10b · 2024-06-03T12:45:28Z

reader/views.py

-                    else:
-                        currVersions[key] = None
+        if kwargs.get('extended notes', 0):
+            currVersions = {"en": translationVersion, "he": primaryVersion}


ssr: can be define a little higher and then on line 382 we can do
"currVersions": currVersions

akiva10b · 2024-06-04T10:15:05Z

reader/views.py

+            primary_params = [primaryVersion['languageFamilyName'], primaryVersion['versionTitle']]
+            primary_params[0] = primary_params[0] or 'primary'
+            translation_params = [translationVersion['languageFamilyName'], translationVersion['versionTitle']]
+            translation_params[0] = translation_params[0] or 'translation'


ssr: I believe the following is cleaner and will achieve the goal for the params list

primary_params = [primary_version.get('languageFamilyName', 'primary'), primary_version.get('versionTitle')] translation_params = [translation_version.get('languageFamilyName', 'translation'), translation_version.get('versionTitle')]

akiva10b · 2024-06-04T10:18:54Z

reader/views.py

+            text_adapter = TextRequestAdapter(oref.section_ref(), [primary_params, translation_params], return_format='wrap_all_entities')
+            text = text_adapter.get_versions_for_query()
+            # text['ref'] = oref.normal()
+            #now we we should add the he and text attributes


ssr: this should be its own function so that the logic is scopes and purpose nicely articulated in the function name

akiva10b · 2024-06-04T10:22:55Z

sefaria/datatype/jagged_array.py

        if _cur is None:
            _cur = self._store
        if isinstance(_cur, str):
+            _curSections = _curSections or [0]


ssr: add docstring to explain this

YishaiGlasner added 30 commits March 7, 2024 22:08

feat(get texts): functions for getting texts from api-v3 and modifyin…

af16bd8

…g them to fit the expected old api response.

doc(get texts): todo strings.

22591ec

refactor(currVersions): this refactor changes the currVersions object…

5b2aa35

… to include an object for any language (he and en) rather than a string. The idea is to enable it to include other details and not only versionTitle.

chore(currVersions): remove console logs.

5e8ba29

Merge branch 'currVersions' into rtl

e170816

Merge branch 'master' into rtl

488a216

feat(translations): use the v3 functions for getting texts in compone…

1b9b883

…nts.

feat(url): insert languageFamilyName to url.

f726d21

feat(url): redirect old urls.

000394c

refactor(TextRange): rename handleResize to conditionalPlaceSegmentNu…

ee70e1f

…mbers and use it rather than placeSegmentNuncers.

feat(translations): use text-v3 in work (commit for pushing for worki…

4f32748

…ng together).

fix(TextRange): do not change ref for link to segment.

182b2b4

chore(TextRange): remove console.logs.

aa89537

feat(ReaderControls): use the new function for getting text.

a36c7b8

feat(get texts): add 'sources' and 'heSources' to adapted response.

1a2d6e1

refactor(ReaderControls): use data for determining what translation t…

587e628

…itle should be displayed.

refactor(currVersions): remove APIResult attributes which are not in …

7627be5

…use anymore.

fix(getting texts): add the attributes sources and heSources only whe…

b27423c

…n there is more than one source.

fix(getting texts): add the attributes sources and heSources only whe…

c182498

…n the aources attribute is in the response.

fix(SSR): assign an empty array to he/text when there is no source/tr…

d787953

…anslation.

refactor(ReaderPanel): get data directly with asking it and pass it t…

018cc74

…o components (rather than get it from cache objects).

chore: fix a git accident.

aaf985e

refactor(ReaderPanel): rename conditionalSetData to conditionalSetTex…

f46619f

…tData.

fix(ReaderPanel): don't try to get things from data when it's null.

d23db3f

fix(ReaderPanel): set translation in ReaderControls when it gots data.

76c25e1

fix(ReaderPanel): fix the flowing of tata into ReaderControl and maki…

8bf5e77

…ng the translation VersionTitle.

refactor(ReaderPanel): function for comparing both currVersions.

cb80ac5

fix(SSR processing): save the versions according to the new api retur…

10e14f0

…ned object in ssr processing.

feat(texts): css for rtl as translation and ltr as source.

43cb1bf

fix(translations): show currently selected for rtl translations.

9c2e835

YishaiGlasner and others added 27 commits April 21, 2024 09:06

fix(texts): direction for bilingual when primary is ltr and translati…

14d507f

…on rtl.

feat(texts): Hebrew strings for 'Translation' and 'Source with Transl…

3414b13

…ation'.

fix(texts): svgs with the right names.

49bde51

feat(text meny): font size buttons.

221c1dd

feat(text meny): aliyot toggle switch.

27e5f5d

fix(text menu): font size buttons order in Hebrew interface.

06c79e2

feat(text menu): vowels and cantillation toggles.

e16690d

feat(text menu): punctuation toggle.

e004f9a

refactor(text menu): do all toggles in the same format.

b129bb6

feat(text menu): Hebrew string for cantillation.

7ae7c9d

refactor(text menu): remove old ReaderDisplayOptionsMenu.

586e609

feat(reader panel): gray and margins for translation in stacked layout.

2011261

feat(text menu): cursor pointer for buttons.

ceb4fa1

feat(texts client): 'empty' text as translation when the api response…

8c795d7

… has only one text.

doc(texts client): remove todo.

00f30e2

feat(texts): show only one text when there is only one on bilingual s…

72dbe19

…tate.

feat(texts): show titles and other content-related texts in the conte…

8735c1a

…nt language if it's hebrew or english and in the interdace language otherwise.

fix(language toggle button): show only ay or aleph.

92531e7

fix(layout toggle): show bilayout when there is an 'empty' translation.

bba4437

fix(layout toggle): don't show layout toggle when the panel is biling…

7537960

…ual and not wide enough.

fix(A button): fix location.

5379fae

fix(text menu): fix location.

83f3334

Merge branch 'rtl' of https://github.com/Sefaria/Sefaria-Project into…

dc7d646

… rtl

feat(connections panel): menu of 'show source' and 'show translation'…

c86cdab

… when connections panel shows text.

fix(connections panel): fix text align and direction in connection pa…

c4fb810

…nel when showing rtl texts.

Merge branch 'master' into rtl

36a4439

feat(rtl): simple adapter to discover race conditions

2c849c7

YishaiGlasner commented Jun 2, 2024

View reviewed changes

feat(rtl): check for race conditions

74934ab

akiva10b reviewed Jun 4, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rtl #1859

Rtl #1859

YishaiGlasner commented Mar 31, 2024

YishaiGlasner May 29, 2024

YishaiGlasner May 29, 2024

YishaiGlasner May 29, 2024

YishaiGlasner May 29, 2024

YishaiGlasner May 29, 2024

YishaiGlasner Jun 2, 2024

YishaiGlasner Jun 2, 2024

YishaiGlasner Jun 2, 2024

YishaiGlasner Jun 2, 2024

YishaiGlasner Jun 2, 2024

akiva10b May 29, 2024

akiva10b May 29, 2024

akiva10b May 29, 2024

akiva10b May 29, 2024

akiva10b May 29, 2024

akiva10b Jun 3, 2024 •

edited

Loading

akiva10b Jun 3, 2024 •

edited

Loading

akiva10b Jun 4, 2024 •

edited

Loading

akiva10b Jun 4, 2024 •

edited

Loading

akiva10b Jun 4, 2024 •

edited

Loading

		@@ -280,6 +281,18 @@ def user_credentials(request):
		return {"user_type": "API", "user_id": apikey["uid"]}


		def _reader_redirect_add_languages(request, tref):

Rtl #1859

Are you sure you want to change the base?

Rtl #1859

Conversation

YishaiGlasner commented Mar 31, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

akiva10b Jun 3, 2024 • edited Loading

Choose a reason for hiding this comment

akiva10b Jun 3, 2024 • edited Loading

Choose a reason for hiding this comment

akiva10b Jun 4, 2024 • edited Loading

Choose a reason for hiding this comment

akiva10b Jun 4, 2024 • edited Loading

Choose a reason for hiding this comment

akiva10b Jun 4, 2024 • edited Loading

Choose a reason for hiding this comment

akiva10b Jun 3, 2024 •

edited

Loading

akiva10b Jun 3, 2024 •

edited

Loading

akiva10b Jun 4, 2024 •

edited

Loading

akiva10b Jun 4, 2024 •

edited

Loading

akiva10b Jun 4, 2024 •

edited

Loading