s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'topic-item'

Browse Source
This commit is contained in:
Antonin Delpeuch 2017-10-20 15:39:09 +01:00
commit 73ac66e5f9
14 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/com/google/refine/commands/recon/ReconJudgeOneCellCommand.java
View File

@ -193,7 +193,7 @@ public class ReconJudgeOneCellCommand extends Command {
newCell.recon.judgment = Recon.Judgment.New;
newCell.recon.match = null;
description = "Mark to create new topic for " + cellDescription;
description = "Mark to create new item for " + cellDescription;
} else {
newCell.recon.judgment = Recon.Judgment.Matched;
newCell.recon.match = this.match;

12
main/src/com/google/refine/operations/recon/ReconJudgeSimilarCellsOperation.java
View File

@ -142,14 +142,14 @@ public class ReconJudgeSimilarCellsOperation extends EngineDependentMassCellOper
_similarValue + "\" in column " + _columnName;
} else if (_judgment == Judgment.New) {
if (_shareNewTopics) {
return "Mark to create one single new topic for all cells containing \"" +
return "Mark to create one single new item for all cells containing \"" +
_similarValue + "\" in column " + _columnName;
} else {
return "Mark to create one new topic for each cell containing \"" +
return "Mark to create one new item for each cell containing \"" +
_similarValue + "\" in column " + _columnName;
}
} else if (_judgment == Judgment.Matched) {
return "Match topic " +
return "Match item " +
_match.name + " (" +
_match.id + ") for cells containing \"" +
_similarValue + "\" in column " + _columnName;
@ -166,14 +166,14 @@ public class ReconJudgeSimilarCellsOperation extends EngineDependentMassCellOper
_similarValue + "\" in column " + _columnName;
} else if (_judgment == Judgment.New) {
if (_shareNewTopics) {
return "Mark to create one single new topic for " + cellChanges.size() + " cells containing \"" +
return "Mark to create one single new item for " + cellChanges.size() + " cells containing \"" +
_similarValue + "\" in column " + _columnName;
} else {
return "Mark to create one new topic for each of " + cellChanges.size() + " cells containing \"" +
return "Mark to create one new item for each of " + cellChanges.size() + " cells containing \"" +
_similarValue + "\" in column " + _columnName;
}
} else if (_judgment == Judgment.Matched) {
return "Match topic " +
return "Match item " +
_match.name + " (" +
_match.id + ") for " +
cellChanges.size() + " cells containing \"" +

12
main/src/com/google/refine/operations/recon/ReconMarkNewTopicsOperation.java
View File

@ -89,21 +89,21 @@ public class ReconMarkNewTopicsOperation extends EngineDependentMassCellOperatio
@Override
protected String getBriefDescription(Project project) {
return "Mark to create new topics for cells in column " + _columnName +
return "Mark to create new items for cells in column " + _columnName +
(_shareNewTopics ?
", one topic for each group of similar cells" :
", one topic for each cell");
", one item for each group of similar cells" :
", one item for each cell");
}
@Override
protected String createDescription(Column column,
List<CellChange> cellChanges) {
return "Mark to create new topics for " + cellChanges.size() +
return "Mark to create new items for " + cellChanges.size() +
" cells in column " + column.getName() +
(_shareNewTopics ?
", one topic for each group of similar cells" :
", one topic for each cell");
", one item for each group of similar cells" :
", one item for each cell");
}
@Override

4
main/src/com/google/refine/operations/recon/ReconMatchSpecificTopicOperation.java
View File

@ -128,7 +128,7 @@ public class ReconMatchSpecificTopicOperation extends EngineDependentMassCellOpe
@Override
protected String getBriefDescription(Project project) {
return "Match specific topic " +
return "Match specific item " +
match.name + " (" +
match.id + ") to cells in column " + _columnName;
}
@ -136,7 +136,7 @@ public class ReconMatchSpecificTopicOperation extends EngineDependentMassCellOpe
@Override
protected String createDescription(Column column,
List<CellChange> cellChanges) {
return "Match specific topic " +
return "Match specific item " +
match.name + " (" +
match.id + ") to " + cellChanges.size() +
" cells in column " + column.getName();

26
main/webapp/modules/core/langs/translation-en.json
View File

@ -384,11 +384,11 @@
"core-views": {
"edit-cell": "Edit this cell",
"choose-match": "Choose new match",
"match-all-cells": "Match this topic to this and all identical cells",
"match-this-cell": "Match this topic to this cell",
"create-topic-cells": "Create a new topic for this and all identical cells",
"create-topic-cell": "Create a new topic for this cell",
"create-topic": "Create new topic",
"match-all-cells": "Match this item to this and all identical cells",
"match-this-cell": "Match this item to this cell",
"create-topic-cells": "Create a new item for this and all identical cells",
"create-topic-cell": "Create a new item for this cell",
"create-topic": "Create new item",
"search-match": "Search for match",
"not-valid-number": "Not a valid number.",
"not-valid-date": "Not a valid date.",
@ -411,7 +411,7 @@
"collapse-left": "Collapse all columns to left",
"collapse-right": "Collapse all columns to right",
"reconcile": "Reconcile",
"match-fb": "Match this column's cells to topics on Freebase",
"reconcile-tooltip": "Match this column's cells to items from external databases",
"reverse": "Reverse",
"remove-sort": "Remove sort",
"sort-by": "Sort by",
@ -445,7 +445,7 @@
"warning-other-col": "Please select some other column to copy to.",
"warning-sel-judg": "Please select at least one kind of judgment to copy.",
"start-recon": "Start reconciling",
"recon-text-fb": "Reconcile text in this column with topics on Freebase",
"recon-text-fb": "Reconcile text in this column with items on Freebase",
"facets": "Facets",
"by-judg": "By judgment",
"best-score": "Best candidate's score",
@ -469,12 +469,12 @@
"actions": "Actions",
"best-cand": "Match each cell to its best candidate",
"best-cand2": "Match each cell to its best candidate in this column for all current filtered rows",
"new-topic": "Create a new topic for each cell",
"new-topic2": "Mark to create one new topic for each cell in this column for all current filtered rows",
"one-topic": "Create one new topic for similar cells",
"one-topic2": "Mark to create one new topic for each group of similar cells in this column for all current filtered rows",
"new-topic": "Create a new item for each cell",
"new-topic2": "Mark to create one new item for each cell in this column for all current filtered rows",
"one-topic": "Create one new item for similar cells",
"one-topic2": "Mark to create one new item for each group of similar cells in this column for all current filtered rows",
"filtered-cell": "Match all filtered cells to...",
"filtered-cell2": "Search for a topic to match all filtered cells to",
"filtered-cell2": "Search for a item to match all filtered cells to",
"discard-judg": "Discard reconciliation judgments",
"discard-judg2": "Discard reconciliation judgments in this column for all current filtered rows",
"clear-recon": "Clear reconciliation data",
@ -667,7 +667,7 @@
"start-recon": "Start Reconciling",
"add-service": "Add Service",
"dont-reconcile": "Don't Reconcile Cell",
"new-topic": "New Topic",
"new-topic": "New Item",
"match": "Match",
"copy": "Copy",
"transpose": "Transpose",

1
main/webapp/modules/core/langs/translation-es.json
View File

@ -406,7 +406,6 @@
"collapse-left": "Contraer todas las columnas a la izquierda",
"collapse-right": "Contraer todas las columnas a la derecha",
"reconcile": "Cotejar",
"match-fb": "Coincidir las celdas de esta columna con valores de Freebase",
"reverse": "Invertir",
"remove-sort": "Quitar orden",
"sort-by": "Ordenar por",

3
main/webapp/modules/core/langs/translation-fr.json
View File

@ -473,7 +473,8 @@
"move-to-right": "Déplacer la colonne à droite",
"reorder-perma": "Retrier les lignes de façon permanente",
"new": "nouveau",
"match-fb": "Apparier les cellules de cette colonne aux sujets de Freebase",
"reconcile-tooltip": "Apparier les cellules de cette colonne aux entrées de bases de données externes",
"qa-facets": "Facettes AQ",
"custom-numeric-label": "Facette numérique personnalisée sur la colonne",
"log-length-facet": "Facette logarithmique par longueur du texte",
"custom-numeric": "Personnaliser la facette numérique",

1
main/webapp/modules/core/langs/translation-he.json
View File

@ -416,7 +416,6 @@
"collapse-left": "כיווץ כל הטורים שמשמאל",
"collapse-right": "כיווץ כל הטורים מימין",
"reconcile": "השלמה",
"match-fb": "התאמת הטורים בטור זה לנושאים מתוך Freebase",
"reverse": "היפוך",
"remove-sort": "הסרת המיון",
"sort-by": "מיון לפי",

1
main/webapp/modules/core/langs/translation-it.json
View File

@ -406,7 +406,6 @@
"collapse-left": "Collassa tutte le colonne a sinistra",
"collapse-right": "Collassa tutte le colonne a destra",
"reconcile": "Riconcilia",
"match-fb": "Matcha le celle di questa colonna con topic di Freebase",
"reverse": "Inverti",
"remove-sort": "Rimuovi ordinamento",
"sort-by": "Ordina per",

1
main/webapp/modules/core/langs/translation-jp.json
View File

@ -406,7 +406,6 @@
"collapse-left": "左側すべてをたたむ",
"collapse-right": "右側すべてをたたむ",
"reconcile": "名寄せ",
"match-fb": "Freebaseでこのカラムのセルをトピックにマッチ",
"reverse": "反転",
"remove-sort": "ソートを削除",
"sort-by": "ソート",

1
main/webapp/modules/core/langs/translation-ru.json
View File

@ -453,7 +453,6 @@
"collapse-left": "Свернуть все колонки слева",
"collapse-right": "Свернуть все колонки справа",
"reconcile": "Сверка",
"match-fb": "Сверить данные этой колонки с информацией в Базе знаний",
"reverse": "В обратном порядке",
"remove-sort": "Убрать сортировку",
"sort-by": "Сортировка",

1
main/webapp/modules/core/langs/translation-zh.json
View File

@ -406,7 +406,6 @@
"collapse-left": "收起左侧列",
"collapse-right": "收起右侧列",
"reconcile": "搭配",
"match-fb": "将此列的单元格与Freebase中的主题搭配",
"reverse": "反转",
"remove-sort": "不排序",
"sort-by": "排序，按照",

4
main/webapp/modules/core/scripts/views/data-table/cell-recon-preview-popup-header.html
View File

@ -1,5 +1,5 @@
<div class="data-table-topic-popup-header">
<button class="button" title="Match topic to this cell" bind="matchButton"></button>
<button class="button" title="Match topic to all visible cells with same content" bind="matchSimilarButton"></button>
<button class="button" title="Match item to this cell" bind="matchButton"></button>
<button class="button" title="Match item to all visible cells with same content" bind="matchSimilarButton"></button>
<button class="button" title="Cancel" bind="cancelButton"></button>
</div>

2
main/webapp/modules/core/scripts/views/data-table/column-header-ui.js
View File

@ -187,7 +187,7 @@ DataTableColumnHeaderUI.prototype._createMenuForColumnHeader = function(elmt) {
{
id: "core/reconcile",
label: $.i18n._('core-views')["reconcile"],
tooltip: $.i18n._('core-views')["match-fb"],
tooltip: $.i18n._('core-views')["reconcile-tooltip"],
width: "170px",
submenu: []
}