fixes: no switching to inactive tab in entries, no ext. link for new synset in sel. preferences

Katarzyna Krasnowska
1 parent a320225e
Showing 4 changed files with 26 additions and 7 deletions
entries/static/entries/js/entries.js
entries/views.py
locale/en/LC_MESSAGES/django.mo
locale/en/LC_MESSAGES/django.po
@@ -212,6 +212,7 @@ function unbind_click(selector) {
 }
  
 function show_syntax(subentries) {
+    $('#syntax-no-examples').hide();
     var schemata_dom = subentries2dom(subentries);
     $('#syntax-schemata').append($(schemata_dom));
  
@@ -346,6 +347,7 @@ function restrict_syntax_examples() {
 }
  
 function show_semantics(frames, subentries) {
+    $('#semantics-no-examples').hide();
     var schemata_dom = subentries2dom(subentries);
     $('#semantics-schemata').append($(schemata_dom));
     var frames_dom = frames2dom(frames);
@@ -816,6 +818,22 @@ function get_entry(entry_id) {
             show_syntax(response.subentries);
             show_semantics(response.frames, response.subentries);
             show_unmatched_examples();
+            
+            // if current tab is empty, switch to an active tab
+            var active_tab = $('#entryTabs').find('.nav-link.active').attr('id');
+            if (active_tab === 'semantics-tab' && $('.frame').length === 0) {
+                // current tab is semantics -> show syntax
+                $('#syntax-tab').tab('show');
+            } else if (active_tab === 'examples-tab') {
+                if ($('.frame').length > 0) {
+                    // current tab is examples, semantics nonempty -> show semantics
+                    $('#semantics-tab').tab('show');
+                } else {
+                    // current tab is examples, semantics empty -> show syntax
+                    $('#syntax-tab').tab('show');
+                }
+            }
+            
             // tooltips with meaning gloss
             activate_tooltips($('.frame'));
             // tooltips with phrase descriptions
@@ -399,8 +399,9 @@ def get_prefs_list(argument):
     ) + sorted(
         ({
             'str'  : str(s),
-            'url'  : 'http://plwordnet21.clarin-pl.eu/synset/{}'.format(s.id),
-            'info' : get_synset_def(s),
+            # can be a new synset
+            'url'  : None if s.id < 0 else 'http://plwordnet21.clarin-pl.eu/synset/{}'.format(s.id),
+            'info' : s.lexical_units.all()[0].gloss if s.id < 0 else get_synset_def(s),
         } for s in argument.synsets.all()),
         key=lambda x: x['str']
     ) + sorted(
@@ -204,7 +204,7 @@ msgstr &quot;Number of frames&quot;
  
 #: entries/forms.py:195
 msgid "Typ frazy występujący w haśle."
-msgstr ""
+msgstr "Phrase type occurring in the entry."
  
 #: entries/forms.py:196
 msgid "Ukryj niepasujące schematy"
@@ -276,7 +276,7 @@ msgstr &quot;Predicative control&quot;
  
 #: entries/forms.py:451
 msgid "Typ frazy występujący na pozycji."
-msgstr ""
+msgstr "Phrase type occurring on the position."
  
 #: entries/forms.py:488
 msgid "Frazeologizm"
@@ -390,7 +390,7 @@ msgstr &quot;phraseologism&quot;
  
 #: entries/forms.py:785
 msgid "Realizacja składniowa frazy."
-msgstr ""
+msgstr "Syntactic realisation of the phrase."
  
 #: entries/forms.py:789
 msgid "Fraza składowa frazeologizmu porównawczego."
@@ -932,7 +932,7 @@ msgid &quot;&quot;
 "%(a1)s czasownika wymagającego bezokolicznika, którego własności są tożsame "
 "z narzucanymi przez czasownik w bezokoliczniku, w tym brak podmiotu"
 msgstr ""
-"%(a1)s of a verb requiring and infinitive, with properties identical to "
+"%(a1)s of a verb requiring an infinitive, with properties identical to "
 "those imposed by the infinitive, including no subject"
  
 #. Translators: fraza, posesywna, odpowiadająca
@@ -2003,7 +2003,7 @@ msgstr &quot;with realisation of the &lt;i&gt;{}&lt;/i&gt; argument.&quot;
  
 #: entries/views.py:388
 msgid "hiperonimy:"
-msgstr "hipernyms"
+msgstr "hypernyms"
  
 #: phrase_expansions/templates/phrase_expansions.html:6
 msgid "Rozwinięcia fraz"