Merge branch 'master' into joebordes/i18n_001

2024-11-22 16:33:24 +00:00 · 2024-02-05 16:47:55 +00:00 · 2024-02-05 16:47:55 +00:00 · 1419432b04
commit 1419432b04
parent 97e05c8784 6a1e4fac5a
12 changed files with 13 additions and 89 deletions
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -32,7 +32,7 @@ jobs:
            node-version: '16'
      - run: node ./node-red/.github/scripts/update-node-red-docker.js
      - name: Create Docker Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
        with:
          token: ${{ secrets.NR_REPO_TOKEN }}
          committer: GitHub <noreply@github.com>
@ -48,7 +48,7 @@ jobs:
            This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary
      - run: node ./node-red/.github/scripts/update-node-red-website.js
      - name: Create Website Pull Request
-        uses: peter-evans/create-pull-request@v5
+        uses: peter-evans/create-pull-request@v6
        with:
          token: ${{ secrets.NR_REPO_TOKEN }}
          committer: GitHub <noreply@github.com>
--- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json
@ -1075,7 +1075,7 @@
            "git-auth-error": "Git-Authentifizierungsfehler"
        },
        "create-success": {
-            "success": "Sie haben Ihr erstes Projekt erfolgreich erstduellt!",
+            "success": "Sie haben Ihr erstes Projekt erfolgreich erstellt!",
            "desc0": "Sie können jetzt Node-RED wie bisher verwenden.",
            "desc1": "Im Tab 'Info' in der Seitenleiste wird angezeigt, welches das aktuelle Projekt ist. Über die Schaltfläche rechts neben dem Projektnamen gelangt man zu 'Projekteinstellungen'.",
            "desc2": "Im Tab 'Commit-Historie' in der Seitenleiste werden alle Dateien angezeigt, die sich in Ihrem Projekt geändert haben, und um sie ins lokale Repository zu übertragen (commit). Es zeigt Ihnen eine vollständige Historie Ihrer Commits an und ermöglicht es Ihnen, Ihre Commits in ein (remote) Server-Repository zu schieben (push)."
@ -1171,17 +1171,6 @@
    "diagnostics": {
        "title": "System-Informationen"
    },
-    "languages": {
-        "de": "Deutsch",
-        "en-US": "Englisch",
-        "fr": "Französisch",
-        "ja": "Japanisch",
-        "ko": "Koreanisch",
-        "pt-BR":"Portugiesisch",
-        "ru": "Russisch",
-        "zh-CN": "Chinesisch (Vereinfacht)",
-        "zh-TW": "Chinesisch (Traditionell)"
-    },
    "validator": {
        "errors": {
            "invalid-json": "Ungültige JSON-Daten: __error__",
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@ -1206,16 +1206,16 @@
        "title": "System Info"
    },
    "languages": {
-        "de": "German",
+        "de": "Deutsch",
        "en-US": "English",
        "es-ES": "Español (España)",
-        "fr": "French",
-        "ja": "Japanese",
+        "fr": "Français",
+        "ja": "日本語",
        "ko": "Korean",
-        "pt-BR":"Portuguese",
-        "ru": "Russian",
-        "zh-CN": "Chinese(Simplified)",
-        "zh-TW": "Chinese(Traditional)"
+        "pt-BR": "Português (Brasil)",
+        "ru": "Русский",
+        "zh-CN": "简体中文",
+        "zh-TW": "繁體中文"
    },
    "validator": {
        "errors": {
--- a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
@ -1200,17 +1200,6 @@
  "diagnostics": {
    "title": "Information système"
  },
-  "languages": {
-    "de": "Allemand",
-    "en-US": "Anglais",
-    "fr": "Français",
-    "ja": "Japonais",
-    "ko": "Coréen",
-    "pt-BR": "Portugais brésilien",
-    "ru": "Russe",
-    "zh-CN": "Chinois (Simplifié)",
-    "zh-TW": "Chinois (Traditionnel)"
-  },
  "validator": {
    "errors": {
      "invalid-json": "Données JSON invalides : __error__",
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@ -1205,17 +1205,6 @@
    "diagnostics": {
        "title": "システム情報"
    },
-    "languages": {
-        "de": "ドイツ語",
-        "en-US": "英語",
-        "fr": "フランス語",
-        "ja": "日本語",
-        "ko": "韓国語",
-        "pt-BR": "ポルトガル語",
-        "ru": "ロシア語",
-        "zh-CN": "中国語(簡体)",
-        "zh-TW": "中国語(繁体)"
-    },
    "validator": {
        "errors": {
            "invalid-json": "JSONデータが不正: __error__",
--- a/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json
@ -1172,16 +1172,6 @@
    "diagnostics": {
        "title": "informações do Sistema"
    },
-    "languages": {
-        "de": "Alemão",
-        "en-US": "Inglês",
-        "ja": "Japonês",
-        "ko": "Coreano",
-        "pt-BR": "Português(Brasil)",
-        "ru": "Russo",
-        "zh-CN": "Chinês(Simplificado)",
-        "zh-TW": "Chinês(Tradicional)"
-   },
    "validator": {
        "errors": {
            "invalid-json": "Dados JSON inválidos: __error__",
--- a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json
@ -1128,16 +1128,5 @@
        "appearance": "Внешний вид",
        "preview": "Предпросмотр редактора",
        "defaultValue": "Значение по умолчанию"
-    },
-    "languages" : {
-        "de": "Немецкий",
-        "en-US": "Английский",
-        "fr": "Французский",
-        "ja": "Японский",
-        "ko": "Корейский",
-        "pt-BR":"португальский",
-        "ru": "Русский",
-        "zh-CN": "Китайский (упрощенный)",
-        "zh-TW": "Китайский (традиционный)"
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
@ -1203,17 +1203,6 @@
  "diagnostics": {
    "title": "系统信息"
  },
-  "languages": {
-    "de": "德语",
-    "en-US": "英文",
-    "fr": "法语",
-    "ja": "日语",
-    "ko": "韩文",
-    "pt-BR":"葡萄牙语",
-    "ru":"俄語",
-    "zh-CN": "简体中文",
-    "zh-TW": "繁体中文"
-  },
  "validator": {
    "errors": {
      "invalid-json": "无效的 JSON 数据： __error__",
--- a/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json
@ -1203,17 +1203,6 @@
    "diagnostics": {
      "title": "系统信息"
    },
-    "languages": {
-        "de": "德語",
-        "en-US": "英語",
-        "fr": "法語",
-        "ja": "日語",
-        "ko": "韓語",
-        "pt-BR":"葡萄牙语",
-        "ru":"俄語",
-        "zh-CN": "簡體中文",
-        "zh-TW": "繁體中文"
-    },
    "validator": {
      "errors": {
        "invalid-json": "無效的 JSON 數據： __error__",
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@ -1228,7 +1228,6 @@ RED.nodes = (function() {
                        }
                    }
                } else if (n.credentials) {
-                    node.credentials = {};
                    // All other nodes have a well-defined list of possible credentials
                    for (var cred in n._def.credentials) {
                        if (n._def.credentials.hasOwnProperty(cred)) {
@ -2217,7 +2216,7 @@ RED.nodes = (function() {
                                set: registry.getNodeSet("node-red/unknown")
                            }
                        } else {
-                            if (createNewIds || options.importMap[n.id] === "copy") {
+                            if (subflow_denylist[parentId] || createNewIds || options.importMap[n.id] === "copy") {
                                parentId = subflow.id;
                                node.type = "subflow:"+parentId;
                                node._def = registry.getNodeType(node.type);
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.js
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.js
@ -315,7 +315,7 @@ module.exports = function(RED) {
                    var spec = module.module;
                    if (spec && (spec !== "")) {
                        moduleLoadPromises.push(RED.import(module.module).then(lib => {
-                            sandbox[vname] = lib.default;
+                            sandbox[vname] = lib.default || lib;
                        }).catch(err => {
                            node.error(RED._("function.error.moduleLoadError",{module:module.spec, error:err.toString()}))
                            throw err;
--- a/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js
@ -212,6 +212,7 @@ class Subflow extends Flow {
        var subflowInstanceConfig = {
            id: this.subflowInstance.id,
            type: this.subflowInstance.type,
+            g: this.subflowInstance.g,
            z: this.subflowInstance.z,
            name: this.subflowInstance.name,
            wires: [],