Skip to content

Commit

Permalink
(core) updates from grist-core
Browse files Browse the repository at this point in the history
  • Loading branch information
paulfitz committed Nov 14, 2023
2 parents 1231709 + 9d00ee9 commit a145430
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
4 changes: 2 additions & 2 deletions app/client/components/CustomView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ export class CustomView extends Disposable {
const {baseUrl, access, showAfterReady, widgetId, pluginId} = options;
const documentSettings = this.gristDoc.docData.docSettings();
const readonly = this.gristDoc.isReadonly.get();
const frame = WidgetFrame.create(null, {
const widgetFrame = WidgetFrame.create(null, {
url: baseUrl || this.getEmptyWidgetPage(),
widgetId,
pluginId,
Expand Down Expand Up @@ -309,7 +309,7 @@ export class CustomView extends Disposable {
// array of nodes (comment, node, comment) and it somehow breaks the dispose order. Collapsed widgets
// relay on a correct order of dispose, and are detaching nodes just before they are disposed, so if
// the order is wrong, the node is disposed without being detached first.
return grains.update(frame.buildDom(), dom.autoDispose(frame));
return grains.update(widgetFrame.buildDom(), dom.autoDispose(widgetFrame));
}
}

Expand Down
9 changes: 7 additions & 2 deletions static/locales/de.client.json
Original file line number Diff line number Diff line change
Expand Up @@ -1005,7 +1005,8 @@
"CELL FORMAT": "ZELLENFORMAT",
"DATA FROM TABLE": "DATEN AUS TABELLE",
"Save field settings for {{colId}} as common": "Feldeinstellungen für {{colId}} als Algemein speichern",
"Use separate field settings for {{colId}}": "Verwenden Sie separate Feldeinstellungen für {{colId}}"
"Use separate field settings for {{colId}}": "Verwenden Sie separate Feldeinstellungen für {{colId}}",
"Changing column type": "Ändern des Spaltentyps"
},
"EditorTooltip": {
"Convert column to formula": "Spalte in Formel umwandeln"
Expand Down Expand Up @@ -1115,7 +1116,11 @@
"end dates and event titles. Note each column's type.": "Um Ihren Kalender zu konfigurieren, wählen Sie Spalten für das Start-/Enddatum und den Titel des Ereignisses. Beachten Sie den Typ jeder Spalte."
},
"Calendar": "Kalender",
"Can't find the right columns? Click 'Change Widget' to select the table with events data.": "Sie können die richtigen Spalten nicht finden? Klicken Sie auf \"Widget ändern\", um die Tabelle mit den Ereignisdaten auszuwählen."
"Can't find the right columns? Click 'Change Widget' to select the table with events data.": "Sie können die richtigen Spalten nicht finden? Klicken Sie auf \"Widget ändern\", um die Tabelle mit den Ereignisdaten auszuwählen.",
"A UUID is a randomly-generated string that is useful for unique identifiers and link keys.": "Eine UUID ist ein zufällig generierter String, der für eindeutige Kennungen und Linkschlüssel nützlich ist.",
"Lookups return data from related tables.": "Lookups geben Daten aus Bezugstabellen zurück.",
"You can choose from widgets available to you in the dropdown, or embed your own by providing its full URL.": "Sie können aus Widgets wählen, die Ihnen im Dropdown zur Verfügung stehen, oder Sie selbst einbetten, indem Sie seine volle URL angeben.",
"Use reference columns to relate data in different tables.": "Verwenden Sie Referenzspalten, um Daten in verschiedenen Tabellen zu beziehen."
},
"DescriptionConfig": {
"DESCRIPTION": "BESCHREIBUNG"
Expand Down
2 changes: 1 addition & 1 deletion static/locales/pl.client.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
"Featured": "Polecane",
"Manage Users": "Zarządzanie użytkownikami",
"More Examples and Templates": "Więcej przykładów i szablonów",
"Move": "Przenosić",
"Move": "Przenieś",
"Move {{name}} to workspace": "Przenieś {{name}} do obszaru roboczego",
"Other Sites": "Inne strony",
"Permanently Delete \"{{name}}\"?": "Trwale usunąć „{{name}}”?",
Expand Down
9 changes: 7 additions & 2 deletions static/locales/pt_BR.client.json
Original file line number Diff line number Diff line change
Expand Up @@ -1007,7 +1007,8 @@
"Save field settings for {{colId}} as common": "Salvar configurações de campo da {{colId}} como comum",
"Revert field settings for {{colId}} to common": "Reverter configurações de campo da {{colId}} para comum",
"Mixed types": "Tipos mistos",
"Use separate field settings for {{colId}}": "Use configurações de campo separadas para {{colId}}"
"Use separate field settings for {{colId}}": "Use configurações de campo separadas para {{colId}}",
"Changing column type": "Alterando o tipo de coluna"
},
"FormulaEditor": {
"Column or field is required": "Coluna ou campo é obrigatório",
Expand Down Expand Up @@ -1115,7 +1116,11 @@
"end dates and event titles. Note each column's type.": "Para configurar seu calendário, selecione colunas para datas de início/fim e títulos de eventos. Observe o tipo de cada coluna."
},
"Calendar": "Calendário",
"Can't find the right columns? Click 'Change Widget' to select the table with events data.": "Não consegue encontrar as colunas certas? Clique em \"Change Widget\" (Alterar widget) para selecionar a tabela com os dados dos eventos."
"Can't find the right columns? Click 'Change Widget' to select the table with events data.": "Não consegue encontrar as colunas certas? Clique em \"Change Widget\" (Alterar widget) para selecionar a tabela com os dados dos eventos.",
"A UUID is a randomly-generated string that is useful for unique identifiers and link keys.": "Um UUID é uma cadeia de caracteres gerada aleatoriamente que é útil para identificadores exclusivos e chaves de link.",
"Lookups return data from related tables.": "As pesquisas retornam dados de tabelas relacionadas.",
"You can choose from widgets available to you in the dropdown, or embed your own by providing its full URL.": "Você pode escolher entre os widgets disponíveis no menu suspenso ou incorporar o seu próprio widget fornecendo o URL completo.",
"Use reference columns to relate data in different tables.": "Use colunas de referência para relacionar dados em diferentes tabelas."
},
"DescriptionConfig": {
"DESCRIPTION": "DESCRIÇÃO"
Expand Down

0 comments on commit a145430

Please sign in to comment.