From 9adccb345a8d54622cb8642034468f19abf5a308 Mon Sep 17 00:00:00 2001
From: James Cole <james@firefly-iii.org>
Date: Sat, 4 Feb 2023 10:18:22 +0100
Subject: [PATCH] Better mergify rules.

---
 .github/mergify.yml | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/mergify.yml b/.github/mergify.yml
index 494d5d4b63..03538b668a 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,3 +1,4 @@
+---
 pull_request_rules:
   - name: Close all on main
     conditions:
@@ -5,9 +6,12 @@ pull_request_rules:
       - -author~=^dependabot(|-preview)\[bot\]$
     actions:
       close:
-        message: Please do not open PR's on the `main` branch, but on the `develop` branch only. Thank you!
+        message: Please do not open PR's on the `main` branch, but on the `develop`
+          branch only. Thank you!
   - name: No translations
     conditions:
+      - -author~=^dependabot(|-preview)\[bot\]$
+      - base=develop
       - or:
           - -files=^resources/lang/bg_BG
           - -files=^resources/lang/ca_ES
@@ -50,7 +54,10 @@ pull_request_rules:
           - -files=^resources/lang/zh_TW
     actions:
       comment:
-        message: | 
-          Please do not submit translated strings in your PR. If you need new sentences to be translated, add them to the `en_US` language strings. New or changed translations for other languages can be submitted at https://crowdin.com/project/firefly-iii
-          
+        message: >
+          Please do not submit translated strings in your PR. If you need new
+          sentences to be translated, add them to the `en_US` language strings.
+          New or changed translations for other languages can be submitted at
+          https://crowdin.com/project/firefly-iii
+
           Thank you!