From 7e5966325076cb71a10abf614d3c2a27f4377cd9 Mon Sep 17 00:00:00 2001
From: Morg42 <43153739+Morg42@users.noreply.github.com>
Date: Sat, 4 Jan 2025 17:44:39 +0100
Subject: [PATCH 1/2] workflows: checkout fallback to plugins/develop

---
 .github/workflows/codeql.yml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
index bc14ae91ce..3cca57afca 100644
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -44,14 +44,25 @@ jobs:
           repository: smarthomeNG/smarthome
           ref: ${{steps.extract_branch.outputs.branch}}
           path: smarthomeng
-    
-    - name: Checkout repository PLUGINS ${{steps.extract_branch.outputs.branch}} Branch
+
+    - name: Check if branch '${{ steps.extract_branch.outputs.branch }}' exists in smarthomeNG/plugins
+      run: echo "code=$(git ls-remote --exit-code --heads https://github.com/smarthomeNG/plugins ${{ steps.extract_branch.outputs.branch }} > /dev/null; echo $? )" >>$GITHUB_OUTPUT
+      id: plugins_branch_check
+
+    - name: Checkout plugins from branch '${{ steps.extract_branch.outputs.branch }}' (for push on known smarthomeNG/smarthome branch)
+      if: github.event_name != 'pull_request' && steps.plugins_branch_check.outputs.code == '0'
       uses: actions/checkout@v3
       with:
-          repository: smarthomeNG/smarthome
-          ref: ${{steps.extract_branch.outputs.branch}}
-          path: plugins
-    
+        repository: smarthomeNG/plugins
+        ref: ${{ steps.extract_branch.outputs.branch }}
+
+    - name: Checkout plugins from branch 'develop' (for pull request or push on unknown smarthomeNG/smarthome branch)
+      if: github.event_name == 'pull_request' || steps.plugins_branch_check.outputs.code == '2'
+      uses: actions/checkout@v3
+      with:
+        repository: smarthomeNG/plugins
+        ref: develop
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v2

From 2974078aa2e22d6c8cc12bab8069d10f489544c5 Mon Sep 17 00:00:00 2001
From: Morg42 <43153739+Morg42@users.noreply.github.com>
Date: Tue, 7 Jan 2025 14:16:44 +0100
Subject: [PATCH 2/2] adminui: fix typo in de translation

---
 modules/admin/webif/static/assets/i18n/de.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/admin/webif/static/assets/i18n/de.json b/modules/admin/webif/static/assets/i18n/de.json
index 76cff1508a..a692907782 100644
--- a/modules/admin/webif/static/assets/i18n/de.json
+++ b/modules/admin/webif/static/assets/i18n/de.json
@@ -213,7 +213,7 @@
     "UPDATE INFORMATION": "Änderungsinformationen",
     "LAST VALUE": "letzter Wert",
     "LAST UPDATE": "Letztes Update",
-    "LAST CHANGE": "Letze Änderung",
+    "LAST CHANGE": "Letzte Änderung",
     "UPDATE AGE": "Zeit seit dem letzten Update",
     "CHANGE AGE": "Zeit seit der letzten Änderung",
     "UPDATE BY": "Update durch",