Merge pull request #1200 from nataliauvarova/diff_oirats

Diff oirats

Author: nataliauvarova

src/api/i18n.js

@@ -494,6 +494,7 @@ export const stringsToTranslate = [
   "Languages databases",
   "Last modified at",
   "left",
+  " left",
   "left for now",
   "Left text",
   "Legend",
@@ -601,6 +602,8 @@ export const stringsToTranslate = [
   "Neuro cognate multi-language suggestions",
   "Neuro cognate suggestions",
   "Neuro cognates computation",
+  "Neuro cognate multi-language suggestions (disabled, perspective is not published)",
+  "Neuro cognate suggestions (disabled, perspective is not published)",
   "neuter",
   "New organization",
   "New password",
@@ -802,6 +805,7 @@ export const stringsToTranslate = [
   "result url",
   "Return to tree",
   "right",
+  " right",
   "Right text",
   "Role",
   "Role data loading error, please contact adiministrators.",

src/components/CompareModal/index.js

@@ -37,22 +37,9 @@ const GET_TWINS_XLSX = gql`
 const CompareModal = ({ columns, entries, onClose, perspectiveId }) => {
   const getTranslation = useContext(TranslationContext);
 
-  const colums_temp = columns.slice(2);
-
+  const colums_temp = columns.slice(1);
   columns = Object.assign([], colums_temp);
 
-  entries = entries.map((entry, i) => {
-    let entry_temp = Object.assign({}, entry);
-
-    const entities_temp = entry_temp.entities.slice(2);
-
-    entry_temp.entities = Object.assign([], entities_temp);
-
-    entry = Object.assign({}, entry_temp);
-
-    return entry;
-  });
-
   let markedFalse = [];
   let markedTrue = [];
   columns.forEach((el, i) => {
@@ -339,10 +326,10 @@ const CompareModal = ({ columns, entries, onClose, perspectiveId }) => {
               }
             }
             if (dist > 0) {
-              dist = String(dist) + " " + getTranslation("right");
+              dist = String(dist) + getTranslation(" right");
             }
             if (dist < 0) {
-              dist = String(-dist) + " " + getTranslation("left");
+              dist = String(-dist) + getTranslation(" left");
             }
 
             let diff = [];

src/components/CompareModal/styles.scss

@@ -43,8 +43,18 @@
 
 .xlsx-link-label {
   float: left;
-  margin-left: 20px;
+  margin: 10px 0 0 16px;
   font-weight: bold;
   font-size: 1.2em;
   text-decoration-line: underline;
+  color: #5d54cd;
+
+  &:hover {
+    color: #5d54cd;
+    text-decoration: underline;
+  }
+
+  &:active {
+    color: #372f9d;
+  }
 }

src/components/CorporaView/index.js

@@ -561,7 +561,7 @@ class P extends React.Component {
     };
 
     const onCompare = () => {
-      openNewModal(CompareModal, { perspectiveId: id, columns: fields, entries: entries });
+      openNewModal(CompareModal, { perspectiveId: id, columns: fieldsText, entries: entries });
     };
 
     /* Basic case-insensitive, case-sensitive compare. */