mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🔀 Merge branch 'fix-i18n-executions-list'

Browse source
This commit is contained in:
Jan Oberhauser 2021-12-20 17:28:51 +01:00
parent de971de27a d126933947
commit 419c719f90
6 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/cli/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "n8n", "name": "n8n",
"version": "0.155.1", "version": "0.155.2",
"description": "n8n Workflow Automation Tool", "description": "n8n Workflow Automation Tool",
"license": "SEE LICENSE IN LICENSE.md", "license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io", "homepage": "https://n8n.io",
@ -112,7 +112,7 @@
"lodash.get": "^4.4.2", "lodash.get": "^4.4.2",
"mysql2": "~2.3.0", "mysql2": "~2.3.0",
"n8n-core": "~0.97.0", "n8n-core": "~0.97.0",
"n8n-editor-ui": "~0.122.0", "n8n-editor-ui": "~0.122.1",
"n8n-nodes-base": "~0.153.0", "n8n-nodes-base": "~0.153.0",
"n8n-workflow": "~0.80.0", "n8n-workflow": "~0.80.0",
"oauth-1.0a": "^2.2.6", "oauth-1.0a": "^2.2.6",

2
packages/editor-ui/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "n8n-editor-ui", "name": "n8n-editor-ui",
"version": "0.122.0", "version": "0.122.1",
"description": "Workflow Editor UI for n8n", "description": "Workflow Editor UI for n8n",
"license": "SEE LICENSE IN LICENSE.md", "license": "SEE LICENSE IN LICENSE.md",
"homepage": "https://n8n.io", "homepage": "https://n8n.io",

6
packages/editor-ui/src/components/ExecutionsList.vue
View file

@ -74,10 +74,12 @@
</el-table-column> </el-table-column>
<el-table-column :label="$locale.baseText('executionsList.status')" width="122" align="center"> <el-table-column :label="$locale.baseText('executionsList.status')" width="122" align="center">
<template slot-scope="scope" align="center"> <template slot-scope="scope" align="center">
<n8n-tooltip placement="top" > <n8n-tooltip placement="top" >
<div slot="content" v-html="statusTooltipText(scope.row)"></div> <div slot="content" v-html="statusTooltipText(scope.row)"></div>
<span class="status-badge running" v-if="scope.row.stoppedAt === undefined"> <span class="status-badge running" v-if="scope.row.waitTill">
{{ $locale.baseText('executionsList.waiting') }}
</span>
<span class="status-badge running" v-else-if="scope.row.stoppedAt === undefined">
{{ $locale.baseText('executionsList.running') }} {{ $locale.baseText('executionsList.running') }}
</span> </span>
<span class="status-badge success" v-else-if="scope.row.finished"> <span class="status-badge success" v-else-if="scope.row.finished">

7
packages/editor-ui/src/components/mixins/genericHelpers.ts
View file

@ -22,16 +22,17 @@ export const genericHelpers = mixins(showMessage).extend({
displayTimer (msPassed: number, showMs = false): string { displayTimer (msPassed: number, showMs = false): string {
if (msPassed < 60000) { if (msPassed < 60000) {
if (showMs === false) { if (showMs === false) {
return `${this.$locale.number(Math.floor(msPassed / 1000), 'decimal')} ${this.$locale.baseText('genericHelpers.sec')}`; return `${Math.floor(msPassed / 1000)} ${this.$locale.baseText('genericHelpers.sec')}`;
} }
return `${this.$locale.number(msPassed / 1000, 'decimal')} ${this.$locale.baseText('genericHelpers.sec')}`; return `${msPassed / 1000} ${this.$locale.baseText('genericHelpers.sec')}`;
} }
const secondsPassed = Math.floor(msPassed / 1000); const secondsPassed = Math.floor(msPassed / 1000);
const minutesPassed = Math.floor(secondsPassed / 60); const minutesPassed = Math.floor(secondsPassed / 60);
const secondsLeft = (secondsPassed - (minutesPassed * 60)).toString().padStart(2, '0');
return `${this.$locale.number(minutesPassed, 'decimal')}:${this.$locale.number(secondsPassed, 'decimal')} ${this.$locale.baseText('genericHelpers.min')}`; return `${minutesPassed}:${secondsLeft} ${this.$locale.baseText('genericHelpers.min')}`;
}, },
editAllowedCheck (): boolean { editAllowedCheck (): boolean {
if (this.isReadOnly) { if (this.isReadOnly) {

3
packages/editor-ui/src/plugins/i18n/docs/README.md
View file

@ -77,6 +77,7 @@ As a convenience, the base text file may contain the special key `reusableBaseTe
}, },
``` ```
<!--
As a convenience, the base text file may also contain the special key `numberFormats` to localize numbers. For more information, refer to Vue i18n's [number localization](https://kazupon.github.io/vue-i18n/guide/number.html#number-localization). As a convenience, the base text file may also contain the special key `numberFormats` to localize numbers. For more information, refer to Vue i18n's [number localization](https://kazupon.github.io/vue-i18n/guide/number.html#number-localization).
```json ```json
@ -87,7 +88,7 @@ As a convenience, the base text file may also contain the special key `numberFor
}, },
}, },
} }
``` ``` -->
#### Interpolation #### Interpolation

4
packages/editor-ui/src/plugins/i18n/locales/en.json
View file

@ -191,9 +191,11 @@
"mode": "Mode", "mode": "Mode",
"modes": { "modes": {
"error": "error", "error": "error",
"integrated": "integrated",
"manual": "manual", "manual": "manual",
"retry": "retry", "retry": "retry",
"trigger": "trigger" "trigger": "trigger",
"webhook": "webhook"
}, },
"name": "@:reusableBaseText.name", "name": "@:reusableBaseText.name",
"openPastExecution": "Open Past Execution", "openPastExecution": "Open Past Execution",