From cf58dc4cdc9368b193c6483307aaa871935ff40f Mon Sep 17 00:00:00 2001 From: sarahelshabrawy <58959185+sarahelshabrawy@users.noreply.github.com> Date: Sat, 20 Feb 2021 13:56:39 +0200 Subject: [PATCH] Enable hyperlinks in in-tool Help field (#3648) --- main/src/com/google/refine/expr/functions/ToDate.java | 2 +- .../src/com/google/refine/expr/functions/ToDateTests.java | 8 ++++---- main/webapp/modules/core/langs/translation-de.json | 4 ++-- main/webapp/modules/core/langs/translation-en.json | 4 ++-- main/webapp/modules/core/langs/translation-es.json | 4 ++-- main/webapp/modules/core/langs/translation-fr.json | 4 ++-- main/webapp/modules/core/langs/translation-it.json | 4 ++-- main/webapp/modules/core/langs/translation-jp.json | 4 ++-- main/webapp/modules/core/langs/translation-pt.json | 4 ++-- main/webapp/modules/core/langs/translation-pt_BR.json | 4 ++-- main/webapp/modules/core/langs/translation-sv.json | 4 ++-- .../core/scripts/dialogs/expression-preview-dialog.js | 8 ++++---- 12 files changed, 27 insertions(+), 27 deletions(-) diff --git a/main/src/com/google/refine/expr/functions/ToDate.java b/main/src/com/google/refine/expr/functions/ToDate.java index ca225b981..68d91c989 100644 --- a/main/src/com/google/refine/expr/functions/ToDate.java +++ b/main/src/com/google/refine/expr/functions/ToDate.java @@ -196,7 +196,7 @@ public class ToDate implements Function { @Override public String getDescription() { - return "Returns the inputted object converted to a date object. Without arguments, it returns the ISO 8601 extended format. With arguments, you can control the output format. With monthFirst: set false if the date is formatted with the day before the month. With formatN: attempt to parse the date using an ordered list of possible formats. Supply formats based on the SimpleDateFormat syntax: http://docs.oracle.com/javase/7/docs/api/java/text/SimpleDateFormat.html."; + return "Returns the inputted object converted to a date object. Without arguments, it returns the ISO 8601 extended format. With arguments, you can control the output format. With monthFirst: set false if the date is formatted with the day before the month. With formatN: attempt to parse the date using an ordered list of possible formats. Supply formats based on the SimpleDateFormat syntax: SimpleDateFormat"; } @Override diff --git a/main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java b/main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java index 2a2663914..b797ebb2d 100644 --- a/main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java +++ b/main/tests/server/src/com/google/refine/expr/functions/ToDateTests.java @@ -1,17 +1,17 @@ /******************************************************************************* * Copyright (C) 2018, OpenRefine contributors * All rights reserved. - * + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. - * + * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE diff --git a/main/webapp/modules/core/langs/translation-de.json b/main/webapp/modules/core/langs/translation-de.json index 2d0079336..6231a6c2d 100644 --- a/main/webapp/modules/core/langs/translation-de.json +++ b/main/webapp/modules/core/langs/translation-de.json @@ -189,7 +189,7 @@ "core-dialogs/rows-in-cluster": "# Zeilen im Cluster", "core-dialogs/content": "Inhalt", "core-dialogs/use-this-val": "Diesen Wert verwenden", - "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/cells-of-row": "Die Zellen der aktuellen Zeile. Dies ist eine Abkürzung für 'row.cells'. Eine bestimmte Zelle kann mit 'cells.<column name>' abgerufen werden, wenn der <column name> ein einzelnes Wort ist, oder andernfalls mit 'cells[\"<column name>\"].", "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', 'recon' und 'errorMessage'.", @@ -721,7 +721,7 @@ "core-index/license": "Lizenz:", "core-index/homepage": "Homepage:", "core-index/image": "Bild:", - "core-dialogs/record-fields": "eine oder mehrere Zeilen, die zu einem Datensatz zusammengefasst sind; das Objekt hat mehrere Felder, Details unter https://github.com/OpenRefine/OpenRefine/wiki/Variables#record", + "core-dialogs/record-fields": "eine oder mehrere Zeilen, die zu einem Datensatz zusammengefasst sind; das Objekt hat mehrere Felder, Details unter Records", "core-views/join-col": "Spalten verbinden", "core-views/column-join": "Spalten verbinden", "core-views/column-join-before-column-picker": "Wähle und ordne Spalten zum verbinden", diff --git a/main/webapp/modules/core/langs/translation-en.json b/main/webapp/modules/core/langs/translation-en.json index d92d5c032..fcbf60438 100644 --- a/main/webapp/modules/core/langs/translation-en.json +++ b/main/webapp/modules/core/langs/translation-en.json @@ -228,9 +228,9 @@ "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.", + "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.<column name>' if the <column name> is a single word, or with 'cells[\"<column name>\"] otherwise.", "core-dialogs/row-index": "The current row's index. This is a shortcut for 'row.index'.", - "core-dialogs/record-fields": "one or more rows grouped together to form a record; object has more fields, details at https://github.com/OpenRefine/OpenRefine/wiki/Variables#record", + "core-dialogs/record-fields": "one or more rows grouped together to form a record; object has more fields, details at Records", "core-dialogs/returns": "returns", "core-dialogs/from": "From", "core-dialogs/expression": "Expression", diff --git a/main/webapp/modules/core/langs/translation-es.json b/main/webapp/modules/core/langs/translation-es.json index 2dc269ba3..bf0451623 100644 --- a/main/webapp/modules/core/langs/translation-es.json +++ b/main/webapp/modules/core/langs/translation-es.json @@ -188,7 +188,7 @@ "core-dialogs/rows-in-cluster": "# Filas en la agrupación", "core-dialogs/content": "Contenido", "core-dialogs/use-this-val": "Usar este valor", - "core-dialogs/cells-of-row": "Las celdas de la fila actual. Es una abreviación para «row.cells». Puede recuperarse una celda concreta con «cells.» si el es una única palabra; de lo contrario con «cells[\"\"]».", + "core-dialogs/cells-of-row": "Las celdas de la fila actual. Es una abreviación para «row.cells». Puede recuperarse una celda concreta con «cells.<nombre de la columna>» si el <nombre de la columna> es una única palabra; de lo contrario con «cells[\"<nombre de la columna>\"]».", "core-dialogs/method": "Método ", "core-dialogs/ngram-radius": "Radio ", "core-dialogs/processing": "Procesando…", @@ -720,7 +720,7 @@ "core-views/choose-reconciliation-service": "Elija un servicio de cotejo", "core-recon/add-std-srv": "Añadir un servicio estándar", "core-dialogs/lb-formats-quotation": "Siempre citar el texto", - "core-dialogs/record-fields": "una o más filas agrupadas para formar un registro; el objeto tiene más campos. Más detalles en https://github.com/OpenRefine/OpenRefine/wiki/Variables#record", + "core-dialogs/record-fields": "una o más filas agrupadas para formar un registro; el objeto tiene más campos. Más detalles en 'Records'", "core-dialogs/no-clustering-functions-and-distances": "No se pudieron cargar las funciones de agrupamiento y las distancias.", "core-views/replace-dont-escape": "utilice \\n para saltos de renglón, \\t para tabuladores, \\\\n para \\n, \\\\t para \\t.", "core-views/replacement-info": "Si se marca la opción «Expresión regular» y el modelo de búsqueda contiene grupos delimitados por paréntesis, $0 devolverá la cadena completa encontrada por el modelo, y $1, $2…, los grupos primero y segundo, respectivamente.", diff --git a/main/webapp/modules/core/langs/translation-fr.json b/main/webapp/modules/core/langs/translation-fr.json index 8a4e28e26..10ef30167 100644 --- a/main/webapp/modules/core/langs/translation-fr.json +++ b/main/webapp/modules/core/langs/translation-fr.json @@ -193,7 +193,7 @@ "core-dialogs/rows-in-cluster": "# Lignes dans le groupe", "core-dialogs/content": "Contenu", "core-dialogs/use-this-val": "Utiliser cette valeur", - "core-dialogs/cells-of-row": "Les cellules de la ligne en cours. C’est un alias de 'row.cells'. Une cellule spécifique peut être retrouvée avec 'cells.' lorsque est un mot simple et avec 'cells.[\"\"]' dans les autres cas.", + "core-dialogs/cells-of-row": "Les cellules de la ligne en cours. C’est un alias de 'row.cells'. Une cellule spécifique peut être retrouvée avec 'cells.<nom de la colonne>' lorsque <nom de la colonne > est un mot simple et avec 'cells.[\"<nom de la colonne>\"]' dans les autres cas.", "core-dialogs/for-include-drop-statement-checkbox": "Inclure les instructions DROP", "core-dialogs/ngram-radius": "Rayon ", "core-dialogs/processing": "Traitement…", @@ -735,7 +735,7 @@ "core-views/column-join-copy-to-new-column": "Ecrire le résultat dans une nouvelle colonne nommée…", "core-views/column-join-delete-joined-columns": "Supprimer les colonnes jointes.", "core-views/column-join-dont-escape": "Dans les séparateurs et les substituts de valeurs nulles, utiliser \\n pour une nouvelle ligne, \\t pour une tabulation, \\\\n pour \\n, \\\\t pour \\t.", - "core-dialogs/record-fields": "un groupe d'une ou plusieurs lignes forme une entrée ; l'objet a plus d'attributs, voir les détails sur https://github.com/OpenRefine/OpenRefine/wiki/Variables#record", + "core-dialogs/record-fields": "un groupe d'une ou plusieurs lignes forme une entrée ; l'objet a plus d'attributs, voir les détails sur Records", "core-views/blank-values": "Valeurs vides par colonne", "core-views/blank-records": "Entrées vides par colonne", "core-views/add-id-column": "Ajouter une colonne d'identifiants d'entités", diff --git a/main/webapp/modules/core/langs/translation-it.json b/main/webapp/modules/core/langs/translation-it.json index a2149c7eb..b9d80c2cf 100644 --- a/main/webapp/modules/core/langs/translation-it.json +++ b/main/webapp/modules/core/langs/translation-it.json @@ -188,7 +188,7 @@ "core-dialogs/rows-in-cluster": "# Righe nel Cluster", "core-dialogs/content": "Contenuto", "core-dialogs/use-this-val": "Usa questo valore", - "core-dialogs/cells-of-row": "Le celle della riga corrente. Questa è una scorcatoia per 'row.cells'. Una particolare cella può essere recuperata con 'cells.' se è una unica parola, altrimenti con 'cells[\"\"].", + "core-dialogs/cells-of-row": "Le celle della riga corrente. Questa è una scorcatoia per 'row.cells'. Una particolare cella può essere recuperata con 'cells.<column name>' se <column name> è una unica parola, altrimenti con 'cells[\"<column name>\"].", "core-dialogs/method": "Medoto ", "core-dialogs/ngram-radius": "Radius ", "core-dialogs/processing": "Elaborando…", @@ -724,7 +724,7 @@ "core-index/license": "Licenza:", "core-index/homepage": "Pagina web:", "core-index/image": "Immagine:", - "core-dialogs/record-fields": "una o più righe raggruppate per formare un record; l'oggetto ha più campi, dettagli su https://github.com/OpenRefine/OpenRefine/wiki/Variables#record", + "core-dialogs/record-fields": "una o più righe raggruppate per formare un record; l'oggetto ha più campi, dettagli su Records", "core-views/join-col": "Unisci colonne", "core-views/column-join": "Unisci colonne", "core-views/column-join-before-column-picker": "Seleziona e ordina le colonne da unire", diff --git a/main/webapp/modules/core/langs/translation-jp.json b/main/webapp/modules/core/langs/translation-jp.json index 6c50988b0..9c67f277d 100644 --- a/main/webapp/modules/core/langs/translation-jp.json +++ b/main/webapp/modules/core/langs/translation-jp.json @@ -190,7 +190,7 @@ "core-dialogs/rows-in-cluster": "# クラスタ内の行数", "core-dialogs/content": "内容", "core-dialogs/use-this-val": "この値を使う", - "core-dialogs/cells-of-row": "現在の行のcells: row.cellsの別名です。特定のセルは、cells.かcells[column name]でアクセスできます.", + "core-dialogs/cells-of-row": "現在の行のcells: row.cellsの別名です。特定のセルは、cells.<column name>かcells[column name]でアクセスできます.", "core-dialogs/for-include-drop-statement-checkbox": "Drop文を含める", "core-dialogs/ngram-radius": "半径 ", "core-dialogs/processing": "処理中…", @@ -727,7 +727,7 @@ "core-index/license": "ライセンス:", "core-index/homepage": "ホームページ:", "core-index/image": "写真:", - "core-dialogs/record-fields": "１行以上の列がレコードを構成します。詳しくは、https://github.com/OpenRefine/OpenRefine/wiki/Variables#record", + "core-dialogs/record-fields": "１行以上の列がレコードを構成します。詳しくは、Records", "core-views/join-col": "カラムの結合", "core-views/column-join": "カラムの結合", "core-views/column-join-before-column-picker": "結合するカラムの選択", diff --git a/main/webapp/modules/core/langs/translation-pt.json b/main/webapp/modules/core/langs/translation-pt.json index 0d1b7e9ef..58758fce4 100644 --- a/main/webapp/modules/core/langs/translation-pt.json +++ b/main/webapp/modules/core/langs/translation-pt.json @@ -64,7 +64,7 @@ "core-index-import/match-count": "$1 {{plural:$1|corresponde|correspondem}}", "core-index-open/new-title": "Nome do novo projeto:", "core-index-import/project-tags": "Tags", - "core-dialogs/cells-of-row": "As células da linha atual. Este é um atalho para 'row.cells'. Uma célula em particular pode ser recuperada com 'cells. ' se o for uma única palavra, ou com 'cells [\"\"] caso contrário.", + "core-dialogs/cells-of-row": "As células da linha atual. Este é um atalho para 'row.cells'. Uma célula em particular pode ser recuperada com 'cells. <Column name>' se o <column name> for uma única palavra, ou com 'cells [\"<column name>\"] caso contrário.", "core-index-parser/trim": "Cortar espaços no início e no final dos cadeias das células", "core-index-lang/send-req": "Alterar idioma", "core-views/warning-sel-judg": "Por favor, selecione ao menos um tipo de resultado para copiar.", @@ -86,7 +86,7 @@ "core-recon/pick-service": "Selecione um serviço ou extensão na esquerda", "core-views/new-topic2": "Marque para criar um novo item para cada célula nesta coluna para todas as linhas filtradas atuais", "core-views/first": "primeiro", - "core-dialogs/record-fields": "uma ou mais linhas mescladas para formar um registo; O objeto possui mais campos, detalhes em https://github.com/OpenRefine/OpenRefine/wiki/Variables#record", + "core-dialogs/record-fields": "uma ou mais linhas mescladas para formar um registo; O objeto possui mais campos, detalhes em Records", "core-dialogs/merge": "Unir?", "core-facets/facet-by-count": "Faceta pelo quantidade de opções", "core-index/name": "Nome do projeto:", diff --git a/main/webapp/modules/core/langs/translation-pt_BR.json b/main/webapp/modules/core/langs/translation-pt_BR.json index 1d11bd563..8cadbb978 100644 --- a/main/webapp/modules/core/langs/translation-pt_BR.json +++ b/main/webapp/modules/core/langs/translation-pt_BR.json @@ -186,7 +186,7 @@ "core-dialogs/rows-in-cluster": "# Linhas no cluster", "core-dialogs/content": "Conteúdo", "core-dialogs/use-this-val": "Usar este valor", - "core-dialogs/cells-of-row": "As células da linha atual. Este é um atalho para 'row.cells'. Uma célula em particular pode ser recuperada com 'cells. ' se o for uma única palavra, ou com 'cells [\"\"] caso contrário.", + "core-dialogs/cells-of-row": "As células da linha atual. Este é um atalho para 'row.cells'. Uma célula em particular pode ser recuperada com 'cells. <Column name>' se o <column name> for uma única palavra, ou com 'cells [\"<column name>\"] caso contrário.", "core-dialogs/method": "Método ", "core-dialogs/ngram-radius": "Raio ", "core-dialogs/processing": "Processando…", @@ -722,7 +722,7 @@ "core-index/license": "Licença:", "core-index/homepage": "Página inicial:", "core-index/image": "Imagem:", - "core-dialogs/record-fields": "uma ou mais linhas mescladas para formar um registro; O objeto possui mais campos, detalhes em https://github.com/OpenRefine/OpenRefine/wiki/Variables#record", + "core-dialogs/record-fields": "uma ou mais linhas mescladas para formar um registro; O objeto possui mais campos, detalhes em Records", "core-views/join-col": "Mesclar colunas", "core-views/column-join": "Mesclar colunas", "core-views/column-join-before-column-picker": "Selecione e ordene as colunas para mesclar", diff --git a/main/webapp/modules/core/langs/translation-sv.json b/main/webapp/modules/core/langs/translation-sv.json index 0111a4c0f..8c4bac3e4 100644 --- a/main/webapp/modules/core/langs/translation-sv.json +++ b/main/webapp/modules/core/langs/translation-sv.json @@ -206,7 +206,7 @@ "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/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.<kolumnnamn>'om <kolumnnamn> är ett enda ord, eller annars med 'cells[\"<kolumnnamn>\"]'.", "core-dialogs/row-index": "Den aktuella radens index. Detta är en genväg för 'row.index'.", "core-dialogs/returns": "returnerar", "core-dialogs/from": "Från", @@ -444,5 +444,5 @@ "core-index/license": "Licens:", "core-index/homepage": "Hemsida:", "core-index/image": "Bild:", - "core-dialogs/record-fields": "En eller flera rader grupperas till en post; objektet har flera fält, detaljerna redovisas på https://github.com/OpenRefine/OpenRefine/wiki/Variables#record" + "core-dialogs/record-fields": "En eller flera rader grupperas till en post; objektet har flera fält, detaljerna redovisas på Records" } diff --git a/main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js b/main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js index 0d053e3f2..7b92458ce 100644 --- a/main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js +++ b/main/webapp/modules/core/scripts/dialogs/expression-preview-dialog.js @@ -132,7 +132,7 @@ ExpressionPreviewDialog.Widget = function( }) .select() .focus(); - + this._elmts.or_dialog_expr.html($.i18n('core-dialogs/expression')); this._elmts.or_dialog_lang.html($.i18n('core-dialogs/language')); this._elmts.or_dialog_preview.html($.i18n('core-dialogs/preview')); @@ -210,7 +210,7 @@ ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) { var variable = vars[i]; var tr = varTable.insertRow(varTable.rows.length); $(tr.insertCell(0)).addClass("expression-preview-doc-item-title").text(variable.name); - $(tr.insertCell(1)).addClass("expression-preview-doc-item-desc").text(variable.description); + $(tr.insertCell(1)).addClass("expression-preview-doc-item-desc").html(variable.description); } var renderEntry = function(table, name, entry) { @@ -225,7 +225,7 @@ ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) { $(tr1.insertCell(1)).addClass("expression-preview-doc-item-returns").text($.i18n('core-dialogs/returns')+": " + entry.returns); $(tr2.insertCell(0)); - $(tr2.insertCell(1)).addClass("expression-preview-doc-item-desc").text(entry.description); + $(tr2.insertCell(1)).addClass("expression-preview-doc-item-desc").html(entry.description); }; var renderEntries = function(table, map) { var names = []; @@ -241,7 +241,7 @@ ExpressionPreviewDialog.Widget.prototype._renderHelp = function(data) { renderEntry(table, name, map[name]); } }; - + $('

').text("Functions").appendTo(elmt); var functionTable = $('
').appendTo(elmt)[0]; renderEntries(functionTable, data.functions);