Merge pull request #6026 from mzimandl/improvements

merge keywords table columns
czcorpus · Sep 27, 2023 · b62ce3a · b62ce3a
2 parents 2447def + ec87527
commit b62ce3a
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/public/files/js/translations/messages.cs.json b/public/files/js/translations/messages.cs.json
@@ -958,7 +958,6 @@
         "kwords__rel_freq_in_corp2_hd": "Rel. frekv. (referenční korpus)",
         "kwords__result_word_hd": "Slovo",
         "kwords__min_freq": "Min. frekvence",
-        "kwords__max_freq": "Max. frekvence",
-        "kwords__filter_th": "Filtr"
+        "kwords__max_freq": "Max. frekvence"
     }
 }
diff --git a/public/files/js/translations/messages.en.json b/public/files/js/translations/messages.en.json
@@ -958,7 +958,6 @@
         "kwords__rel_freq_in_corp2_hd": "Rel. freq. (ref. corpus)",
         "kwords__result_word_hd": "Word",
         "kwords__min_freq": "Min. frequency",
-        "kwords__max_freq": "Max. frequency",
-        "kwords__filter_th": "Filter"
+        "kwords__max_freq": "Max. frequency"
     }
 }
diff --git a/public/files/js/translations/messages.sl.json b/public/files/js/translations/messages.sl.json
@@ -957,7 +957,6 @@
         "kwords__rel_freq_in_corp2_hd": "Rel. freq. (ref. corpus) UNTRANSLATED",
         "kwords__result_word_hd": "Word UNTRANSLATED",
         "kwords__min_freq": "Min. frequency UNTRANSLATED",
-        "kwords__max_freq": "Max. frequency UNTRANSLATED",
-        "kwords__filter_th": "Filter"
+        "kwords__max_freq": "Max. frequency UNTRANSLATED"
     }
 }
diff --git a/public/files/js/translations/messages.szl.json b/public/files/js/translations/messages.szl.json
@@ -956,7 +956,6 @@
         "kwords__rel_freq_in_corp2_hd": "Rel. freq. (ref. corpus) UNTRANSLATED",
         "kwords__result_word_hd": "Word UNTRANSLATED",
         "kwords__min_freq": "Min. frequency UNTRANSLATED",
-        "kwords__max_freq": "Max. frequency UNTRANSLATED",
-        "kwords__filter_th": "Filter"
+        "kwords__max_freq": "Max. frequency UNTRANSLATED"
     }
 }
diff --git a/public/files/js/views/keywords/result/index.tsx b/public/files/js/views/keywords/result/index.tsx
@@ -110,10 +110,8 @@ export function init({
                                 ] :
                                 <th>{he.translate('kwords__score_col_hd')}</th>
                             }
-                            <th>{he.translate('kwords__freq_in_corp1_hd')}</th>
-                            <th>{he.translate('kwords__filter_th')}</th>
-                            <th>{he.translate('kwords__freq_in_corp2_hd')}</th>
-                            <th>{he.translate('kwords__filter_th')}</th>
+                            <th colSpan={2}>{he.translate('kwords__freq_in_corp1_hd')}</th>
+                            <th colSpan={2}>{he.translate('kwords__freq_in_corp2_hd')}</th>
                             <th>{he.translate('kwords__rel_freq_in_corp1_hd')}</th>
                             <th>{he.translate('kwords__rel_freq_in_corp2_hd')}</th>
                         </tr>
@@ -135,15 +133,15 @@ export function init({
                                         }
                                         <td className="num">{he.formatNumber(kw.frq1, 0)}</td>
                                         <td>
-                                            <a href={he.createActionLink('create_view',
+                                            <a title={he.translate('global__pnfilter_label_p')} href={he.createActionLink('create_view',
                                                 props.focusSubcorpId ?
                                                     {corpname: props.focusCorpname, usesubcorp: props.focusSubcorpId, q: buildQ(kw.item)} :
                                                     {corpname: props.focusCorpname, q: buildQ(kw.item)}
                                             )}> p </a>
                                         </td>
                                         <td className="num">{he.formatNumber(kw.frq2, 0)}</td>
                                         <td>
-                                            <a href={he.createActionLink('create_view',
+                                            <a title={he.translate('global__pnfilter_label_p')} href={he.createActionLink('create_view',
                                             props.refSubcorpId ?
                                                 {corpname: props.refCorpname, usesubcorp: props.refSubcorpId, q: buildQ(kw.item)} :
                                                 {corpname: props.refCorpname, q: buildQ(kw.item)}