From 64b01a23193fa6b810fd3eb6b058c57dee04f554 Mon Sep 17 00:00:00 2001 From: Joanne Date: Fri, 16 Mar 2018 23:05:00 +0800 Subject: [PATCH 1/5] Add logic for new customized facets --- .../refine/grel/ControlFunctionRegistry.java | 2 ++ .../refine/grel/controls/IsEmptyString.java | 14 +++++++++++++ .../scripts/views/data-table/menu-facets.js | 20 ++++++++++++++++--- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 main/src/com/google/refine/grel/controls/IsEmptyString.java diff --git a/main/src/com/google/refine/grel/ControlFunctionRegistry.java b/main/src/com/google/refine/grel/ControlFunctionRegistry.java index abc343a74..48d36e110 100644 --- a/main/src/com/google/refine/grel/ControlFunctionRegistry.java +++ b/main/src/com/google/refine/grel/ControlFunctionRegistry.java @@ -141,6 +141,7 @@ import com.google.refine.grel.controls.ForRange; import com.google.refine.grel.controls.If; import com.google.refine.grel.controls.IsBlank; import com.google.refine.grel.controls.IsError; +import com.google.refine.grel.controls.IsEmptyString; import com.google.refine.grel.controls.IsNonBlank; import com.google.refine.grel.controls.IsNotNull; import com.google.refine.grel.controls.IsNull; @@ -305,6 +306,7 @@ public class ControlFunctionRegistry { registerControl("isNull", new IsNull()); registerControl("isNotNull", new IsNotNull()); + registerControl("isEmptyString", new IsEmptyString()); registerControl("isBlank", new IsBlank()); registerControl("isNonBlank", new IsNonBlank()); registerControl("isNumeric", new IsNumeric()); diff --git a/main/src/com/google/refine/grel/controls/IsEmptyString.java b/main/src/com/google/refine/grel/controls/IsEmptyString.java new file mode 100644 index 000000000..e9154f8e2 --- /dev/null +++ b/main/src/com/google/refine/grel/controls/IsEmptyString.java @@ -0,0 +1,14 @@ +package com.google.refine.grel.controls; + +public class IsEmptyString extends IsTest { + @Override + protected String getDescription() { + return "Returns whether o is an empty string"; + } + + @Override + protected boolean test(Object o) { + return o != null && o.getClass().equals(String.class) + && o.equals(""); + } +} diff --git a/main/webapp/modules/core/scripts/views/data-table/menu-facets.js b/main/webapp/modules/core/scripts/views/data-table/menu-facets.js index f70585402..5d5651344 100644 --- a/main/webapp/modules/core/scripts/views/data-table/menu-facets.js +++ b/main/webapp/modules/core/scripts/views/data-table/menu-facets.js @@ -246,15 +246,29 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { } }, { - id: "core/blank-facet", - label: $.i18n._('core-views')["facet-blank"], + id: "core/null-facet", + label: $.i18n._('core-views')["facet-null"], click: function() { ui.browsingEngine.addFacet( "list", { "name": column.name, "columnName": column.name, - "expression": "isBlank(value)" + "expression": "isNull(value)" + } + ); + } + }, + { + id: "core/empty-string-facet", + label: $.i18n._('core-views')["facet-empty-string"], + click: function() { + ui.browsingEngine.addFacet( + "list", + { + "name": column.name, + "columnName": column.name, + "expression": "isEmptyString(value)" } ); } From 43c81bc727e89cadfa3334b257f85083feb0802e Mon Sep 17 00:00:00 2001 From: Joanne Date: Fri, 16 Mar 2018 23:05:21 +0800 Subject: [PATCH 2/5] Add translations and labels for new facets --- main/webapp/modules/core/langs/translation-ceb.json | 2 ++ main/webapp/modules/core/langs/translation-en.json | 2 ++ main/webapp/modules/core/langs/translation-es.json | 2 ++ main/webapp/modules/core/langs/translation-fil.json | 2 ++ main/webapp/modules/core/langs/translation-fr.json | 2 ++ main/webapp/modules/core/langs/translation-he.json | 2 ++ main/webapp/modules/core/langs/translation-it.json | 2 ++ main/webapp/modules/core/langs/translation-jp.json | 2 ++ main/webapp/modules/core/langs/translation-pt_BR.json | 2 ++ main/webapp/modules/core/langs/translation-ru.json | 2 ++ main/webapp/modules/core/langs/translation-tl.json | 2 ++ main/webapp/modules/core/langs/translation-zh.json | 2 ++ 12 files changed, 24 insertions(+) diff --git a/main/webapp/modules/core/langs/translation-ceb.json b/main/webapp/modules/core/langs/translation-ceb.json index 06bb28577..7539127ca 100644 --- a/main/webapp/modules/core/langs/translation-ceb.json +++ b/main/webapp/modules/core/langs/translation-ceb.json @@ -515,6 +515,8 @@ "columnize": "Kolumnays pinaagi sa Key/ Bili sa mga Kolum", "add-col-fetch": "Pun-i ang kolum sa pagkuha sa URLs basi sa kolum", "facet-blank": "Bahin sa blangko", + "facet-null": "Bahin sa null", + "facet-empty-string": "Bahin sa walay sulod nga pisi", "best-cand-edit-dist": "labing maayong ngalan sa kandidata nga usbon", "spec-separator": "Palihug hinganli ang separator sa tunga sa orihinal nga ngalan sa mga kolum ug bili sa cells.", "milli": "millisegundo", diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index aff50f5bb..e11e9b13a 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -523,6 +523,8 @@ "unicode-facet": "Unicode char-code facet", "facet-error": "Facet by error", "facet-blank": "Facet by blank", + "facet-null": "Facet by null", + "facet-empty-string": "Facet by empty string", "text-filter": "Text filter", "add-col-col": "Add column based on column", "new-col-name": "New column name", diff --git a/main/webapp/modules/core/langs/translation-es.json b/main/webapp/modules/core/langs/translation-es.json index 612dc05bf..96eb25ebd 100644 --- a/main/webapp/modules/core/langs/translation-es.json +++ b/main/webapp/modules/core/langs/translation-es.json @@ -491,6 +491,8 @@ "unicode-facet": "Faceta por caracteres Unicode", "facet-error": "Faceta por error", "facet-blank": "Faceta por blanco", + "facet-null": "Faceta por nulo", + "facet-empty-string": "Faceta por cuerda vacía", "text-filter": "Filtro de texto", "add-col-col": "Agregar columna basada en la columna", "new-col-name": "Nuevo nombre de la columna", diff --git a/main/webapp/modules/core/langs/translation-fil.json b/main/webapp/modules/core/langs/translation-fil.json index 66b56f3e5..b1fc9a0fb 100644 --- a/main/webapp/modules/core/langs/translation-fil.json +++ b/main/webapp/modules/core/langs/translation-fil.json @@ -518,6 +518,8 @@ "columnize": "Columnize ayon sa Key / Value Columns", "add-col-fetch": "Magdagdag ng haligi sa pamamagitan ng pagkuha ng mga URL batay sa haligi", "facet-blank": "Blangko ang facet", + "facet-null": "Wala ang facet", + "facet-empty-string": "walang laman na string ang facet", "best-cand-edit-dist": "Ang distansya ng pag-edit ng pangalan ng pinakamahusay na kandidato", "spec-separator": "Mangyaring tukuyin ang separator sa pagitan ng mga orihinal na pangalan ng haligi at mga halaga ng cell.", "split-into": "Na hati sa", diff --git a/main/webapp/modules/core/langs/translation-fr.json b/main/webapp/modules/core/langs/translation-fr.json index aa2088e61..814e81096 100644 --- a/main/webapp/modules/core/langs/translation-fr.json +++ b/main/webapp/modules/core/langs/translation-fr.json @@ -516,6 +516,8 @@ "columnize": "Convertir en liste les colonnes de clé/valeur", "add-col-fetch": "Ajouter une colonne en moissonnant les données depuis les URL d’une colonne", "facet-blank": "Facette par valeur vide", + "facet-null": "Facette par nul", + "facet-empty-string": "Facette par chaîne vide", "best-cand-edit-dist": "meilleure distance d’édition du nom des candidats", "spec-separator": "Merci d’indiquer le séparateur entre les noms de colonnes originales et les valeurs des cellules.", "cluster-edit": "Grouper et éditer", diff --git a/main/webapp/modules/core/langs/translation-he.json b/main/webapp/modules/core/langs/translation-he.json index 4c6674c87..0b172dffd 100644 --- a/main/webapp/modules/core/langs/translation-he.json +++ b/main/webapp/modules/core/langs/translation-he.json @@ -501,6 +501,8 @@ "unicode-facet": "Unicode char-code facet", "facet-error": "Facet by error", "facet-blank": "Facet by blank", + "facet-null": "Facet by null", + "facet-empty-string": "Facet by empty string", "text-filter": "Text filter", "add-col-col": "Add column based on column", "new-col-name": "New column name", diff --git a/main/webapp/modules/core/langs/translation-it.json b/main/webapp/modules/core/langs/translation-it.json index 66d3dfc65..a8a5cc17d 100644 --- a/main/webapp/modules/core/langs/translation-it.json +++ b/main/webapp/modules/core/langs/translation-it.json @@ -516,6 +516,8 @@ "columnize": "Colonnizza per colonne Chiave/Valore", "add-col-fetch": "Aggiungi colonna con URL, basandoti su", "facet-blank": "Per blank", + "facet-null": "Per nullo", + "facet-empty-string": "Per stringa vuota", "best-cand-edit-dist": "migliore 'edit distance' del nome candidati", "spec-separator": "Per favore, specifica il separatore tra il nome della colonna originale ed il valore delle celle.", "split-into": "Dividi in", diff --git a/main/webapp/modules/core/langs/translation-jp.json b/main/webapp/modules/core/langs/translation-jp.json index d94ea19f5..87d3082c4 100644 --- a/main/webapp/modules/core/langs/translation-jp.json +++ b/main/webapp/modules/core/langs/translation-jp.json @@ -517,6 +517,8 @@ "columnize": "行をカラムに転置する", "add-col-fetch": "URLフェッチでカラムを作る", "facet-blank": "空白ファセット", + "facet-null": "ヌルファセット", + "facet-empty-string": "空の文字列ファセット", "best-cand-edit-dist": "最良候補の名前の編集距離", "spec-separator": "カラム名とセル値の区切り文字を指定してください。", "by": "基準", diff --git a/main/webapp/modules/core/langs/translation-pt_BR.json b/main/webapp/modules/core/langs/translation-pt_BR.json index 45b87c1a6..44f52c985 100644 --- a/main/webapp/modules/core/langs/translation-pt_BR.json +++ b/main/webapp/modules/core/langs/translation-pt_BR.json @@ -508,6 +508,8 @@ "columnize": "Criar colunas a partir de colunas chave/valor", "add-col-fetch": "Add column by fetching URLs based on column", "facet-blank": "Faceta por valores em branco", + "facet-null": "Faceta por nulo", + "facet-empty-string": "Faceta por cadeia vazia", "best-cand-edit-dist": "best candidate's name edit distance", "spec-separator": "Por favor, especifique o separador entre os nomes das colunas e os valores das células.", "milli": "milissegundos", diff --git a/main/webapp/modules/core/langs/translation-ru.json b/main/webapp/modules/core/langs/translation-ru.json index b0fefdbfd..a4c3cdba7 100644 --- a/main/webapp/modules/core/langs/translation-ru.json +++ b/main/webapp/modules/core/langs/translation-ru.json @@ -538,6 +538,8 @@ "unicode-facet": "Фасет по уникоду символов", "facet-error": "Фасет по ошибкам", "facet-blank": "Фасет по пустым полям", + "facet-null": "Фасет по ноль", + "facet-empty-string": "Фасет по пустая строка", "text-filter": "Текстовый фильтр", "add-col-col": "Добавить колонку основываясь на текущей", "new-col-name": "Наименование новой колонки", diff --git a/main/webapp/modules/core/langs/translation-tl.json b/main/webapp/modules/core/langs/translation-tl.json index 13ccf7bd1..46d15e5bf 100644 --- a/main/webapp/modules/core/langs/translation-tl.json +++ b/main/webapp/modules/core/langs/translation-tl.json @@ -518,6 +518,8 @@ "columnize": "I-columnize sa pamamagitan ng Key/Value ng mga kolum", "add-col-fetch": "Magdagdag ng kolum sa pamamagitang ng pag-fetch ng mga URL basi sa kolum", "facet-blank": "Ang facet ayon sa blangko", + "facet-null": "Ang facet ayon sa wala", + "facet-empty-string": "Ang facet ayon sa walang laman na string", "best-cand-edit-dist": "ang pag-edit sa distansya ng pangalang ng pinakamagaling na kandidato", "spec-separator": "Pakiusap i-specify ang tagapaghiwalay sa pagitan ng orihinal na pangalan ng kolum at mga balyu ng cell.", "split-into": "Ihiwalay sa", diff --git a/main/webapp/modules/core/langs/translation-zh.json b/main/webapp/modules/core/langs/translation-zh.json index 38ead9797..4afd40da9 100644 --- a/main/webapp/modules/core/langs/translation-zh.json +++ b/main/webapp/modules/core/langs/translation-zh.json @@ -491,6 +491,8 @@ "unicode-facet": "Unicode字符归类", "facet-error": "按错误归类", "facet-blank": "按空白归类", + "facet-null": "按空值归类", + "facet-empty-string": "按空字符串归类", "text-filter": "文本过滤器", "add-col-col": "基于当前列添加列", "new-col-name": "新列名称", From 0b64f9d232d71760c4ad6a60bd1ad42b9336cc30 Mon Sep 17 00:00:00 2001 From: Joanne Date: Sat, 17 Mar 2018 22:28:38 +0800 Subject: [PATCH 3/5] Update facet by blank --- .../core/scripts/views/data-table/menu-facets.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/main/webapp/modules/core/scripts/views/data-table/menu-facets.js b/main/webapp/modules/core/scripts/views/data-table/menu-facets.js index 5d5651344..238cecfef 100644 --- a/main/webapp/modules/core/scripts/views/data-table/menu-facets.js +++ b/main/webapp/modules/core/scripts/views/data-table/menu-facets.js @@ -272,6 +272,20 @@ DataTableColumnHeaderUI.extendMenu(function(column, columnHeaderUI, menu) { } ); } + }, + { + id: "core/blank-facet", + label: $.i18n._('core-views')["facet-blank"], + click: function() { + ui.browsingEngine.addFacet( + "list", + { + "name": column.name, + "columnName": column.name, + "expression": "isBlank(value)" + } + ); + } } ] } From 20660337c4babe640d32d836a0f95e1c8f45211b Mon Sep 17 00:00:00 2001 From: Joanne Date: Sat, 17 Mar 2018 22:28:57 +0800 Subject: [PATCH 4/5] Update translations for blank facets --- main/webapp/modules/core/langs/translation-ceb.json | 2 +- main/webapp/modules/core/langs/translation-en.json | 2 +- main/webapp/modules/core/langs/translation-es.json | 2 +- main/webapp/modules/core/langs/translation-fil.json | 2 +- main/webapp/modules/core/langs/translation-fr.json | 2 +- main/webapp/modules/core/langs/translation-he.json | 2 +- main/webapp/modules/core/langs/translation-it.json | 2 +- main/webapp/modules/core/langs/translation-jp.json | 2 +- main/webapp/modules/core/langs/translation-pt_BR.json | 2 +- main/webapp/modules/core/langs/translation-ru.json | 2 +- main/webapp/modules/core/langs/translation-tl.json | 2 +- main/webapp/modules/core/langs/translation-zh.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/main/webapp/modules/core/langs/translation-ceb.json b/main/webapp/modules/core/langs/translation-ceb.json index 7539127ca..de0f2b8aa 100644 --- a/main/webapp/modules/core/langs/translation-ceb.json +++ b/main/webapp/modules/core/langs/translation-ceb.json @@ -514,7 +514,7 @@ "transpose": "Pagbalhin", "columnize": "Kolumnays pinaagi sa Key/ Bili sa mga Kolum", "add-col-fetch": "Pun-i ang kolum sa pagkuha sa URLs basi sa kolum", - "facet-blank": "Bahin sa blangko", + "facet-blank": "Bahin sa blangko (null o walay sulod nga pisi)", "facet-null": "Bahin sa null", "facet-empty-string": "Bahin sa walay sulod nga pisi", "best-cand-edit-dist": "labing maayong ngalan sa kandidata nga usbon", diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index e11e9b13a..4e9ea8cd4 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -522,7 +522,7 @@ "log-length-facet": "Log of text length facet", "unicode-facet": "Unicode char-code facet", "facet-error": "Facet by error", - "facet-blank": "Facet by blank", + "facet-blank": "Facet by blank (null or empty string)", "facet-null": "Facet by null", "facet-empty-string": "Facet by empty string", "text-filter": "Text filter", diff --git a/main/webapp/modules/core/langs/translation-es.json b/main/webapp/modules/core/langs/translation-es.json index 96eb25ebd..c12fbc3c3 100644 --- a/main/webapp/modules/core/langs/translation-es.json +++ b/main/webapp/modules/core/langs/translation-es.json @@ -490,7 +490,7 @@ "log-length-facet": "Faceta por longitud log. de texto", "unicode-facet": "Faceta por caracteres Unicode", "facet-error": "Faceta por error", - "facet-blank": "Faceta por blanco", + "facet-blank": "Faceta por blanco (nulo o cuerda vacía)", "facet-null": "Faceta por nulo", "facet-empty-string": "Faceta por cuerda vacía", "text-filter": "Filtro de texto", diff --git a/main/webapp/modules/core/langs/translation-fil.json b/main/webapp/modules/core/langs/translation-fil.json index b1fc9a0fb..f5a656673 100644 --- a/main/webapp/modules/core/langs/translation-fil.json +++ b/main/webapp/modules/core/langs/translation-fil.json @@ -517,7 +517,7 @@ "transpose": "I-transpose", "columnize": "Columnize ayon sa Key / Value Columns", "add-col-fetch": "Magdagdag ng haligi sa pamamagitan ng pagkuha ng mga URL batay sa haligi", - "facet-blank": "Blangko ang facet", + "facet-blank": "Blangko ang facet (wala o walang laman na string)", "facet-null": "Wala ang facet", "facet-empty-string": "walang laman na string ang facet", "best-cand-edit-dist": "Ang distansya ng pag-edit ng pangalan ng pinakamahusay na kandidato", diff --git a/main/webapp/modules/core/langs/translation-fr.json b/main/webapp/modules/core/langs/translation-fr.json index 814e81096..dcbb855f9 100644 --- a/main/webapp/modules/core/langs/translation-fr.json +++ b/main/webapp/modules/core/langs/translation-fr.json @@ -515,7 +515,7 @@ "transpose": "Transposer", "columnize": "Convertir en liste les colonnes de clé/valeur", "add-col-fetch": "Ajouter une colonne en moissonnant les données depuis les URL d’une colonne", - "facet-blank": "Facette par valeur vide", + "facet-blank": "Facette par valeur vide (nul ou chaîne vide)", "facet-null": "Facette par nul", "facet-empty-string": "Facette par chaîne vide", "best-cand-edit-dist": "meilleure distance d’édition du nom des candidats", diff --git a/main/webapp/modules/core/langs/translation-he.json b/main/webapp/modules/core/langs/translation-he.json index 0b172dffd..c1476d77c 100644 --- a/main/webapp/modules/core/langs/translation-he.json +++ b/main/webapp/modules/core/langs/translation-he.json @@ -500,7 +500,7 @@ "log-length-facet": "Log of text length facet", "unicode-facet": "Unicode char-code facet", "facet-error": "Facet by error", - "facet-blank": "Facet by blank", + "facet-blank": "Facet by blank (null or empty string)", "facet-null": "Facet by null", "facet-empty-string": "Facet by empty string", "text-filter": "Text filter", diff --git a/main/webapp/modules/core/langs/translation-it.json b/main/webapp/modules/core/langs/translation-it.json index a8a5cc17d..327a7f362 100644 --- a/main/webapp/modules/core/langs/translation-it.json +++ b/main/webapp/modules/core/langs/translation-it.json @@ -515,7 +515,7 @@ "transpose": "Trasponi", "columnize": "Colonnizza per colonne Chiave/Valore", "add-col-fetch": "Aggiungi colonna con URL, basandoti su", - "facet-blank": "Per blank", + "facet-blank": "Per blank (nullo o stringa vuota)", "facet-null": "Per nullo", "facet-empty-string": "Per stringa vuota", "best-cand-edit-dist": "migliore 'edit distance' del nome candidati", diff --git a/main/webapp/modules/core/langs/translation-jp.json b/main/webapp/modules/core/langs/translation-jp.json index 87d3082c4..9973c7c28 100644 --- a/main/webapp/modules/core/langs/translation-jp.json +++ b/main/webapp/modules/core/langs/translation-jp.json @@ -516,7 +516,7 @@ "transpose": "行列転置", "columnize": "行をカラムに転置する", "add-col-fetch": "URLフェッチでカラムを作る", - "facet-blank": "空白ファセット", + "facet-blank": "空白ファセット (ヌルまたは空の文字列)", "facet-null": "ヌルファセット", "facet-empty-string": "空の文字列ファセット", "best-cand-edit-dist": "最良候補の名前の編集距離", diff --git a/main/webapp/modules/core/langs/translation-pt_BR.json b/main/webapp/modules/core/langs/translation-pt_BR.json index 44f52c985..94a596d39 100644 --- a/main/webapp/modules/core/langs/translation-pt_BR.json +++ b/main/webapp/modules/core/langs/translation-pt_BR.json @@ -507,7 +507,7 @@ "transpose": "Transpor", "columnize": "Criar colunas a partir de colunas chave/valor", "add-col-fetch": "Add column by fetching URLs based on column", - "facet-blank": "Faceta por valores em branco", + "facet-blank": "Faceta por valores em branco (nulo ou cadeia vazia)", "facet-null": "Faceta por nulo", "facet-empty-string": "Faceta por cadeia vazia", "best-cand-edit-dist": "best candidate's name edit distance", diff --git a/main/webapp/modules/core/langs/translation-ru.json b/main/webapp/modules/core/langs/translation-ru.json index a4c3cdba7..86821439b 100644 --- a/main/webapp/modules/core/langs/translation-ru.json +++ b/main/webapp/modules/core/langs/translation-ru.json @@ -537,7 +537,7 @@ "log-length-facet": "Логарифмический фасет по длине текста", "unicode-facet": "Фасет по уникоду символов", "facet-error": "Фасет по ошибкам", - "facet-blank": "Фасет по пустым полям", + "facet-blank": "Фасет по пустым полям (ноль или пустая строка)", "facet-null": "Фасет по ноль", "facet-empty-string": "Фасет по пустая строка", "text-filter": "Текстовый фильтр", diff --git a/main/webapp/modules/core/langs/translation-tl.json b/main/webapp/modules/core/langs/translation-tl.json index 46d15e5bf..6baed96c6 100644 --- a/main/webapp/modules/core/langs/translation-tl.json +++ b/main/webapp/modules/core/langs/translation-tl.json @@ -517,7 +517,7 @@ "transpose": "I-transpose", "columnize": "I-columnize sa pamamagitan ng Key/Value ng mga kolum", "add-col-fetch": "Magdagdag ng kolum sa pamamagitang ng pag-fetch ng mga URL basi sa kolum", - "facet-blank": "Ang facet ayon sa blangko", + "facet-blank": "Ang facet ayon sa blangko (wala ou walang laman na string)", "facet-null": "Ang facet ayon sa wala", "facet-empty-string": "Ang facet ayon sa walang laman na string", "best-cand-edit-dist": "ang pag-edit sa distansya ng pangalang ng pinakamagaling na kandidato", diff --git a/main/webapp/modules/core/langs/translation-zh.json b/main/webapp/modules/core/langs/translation-zh.json index 4afd40da9..6445ea394 100644 --- a/main/webapp/modules/core/langs/translation-zh.json +++ b/main/webapp/modules/core/langs/translation-zh.json @@ -490,7 +490,7 @@ "log-length-facet": "文本长度的对数值归类", "unicode-facet": "Unicode字符归类", "facet-error": "按错误归类", - "facet-blank": "按空白归类", + "facet-blank": "按空白归类 (空值或空字符串)", "facet-null": "按空值归类", "facet-empty-string": "按空字符串归类", "text-filter": "文本过滤器", From bff4ba773134c22bda0d37a9927a57f9bd6e309a Mon Sep 17 00:00:00 2001 From: Joanne Date: Sun, 25 Mar 2018 01:42:08 +0800 Subject: [PATCH 5/5] Update translation for new facets in Chinese --- main/webapp/modules/core/langs/translation-zh.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/main/webapp/modules/core/langs/translation-zh.json b/main/webapp/modules/core/langs/translation-zh.json index 6445ea394..b2d679bb8 100644 --- a/main/webapp/modules/core/langs/translation-zh.json +++ b/main/webapp/modules/core/langs/translation-zh.json @@ -490,8 +490,8 @@ "log-length-facet": "文本长度的对数值归类", "unicode-facet": "Unicode字符归类", "facet-error": "按错误归类", - "facet-blank": "按空白归类 (空值或空字符串)", - "facet-null": "按空值归类", + "facet-blank": "按空白归类 (null或空字符串)", + "facet-null": "按null归类", "facet-empty-string": "按空字符串归类", "text-filter": "文本过滤器", "add-col-col": "基于当前列添加列",