From 98cdbbba49a3d18b313f50dcce4cd140694592d0 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 11 Feb 2025 10:49:45 +0100
Subject: [PATCH] gitlab-ci: fail if config/en/ is included

If the 'en' locale is added, it could override the source strings, which
are en-US.  If someone wants to add an alternate English locale, it must
include the country code, e.g. en-GB.
---
 .gitlab-ci.yml           |  2 ++
 config/en/categories.yml | 34 ----------------------------------
 config/en/config.yml     |  5 -----
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 config/en/categories.yml
 delete mode 100644 config/en/config.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dcbce04cbd..ca4aad71c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -200,6 +200,8 @@ fdroid lint config:
   script:
     - chown -R $(whoami) .
     - fdroid lint config/*.yml config/*/*.yml
+    # Alternate English locales must include the country code, e.g. en-GB.
+    - python3 -c "import os; exit(os.path.exists('config/en/'))"
     # TODO once config.yml is added to fdroiddata, add it to the line above
     - test -e config.yml || exit 0
     - fdroid lint config.yml
diff --git a/config/en/categories.yml b/config/en/categories.yml
deleted file mode 100644
index 9956ddda96..0000000000
--- a/config/en/categories.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-Connectivity:
-  name: Connectivity
-Development:
-  name: Development
-Games:
-  name: Games
-Graphics:
-  name: Graphics
-Internet:
-  name: Internet
-Money:
-  name: Money
-Multimedia:
-  name: Multimedia
-Phone & SMS:
-  name: Phone & SMS
-Navigation:
-  name: Navigation
-Reading:
-  name: Reading
-Science & Education:
-  name: Science & Education
-Time:
-  name: Time
-Security:
-  name: Security
-Sports & Health:
-  name: Sports & Health
-System:
-  name: System
-Theming:
-  name: Theming
-Writing:
-  name: Writing
diff --git a/config/en/config.yml b/config/en/config.yml
deleted file mode 100644
index 63e58ce276..0000000000
--- a/config/en/config.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-archive:
-  name: F-Droid Archive
-repo:
-  description: The official F-Droid free software repository. Everything in this repository is always built from the source code.
-  name: F-Droid