Skip to content

Commit

Permalink
Annotationsansicht: Übersetzung neben Wortart
Browse files Browse the repository at this point in the history
  • Loading branch information
@dwerning
dwerning committed Oct 11, 2023
1 parent ea29d79 commit 2bff9bb
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 45 deletions.
8 changes: 4 additions & 4 deletions src/main/resources/application.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,23 +179,23 @@ search:
hideable-properties:
hieroglyphs: []
switchannotation:
- wordtokenid
- wordclass
- tokentranslation
- tlaglossing
- linguisticglossing
- tokentranslation
- wordtokenid
translation: []
dating: []
texteditor: []

hideable-textsentences-properties:
hieroglyphs: []
switchannotation:
- wordtokenid
- wordclass
- tokentranslation
- tlaglossing
- linguisticglossing
- tokentranslation
- wordtokenid
translation: []

details:
Expand Down
18 changes: 9 additions & 9 deletions src/main/resources/i18n/messages_de.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ field_label_transliteration_encoding=Transkriptionskodierung
field_label_translation=Übersetzung
field_label_translation_placeholder=Elefant
field_label_translation_lang=Übersetzungssprache
field_label_wordClass_type=Wort-Klasse
field_label_wordClass_type=Wortklasse
field_label_wordClass_subtype=Unterklasse
field_label_root_transliteration=Wurzel des Lemmas
field_label_root_transliteration_encoding=Wurzeltranskriptionskodierung
Expand Down Expand Up @@ -559,8 +559,8 @@ button_label_hide1Lemma_property_lemma-id=Lemma-ID
button_label_hide_property_hieroglyphs=Hieroglyphen
button_label_hideTextsentences_property_hieroglyphs=Hieroglyphen
button_label_hide1Lemma_property_hieroglyphs=Hieroglyphen
button_label_hide_property_wordClass=Wort-Klasse
button_label_hide1Lemma_property_wordClass=Wort-Klasse
button_label_hide_property_wordClass=Wortklasse
button_label_hide1Lemma_property_wordClass=Wortklasse
button_label_hide_property_bibliography=Bibliographische Verweise
button_label_hide2Lemma_property_bibliography=Bibliographische Verweise
button_label_hide_property_attested-timespan=Belegzeit
Expand All @@ -573,19 +573,19 @@ button_label_show_property_en=Englisch
button_label_show_property_fr=Französisch

button_label_hide_property_switchannotation=Wechsel Annotations-/Block-Ansicht
button_label_hide_property_switchannotation-wordclass=Wort-Klasse
button_label_hide_property_switchannotation-wordclass=Lemma-Wortklasse
button_label_hide_property_switchannotation-tlaglossing=Gram. Annotation BTS
button_label_hide_property_switchannotation-linguisticglossing= Ling. Glossierung
button_label_hide_property_switchannotation-tokentranslation=Wort-Übersetzung
button_label_hide_property_switchannotation-tokentranslation=Lemma-Übersetzung
button_label_hide_property_switchannotation-wordtokenid=Satzelement-ID
button_label_hide_property_translation=Übersetzung
button_label_hide_property_dating=Datierung
button_label_hide_property_texteditor=Text-Editor:innen
button_label_hideTextsentences_property_switchannotation=Wechsel Annotations-/Block-Ansicht
button_label_hideTextsentences_property_switchannotation-wordclass=Wort-Klasse
button_label_hideTextsentences_property_switchannotation-wordclass=Lemma-Wortklasse
button_label_hideTextsentences_property_switchannotation-tlaglossing=Gram. Annotation BTS
button_label_hideTextsentences_property_switchannotation-linguisticglossing= Ling. Glossierung
button_label_hideTextsentences_property_switchannotation-tokentranslation=Wort-Übersetzung
button_label_hideTextsentences_property_switchannotation-tokentranslation=Lemma-Übersetzung
button_label_hideTextsentences_property_switchannotation-wordtokenid=Satzelement-ID
button_label_hideTextsentences_property_translation=Übersetzung
sentence_main_editor=Autor:innen
Expand Down Expand Up @@ -615,7 +615,7 @@ result_page_description_right_sentences=Sätzen mit Belegen (inkl. Lesevarianten
result_page_no_results=Keine Ergebnisse.
result_page_facets=Ergebnisse filtern

lemma_search_facet_wordClass_type=Wort-Klassen
lemma_search_facet_wordClass_type=Wortklassen
lemma_search_facet_wordClass_subtype=Unterklassen
lemma_search_facet_script=###Sprachstufen
lemma_search_facet_anno_type=Annotationskategorien
Expand All @@ -639,7 +639,7 @@ modal_transliteration_title=Transkription: Such-Zeichenkette
modal_transliteration_text=<p>Die folgenden <strong><i>Wildcards</i></strong> können im Suchstring genutzt werden:</p><table class="bordered-table m-2"><tr><td><code>_</code>&nbsp;oder&nbsp;<code>§</code></td><td>Platzhalter für <em>irgendein</em> Zeichen. Beispiel: „<span class="bbaw-libertine">_m</span>‟ findet „<span class="bbaw-libertine">ꜣm</span>‟ und „<span class="bbaw-libertine">rm</span>‟.</td></tr><tr><td><code>*</code></td><td>Platzhalter für <em>irgendeine</em> Anzahl <em>irgendwelcher</em> Zeichen. Beispiel: „<span class="bbaw-libertine">*m</span>‟ findet „<span class="bbaw-libertine">ꜣm</span>‟, „<span class="bbaw-libertine">rnm</span>‟ und auch einfaches „<span class="bbaw-libertine">m</span>‟.</td></tr><tr><td><code>[&nbsp;]</code></td><td>Menge von Einzelzeichen: irgendeines aus der Zeichenmenge wird gesucht. Beispiel: „<span class="bbaw-libertine">[zs]š</span>‟ findet „<span class="bbaw-libertine">sš</span>‟ und „<span class="bbaw-libertine">zš</span>‟. (Tipp: Nutzung bei „<span class="bbaw-libertine">[jy]</span>‟.)</td></tr><tr><td><code>?</code></td><td>Das vor dem „?‟ stehende Zeichen <em>kann</em> im gesuchten Lemma sein, <em>muss aber nicht</em> vorhanden sein. Beispiel, „<span class="bbaw-libertine">mr.?y</span>‟ findet „<span class="bbaw-libertine">mr.y</span>‟ und „<span class="bbaw-libertine">mry</span>‟.</td></tr><tr><td><code>(&nbsp;)</code></td><td>Die in „( )‟ stehende Zeichen(sequenz) <em>kann</em> im gesuchten Lemma sein, <em>muss aber nicht</em> vorhanden sein. Beispiel, „<span class="bbaw-libertine">(j)ꜥr</span>‟ findet „<span class="bbaw-libertine">jꜥr</span>‟ und „<span class="bbaw-libertine">ꜥr</span>‟.</td></tr><tr><td><code>$</code></td><td>Nur am Ende von Strings zu nutzen: das Lemma muss an der Position enden. Beispiel: „<span class="bbaw-libertine">jm$</span>‟ findet „<span class="bbaw-libertine">jm</span>‟, aber <em>nicht</em> „<span class="bbaw-libertine">jmn</span>‟.</td></tr><tr><td><code>&gt;</code></td><td>Nur am Anfang von Strings zu nutzen: das Lemma kann mit dem String anfangen, <em>oder</em> ein Sublemma des Lemmas beginnt damit. Beispiel: „<span class="bbaw-libertine">&gt;jmn</span>‟ findet „<span class="bbaw-libertine">jmn.t</span>‟ <em>und</em> „<span class="bbaw-libertine">ꜥ.t-jmn.t</span>‟.</td></tr></table><p>Die Zeichen „<span class="bbaw-libertine">⸮</span>‟, „<span class="bbaw-libertine">{</span>‟, „<span class="bbaw-libertine">}</span>‟, „<span class="bbaw-libertine">⸢</span>‟, „<span class="bbaw-libertine">⸣</span>‟, „<span class="bbaw-libertine">〈</span>‟, und „<span class="bbaw-libertine">〉</span>‟ werden bei der Suche ignoriert.</p>

modal_root_title=Spezifikation der Wurzel des Lemmas
modal_root_text=<p>In diesem <em>optionalen</em> Suchfeld können Sie die Transkription oder einen Teil einer Transkription einer <strong>Wurzel angeben, die das Lemma haben soll</strong>, nach dem Sie suchen wollen.</p><p>Um nach <strong>Wurzeln selbst</strong> zu suchen, wählen Sie die Wort-Klasse <code>Wurzel</code> und geben z.B. eine Transkription im Feld „Transkription‟ ein (nicht im Feld „Wurzel des Lemmas‟).
modal_root_text=<p>In diesem <em>optionalen</em> Suchfeld können Sie die Transkription oder einen Teil einer Transkription einer <strong>Wurzel angeben, die das Lemma haben soll</strong>, nach dem Sie suchen wollen.</p><p>Um nach <strong>Wurzeln selbst</strong> zu suchen, wählen Sie die Wortklasse <code>Wurzel</code> und geben z.B. eine Transkription im Feld „Transkription‟ ein (nicht im Feld „Wurzel des Lemmas‟).

modal_bibliography_title=Inhalte des Bibliographie-Feldes
modal_bibliography_text=<p>Eine Liste bibliographischer Abkürzungen, nach denen Sie vielleicht suchen wollen, finden Sie <a href="/listings/bibliography/" target="_blank" rel="opener">hier</a>.</p>
Expand Down
12 changes: 6 additions & 6 deletions src/main/resources/i18n/messages_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -573,21 +573,21 @@ button_label_show_property_fr=French


button_label_hide_property_switchannotation=Switch annotation/block view
button_label_hide_property_switchannotation-wordclass=Word class
button_label_hide_property_switchannotation-wordclass=Lemma word class
button_label_hide_property_switchannotation-tlaglossing=Gram. tagging BTS
button_label_hide_property_switchannotation-linguisticglossing=Linguistic Glossing
button_label_hide_property_switchannotation-tokentranslation=Token translation
button_label_hide_property_switchannotation-linguisticglossing=Linguistic glossing
button_label_hide_property_switchannotation-tokentranslation=Lemma translation
button_label_hide_property_switchannotation-wordtokenid=Sentence token ID
button_label_hide_property_translation=Translation
button_label_hide_property_dating=Dating of Text
button_label_hide_property_texteditor=Text editor

button_label_hideTextsentences_property_hieroglyphs=Hieroglyphs
button_label_hideTextsentences_property_switchannotation=Switch annotation/block view
button_label_hideTextsentences_property_switchannotation-wordclass=Word class
button_label_hideTextsentences_property_switchannotation-wordclass=Lemma word class
button_label_hideTextsentences_property_switchannotation-tlaglossing=Gram. tagging BTS
button_label_hideTextsentences_property_switchannotation-linguisticglossing=Linguistic Glossing
button_label_hideTextsentences_property_switchannotation-tokentranslation=Token translation
button_label_hideTextsentences_property_switchannotation-linguisticglossing=Linguistic glossing
button_label_hideTextsentences_property_switchannotation-tokentranslation=Lemma translation
button_label_hideTextsentences_property_switchannotation-wordtokenid=Sentence token ID
button_label_hideTextsentences_property_translation=Translation
sentence_main_editor=Author(s)
Expand Down
52 changes: 26 additions & 26 deletions src/main/resources/templates/fragments/search/results.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,29 +115,37 @@ <h2 class="result-list-item-element label bbaw-libertine" th:utext="${{'<shortla
<div class="mr-sm-2"><a class="highlighted-link" th:href="${(#mvc.url('SC#getSingleObjectDetailsPage').arg(0,obj.id)).build()}"><span class="fas fa-arrow-circle-right"></span>&nbsp;(<span th:text="${position}+1">1</span>)</a></div>
<div th:each="token : *{tokens}" th:id="|block-${token.id}|">
<!--Bug: ul/li-Struktur ungültig-->
<ul class="annotation-block" th:classappend="${(token.lemma.id != null and #request.getParameter('tokens[0].lemma.id') == token.lemma.id) ? 'highlight' : '' }">
<ul class="annotation-block" th:classappend="${(token.lemma.id != null and #request.getParameter('tokens[0].lemma.id') == token.lemma.id) ? 'highlight' : '' }" th:with="isLinkable=${#bools.isTrue(token.lemma.id)}">
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-word-id"/>
<hr class="blockline bid">
</div>
<th:block th:if="${hasGlyphs}">
<div class="occ-list-item-element hieroglyphs">
<a th:if="${token.lemma.id}" th:href="'/lemma/'+${token.lemma.id}" target="_blank" rel="opener"><li th:replace="fragments/common :: token-hieroglyphs"/></a>
<a th:if="${isLinkable}" th:href="'/lemma/'+${token.lemma.id}" target="_blank" rel="opener"><li th:replace="fragments/common :: token-hieroglyphs"/></a>
<hr class="blockline">
</div>
<div th:unless="${token.lemma.id}"class="occ-list-item-element hieroglyphs">
<div th:unless="${isLinkable}"class="occ-list-item-element hieroglyphs">
<li th:replace="fragments/common :: token-hieroglyphs"/>
<hr class="blockline">
</div>
</th:block>
<div class="occ-list-item-element">
<a th:if="${token.lemma.id}" th:href="'/lemma/'+${token.lemma.id}" target="_blank" rel="opener"><li th:replace="fragments/common :: token-transcription"/></a>
<a th:if="${isLinkable}" th:href="'/lemma/'+${token.lemma.id}" target="_blank" rel="opener"><li th:replace="fragments/common :: token-transcription"/></a>
<hr class="blockline">
</div>
<div th:unless="${token.lemma.id}" class="occ-list-item-element">
<div th:unless="${isLinkable}" class="occ-list-item-element">
<li th:replace="fragments/common :: token-transcription"/>
<hr class="blockline">
</div>
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-word-class"/>
<hr class="blockline bwc">
</div>
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-translation"/>
<hr class="blockline btr">
</div>
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-bts-glossing"/>
<hr class="blockline bgloss">
Expand All @@ -146,14 +154,6 @@ <h2 class="result-list-item-element label bbaw-libertine" th:utext="${{'<shortla
<li th:replace="fragments/common :: token-ling-glossing"/>
<hr class="blockline bling">
</div>
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-translation"/>
<hr class="blockline btr">
</div>
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-word-id"/>
<hr class="blockline bid">
</div>
</ul>
</div>
<!--<th:block th:if="${hasGlyphs} AND ${isArtificiallyAligned}"><a th:replace="fragments/common :: artificial-alignment"></a></th:block>-->
Expand Down Expand Up @@ -230,29 +230,37 @@ <h2 class="result-list-item-element label bbaw-libertine" th:utext="${{'<shortla
<div class="container-annotation">
<div th:each="token : *{tokens}" th:id="|block-${token.id}|">
<!--Bug: ul/li-Struktur ungültig-->
<ul class="annotation-block" th:classappend="${((token.lemma.id != null or token.id != null) and ((#request.getParameter('tokens[0].lemma.id') == token.lemma.id and token.lemma.id != null) or (#request.getParameter('tokens[1].lemma.id') == token.lemma.id and token.lemma.id != null) or (searchTokenId == token.id))) ? 'highlight' : '' }">
<ul class="annotation-block" th:classappend="${((token.lemma.id != null or token.id != null) and ((#request.getParameter('tokens[0].lemma.id') == token.lemma.id and token.lemma.id != null) or (#request.getParameter('tokens[1].lemma.id') == token.lemma.id and token.lemma.id != null) or (searchTokenId == token.id))) ? 'highlight' : '' }" th:with="isLinkable=${#bools.isTrue(token.lemma.id)}">
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-word-id"/>
<hr class="blockline bid">
</div>
<th:block th:if="${hasGlyphs}">
<div class="occ-list-item-element hieroglyphs">
<a th:if="${token.lemma.id}" th:href="'/lemma/'+${token.lemma.id}" target="_blank" rel="opener"><li th:replace="fragments/common :: token-hieroglyphs"/></a>
<a th:if="${isLinkable}" th:href="'/lemma/'+${token.lemma.id}" target="_blank" rel="opener"><li th:replace="fragments/common :: token-hieroglyphs"/></a>
<hr class="blockline">
</div>
<div th:unless="${token.lemma.id}"class="occ-list-item-element hieroglyphs">
<div th:unless="${isLinkable}"class="occ-list-item-element hieroglyphs">
<li th:replace="fragments/common :: token-hieroglyphs"/>
<hr class="blockline">
</div>
</th:block>
<div class="occ-list-item-element">
<a th:if="${token.lemma.id}" th:href="'/lemma/'+${token.lemma.id}" target="_blank" rel="opener"><li th:replace="fragments/common :: token-transcription"/></a>
<a th:if="${isLinkable}" th:href="'/lemma/'+${token.lemma.id}" target="_blank" rel="opener"><li th:replace="fragments/common :: token-transcription"/></a>
<hr class="blockline">
</div>
<div th:unless="${token.lemma.id}" class="occ-list-item-element">
<div th:unless="${isLinkable}" class="occ-list-item-element">
<li th:replace="fragments/common :: token-transcription"/>
<hr class="blockline">
</div>
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-word-class"/>
<hr class="blockline bwc">
</div>
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-translation"/>
<hr class="blockline btr">
</div>
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-bts-glossing"/>
<hr class="blockline bgloss">
Expand All @@ -261,14 +269,6 @@ <h2 class="result-list-item-element label bbaw-libertine" th:utext="${{'<shortla
<li th:replace="fragments/common :: token-ling-glossing"/>
<hr class="blockline bling">
</div>
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-translation"/>
<hr class="blockline btr">
</div>
<div class="occ-list-item-element">
<li th:replace="fragments/common :: token-word-id"/>
<hr class="blockline bid">
</div>
</ul>
</div>
<th:block th:if="${hasGlyphs} AND ${isArtificiallyAligned}"><a th:replace="fragments/common :: artificial-alignment"></a></th:block>
Expand Down

0 comments on commit 2bff9bb

Please sign in to comment.