diff --git a/main/src/com/google/refine/model/Cell.java b/main/src/com/google/refine/model/Cell.java index da73a996d..a2ca0139e 100644 --- a/main/src/com/google/refine/model/Cell.java +++ b/main/src/com/google/refine/model/Cell.java @@ -73,7 +73,7 @@ public class Cell implements HasFields { return value; } else if ("recon".equals(name)) { return recon; - } else if ("error".equals(name)) { + } else if ("errorMessage".equals(name)) { return getErrorMessage(); } return null; diff --git a/main/tests/server/src/com/google/refine/model/CellTests.java b/main/tests/server/src/com/google/refine/model/CellTests.java index 1ad3e94e7..839b93635 100644 --- a/main/tests/server/src/com/google/refine/model/CellTests.java +++ b/main/tests/server/src/com/google/refine/model/CellTests.java @@ -101,7 +101,7 @@ public class CellTests { String errorMessage = "Sample error message"; EvalError err = new EvalError(errorMessage); Cell c = new Cell(err, null); - assertEquals(c.getField("error", null), errorMessage); + assertEquals(c.getField("errorMessage", null), errorMessage); assertEquals(c.getField("value", null), err); } diff --git a/main/webapp/modules/core/langs/translation-ceb.json b/main/webapp/modules/core/langs/translation-ceb.json index 87bb660b0..209aa9680 100644 --- a/main/webapp/modules/core/langs/translation-ceb.json +++ b/main/webapp/modules/core/langs/translation-ceb.json @@ -251,7 +251,7 @@ "core-dialogs/csv": "Gibuwag ang bili sa koma (CSV)", "core-dialogs/template-prefix": "Sa una", "core-dialogs/nearest-neighbor": "pinakaduol nga silingan", - "core-dialogs/cell-fields": "Ang kasamtangan nga cell. Naa cyay pipila ka mga field: 'value' ug 'recon'.", + "core-dialogs/cell-fields": "Ang kasamtangan nga cell. Naa cyay pipila ka mga field: 'value', 'recon' ug 'errorMessage'.", "core-dialogs/idling": "Idling…", "core-dialogs/local-time": "Gamita ang oras nga lokal zone", "core-dialogs/rotated-counter-clock": "Ituyok sa 45° kontra sa tuo", diff --git a/main/webapp/modules/core/langs/translation-de.json b/main/webapp/modules/core/langs/translation-de.json index 273d32381..e5d52543e 100644 --- a/main/webapp/modules/core/langs/translation-de.json +++ b/main/webapp/modules/core/langs/translation-de.json @@ -191,7 +191,7 @@ "core-dialogs/cells-of-row": "Die Zellen der aktuellen Zeile. Dies ist eine Abkürzung für 'row.cells'. Eine bestimmte Zelle kann mit 'cells.' abgerufen werden, wenn der ein einzelnes Wort ist, oder andernfalls mit 'cells[\"\"].", "core-dialogs/for-include-drop-statement-checkbox": "Drop-Anweisung einbinden", "core-dialogs/ngram-radius": "Radius ", - "core-dialogs/cell-fields": "Die aktuelle Zelle. Es hat einige Felder: 'value' und 'recon'.", + "core-dialogs/cell-fields": "Die aktuelle Zelle. Es hat einige Felder: 'value', 'recon' und 'errorMessage'.", "core-dialogs/processing": "Verarbeitung…", "core-dialogs/row-index": "Der Index der aktuellen Zeile. Dies ist eine Abkürzung für 'row.index'.", "core-dialogs/ignore-facets": "Facetten und Filter ignorieren und alle Zeilen exportieren", diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index e24001886..999ee6029 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -212,7 +212,7 @@ "core-dialogs/small-dot": "Small Dot Size", "core-dialogs/regular-dot": "Regular Dot Size", "core-dialogs/big-dot": "Big Dot Size", - "core-dialogs/cell-fields": "The current cell. It has a few fields: 'value' and 'recon'.", + "core-dialogs/cell-fields": "The current cell. It has a few fields: 'value', 'recon' and 'errorMessage'.", "core-dialogs/cell-value": "The current cell's value. This is a shortcut for 'cell.value'.", "core-dialogs/row-fields": "The current row. It has 5 fields: 'flagged', 'starred', 'index', 'cells', and 'record'.", "core-dialogs/cells-of-row": "The cells of the current row. This is a shortcut for 'row.cells'. A particular cell can be retrieved with 'cells.' if the is a single word, or with 'cells[\"\"] otherwise.", diff --git a/main/webapp/modules/core/langs/translation-es.json b/main/webapp/modules/core/langs/translation-es.json index 3f214d356..1e4c07fca 100644 --- a/main/webapp/modules/core/langs/translation-es.json +++ b/main/webapp/modules/core/langs/translation-es.json @@ -255,7 +255,7 @@ "core-dialogs/csv": "Delimitado por comas (CSV)", "core-dialogs/template-prefix": "Prefijo", "core-dialogs/nearest-neighbor": "Vecino más cercano", - "core-dialogs/cell-fields": "La celda actual. Tiene pocos campos: 'value' y 'recon'.", + "core-dialogs/cell-fields": "La celda actual. Tiene pocos campos: 'value', 'recon' y 'errorMessage.", "core-dialogs/idling": "Idling ...", "core-dialogs/local-time": "Usar zona horaria local", "clustering-keyers/metaphone3": "metaphone3", diff --git a/main/webapp/modules/core/langs/translation-fil.json b/main/webapp/modules/core/langs/translation-fil.json index 54835b8f8..91e6ed316 100644 --- a/main/webapp/modules/core/langs/translation-fil.json +++ b/main/webapp/modules/core/langs/translation-fil.json @@ -251,7 +251,7 @@ "core-dialogs/csv": "Mga halaga na pinaghiwalay ng komma (CSV)", "core-dialogs/template-prefix": "Prefix", "core-dialogs/nearest-neighbor": "pinakamalapit na kapitbahay", - "core-dialogs/cell-fields": "Ang kasalukuyang cell. Mayroon itong ilang mga patlang: 'halaga' at 'recon'.", + "core-dialogs/cell-fields": "Ang kasalukuyang cell. Mayroon itong ilang mga patlang: 'value', 'recon' at 'errorMessage'.", "core-dialogs/idling": "Pag ...", "core-dialogs/local-time": "Gumamit ng lokal na time zone", "core-dialogs/rotated-counter-clock": "Pinaikot 45 ° Counter-Clockwise", diff --git a/main/webapp/modules/core/langs/translation-fr.json b/main/webapp/modules/core/langs/translation-fr.json index 7936b5059..a6287612e 100644 --- a/main/webapp/modules/core/langs/translation-fr.json +++ b/main/webapp/modules/core/langs/translation-fr.json @@ -264,7 +264,7 @@ "core-dialogs/template-prefix": "Préfixe", "core-dialogs/nearest-neighbor": "plus proche voisin", "core-dialogs/tableNameLabel": "Nom de la table :", - "core-dialogs/cell-fields": "La cellule en cours. Elle a deux champs : 'value' et 'recon'.", + "core-dialogs/cell-fields": "La cellule en cours. Elle a quelques champs : 'value', 'recon' et 'errorMessage'.", "core-dialogs/for-null-cell-value-to-empty-str-label": "Convertir les valeurs nulles en NULL dans les INSERT", "core-dialogs/idling": "Attente…", "core-dialogs/local-time": "Utiliser le fuseau horaire local", diff --git a/main/webapp/modules/core/langs/translation-he.json b/main/webapp/modules/core/langs/translation-he.json index 23585b12f..99a59e9e5 100644 --- a/main/webapp/modules/core/langs/translation-he.json +++ b/main/webapp/modules/core/langs/translation-he.json @@ -174,7 +174,7 @@ "core-dialogs/small-dot": "גודל הנקודה הקטנה", "core-dialogs/regular-dot": "גודל נקודה רגילה", "core-dialogs/big-dot": "גודל נקודה גדולה", - "core-dialogs/cell-fields": "בתא הנוכחי, יש כמה שדות: 'value' and 'recon'.", + "core-dialogs/cell-fields": "בתא הנוכחי, יש כמה שדות: 'value', 'recon' and 'errorMessage'.", "core-dialogs/cell-value": "ערך התא הנוכחי. זהו קיצור דרך עבור 'cell.value'.", "core-dialogs/row-fields": "בשורה הנוכחית, יש 5 שדות: 'flagged', 'starred', 'index', 'cells', 'record'.", "core-dialogs/cells-of-row": "התאים של השורה הנוכחית. זהו קיצור דרך ל-'row.cells'.תא מסויים יכול להיות מאוחזר עם 'cells.' אם היא מילה בודדת, או עם 'cells[\"\"] .", diff --git a/main/webapp/modules/core/langs/translation-hu.json b/main/webapp/modules/core/langs/translation-hu.json index 0b8437b20..2611fe527 100644 --- a/main/webapp/modules/core/langs/translation-hu.json +++ b/main/webapp/modules/core/langs/translation-hu.json @@ -216,7 +216,7 @@ "core-dialogs/returns": "visszatérés", "core-dialogs/preview": "Előnézet", "core-dialogs/no-cluster-found": "Csoportok létrehozása ezzel a módszerrel sikertelen", - "core-dialogs/row-fields": "A jelenlegi sor. 5 mezője van: 'megjelölve', 'megcsillagozva', 'index', 'cellák', és 'rekord'.", + "core-dialogs/row-fields": "A jelenlegi sor. 5 mezője van: 'flagged', 'starred', 'index', 'cells', és 'record'.", "core-dialogs/line-sep": "Sor elválasztó", "core-dialogs/template-export": "Exportálás formázása", "core-dialogs/browse-only-these": "Csak ezen értékek böngészése", @@ -245,7 +245,7 @@ "core-dialogs/csv": "Vesszővel tagolt értékek (CSV)", "core-dialogs/template-prefix": "Előtag", "core-dialogs/nearest-neighbor": "legközelebbi szomszéd", - "core-dialogs/cell-fields": "Jelenlegi cella. Két mezője van: 'value' és 'recon'.", + "core-dialogs/cell-fields": "Jelenlegi cella. Három mezője van: 'value', 'recon' és 'errorMessage'.", "core-dialogs/idling": "Várakozás…", "core-dialogs/local-time": "Helyi időzóna használata", "core-dialogs/rotated-counter-clock": "45°-kal elforgatva óramutató járásával ellentétes irányban", diff --git a/main/webapp/modules/core/langs/translation-it.json b/main/webapp/modules/core/langs/translation-it.json index 4d70f51cf..00b0a6dd5 100644 --- a/main/webapp/modules/core/langs/translation-it.json +++ b/main/webapp/modules/core/langs/translation-it.json @@ -262,7 +262,7 @@ "core-dialogs/template-prefix": "Prefisso", "core-dialogs/nearest-neighbor": "nearest neighbor", "core-dialogs/tableNameLabel": "Nome tabella:", - "core-dialogs/cell-fields": "La cella corrente. Ha alcuni campi: 'value' e 'recon'.", + "core-dialogs/cell-fields": "La cella corrente. Ha alcuni campi: 'value', 'recon' e 'errorMessage'.", "core-dialogs/for-null-cell-value-to-empty-str-label": "Convertire i valori null in NULL nelle direttive di INSERT", "core-dialogs/idling": "Calcolando…", "core-dialogs/local-time": "Usa fuso orario locale", diff --git a/main/webapp/modules/core/langs/translation-jp.json b/main/webapp/modules/core/langs/translation-jp.json index 006c12fa6..056ca359e 100644 --- a/main/webapp/modules/core/langs/translation-jp.json +++ b/main/webapp/modules/core/langs/translation-jp.json @@ -263,7 +263,7 @@ "core-dialogs/template-prefix": "ファイルの冒頭部", "core-dialogs/nearest-neighbor": "最近傍法", "core-dialogs/tableNameLabel": "テーブル名:", - "core-dialogs/cell-fields": "現在のcell: valueとreconのフィールドがあります.", + "core-dialogs/cell-fields": "現在のcell: value,reconとerrorMessageのフィールドがあります.", "core-dialogs/for-null-cell-value-to-empty-str-label": "null値をINSERT文でNULLに変換する", "core-dialogs/idling": "アイドリング中…", "core-dialogs/for-include-if-exist-drop-stmt-checkbox": "Drop文のIF EXISTSを含める", diff --git a/main/webapp/modules/core/langs/translation-pt_BR.json b/main/webapp/modules/core/langs/translation-pt_BR.json index b0d4cb812..84e27a2e8 100644 --- a/main/webapp/modules/core/langs/translation-pt_BR.json +++ b/main/webapp/modules/core/langs/translation-pt_BR.json @@ -255,7 +255,7 @@ "core-dialogs/choose-export-destination": "Escolha o local onde salvar o projeto exportado", "core-dialogs/template-prefix": "Prefixo", "core-dialogs/nearest-neighbor": "vizinho mais próximo", - "core-dialogs/cell-fields": "A célula atual. Ela tem alguns campos: 'valor' e 'reconhecer'.", + "core-dialogs/cell-fields": "A célula atual. Ela tem alguns campos: 'value', 'recon' e 'errorMessage'.", "core-dialogs/idling": "Aguarde…", "core-dialogs/local-time": "Usar fuso horário local", "clustering-keyers/metaphone3": "metaphone3", diff --git a/main/webapp/modules/core/langs/translation-ru.json b/main/webapp/modules/core/langs/translation-ru.json index c03340e25..7ca66cf5f 100644 --- a/main/webapp/modules/core/langs/translation-ru.json +++ b/main/webapp/modules/core/langs/translation-ru.json @@ -290,7 +290,7 @@ "core-dialogs/csv": "Значения разделенные запятыми (CSV)", "core-dialogs/template-prefix": "Префикс", "core-dialogs/nearest-neighbor": "k-ближайших соседей", - "core-dialogs/cell-fields": "Текущая ячейка. Имеет поля: 'value' и 'recon'.", + "core-dialogs/cell-fields": "Текущая ячейка. Имеет поля: 'value', 'recon' и 'errorMessage'.", "core-dialogs/idling": "Битьё баклуш...", "core-dialogs/local-time": "Использовать временные зоны", "core-dialogs/rotated-counter-clock": "Повернуть на 45° против часовой", diff --git a/main/webapp/modules/core/langs/translation-sv.json b/main/webapp/modules/core/langs/translation-sv.json index ec5f80f61..0fd529391 100644 --- a/main/webapp/modules/core/langs/translation-sv.json +++ b/main/webapp/modules/core/langs/translation-sv.json @@ -202,9 +202,9 @@ "core-dialogs/small-dot": "Liten punktstorlek", "core-dialogs/regular-dot": "Normal punktstorlek", "core-dialogs/big-dot": "Stor punktstorlek", - "core-dialogs/cell-fields": "Den aktuella cellen. Den har några fält: \"värde\" och \"recon\".", - "core-dialogs/cell-value": "Den aktuella cellens värde. Detta är en genväg för \"cell.value\".", - "core-dialogs/row-fields": "Den aktuella raden. Den har 5 fält: \"flaggad\", \"stjärnad\", \"index\", \"celler\" och \"post\".", + "core-dialogs/cell-fields": "Den aktuella cellen. Den har några fält: 'value', 'recon' och 'errorMessage'.", + "core-dialogs/cell-value": "Den aktuella cellens värde. Detta är en genväg för 'cell.value'.", + "core-dialogs/row-fields": "Den aktuella raden. Den har 5 fält: 'flagged', 'starred', 'index', 'cells' och 'record'.", "core-dialogs/cells-of-row": "Cellerna i den aktuella raden. Detta är en genväg för 'row.cells'. En särskild cell kan hämtas med 'cells.'om är ett enda ord, eller annars med 'cells[\"\"]'.", "core-dialogs/row-index": "Den aktuella radens index. Detta är en genväg för 'row.index'.", "core-dialogs/returns": "returnerar", diff --git a/main/webapp/modules/core/langs/translation-tl.json b/main/webapp/modules/core/langs/translation-tl.json index bf1f1864f..2bb8e5d0c 100644 --- a/main/webapp/modules/core/langs/translation-tl.json +++ b/main/webapp/modules/core/langs/translation-tl.json @@ -251,7 +251,7 @@ "core-dialogs/csv": "Ang comma-separated values (CSV)", "core-dialogs/template-prefix": "Unlapi", "core-dialogs/nearest-neighbor": "ang pinakamalapit na katabi", - "core-dialogs/cell-fields": "Ang kasalukuyang cell. Mayroon itong mga iilang mga field: 'value' at 'recon'.", + "core-dialogs/cell-fields": "Ang kasalukuyang cell. Mayroon itong mga iilang mga field: 'value', 'recon' at 'errorMessage'.", "core-dialogs/idling": "Pag-idling...", "core-dialogs/local-time": "Gamitin ang lokal na time zone", "core-dialogs/rotated-counter-clock": "Umiikot ng 45° Counter-Clockwise", diff --git a/main/webapp/modules/core/langs/translation-zh.json b/main/webapp/modules/core/langs/translation-zh.json index 26fa15bf4..5cd446586 100644 --- a/main/webapp/modules/core/langs/translation-zh.json +++ b/main/webapp/modules/core/langs/translation-zh.json @@ -174,7 +174,7 @@ "core-dialogs/small-dot": "小网点尺寸", "core-dialogs/regular-dot": "正常网点尺寸", "core-dialogs/big-dot": "大网点尺寸", - "core-dialogs/cell-fields": "当前的单元格. 它包含如下字段:'value'和'recon'。", + "core-dialogs/cell-fields": "当前的单元格. 它包含如下字段:'value', 'recon'和'errorMessage'。", "core-dialogs/cell-value": "当前单元格的值. 它是cell.value的简写.", "core-dialogs/row-fields": "当前的行. 它包含以下5个字段: 'flagged', 'starred', 'index', 'cells'和'record'.", "core-dialogs/cells-of-row": "当前行中的单元格们. 它是row.cells的简写. 如果是一个字的话,那么可以通过'cells.'来使用它,否则需要使用cells[']",