From 08a5779c35fc4acf6eae7ec3d20cd0785874b4ba Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mair@oewf.org>
Date: Sun, 20 Feb 2022 19:25:03 +0100
Subject: [PATCH 1/3] fix caps

---
 InvenTree/templates/allauth_2fa/backup_tokens.html | 2 +-
 InvenTree/templates/allauth_2fa/setup.html         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/InvenTree/templates/allauth_2fa/backup_tokens.html b/InvenTree/templates/allauth_2fa/backup_tokens.html
index 2fe30e8222..2257baecb3 100644
--- a/InvenTree/templates/allauth_2fa/backup_tokens.html
+++ b/InvenTree/templates/allauth_2fa/backup_tokens.html
@@ -28,6 +28,6 @@
   </button>
 </form>
 <br>
-<a href="{% url 'settings' %}" class="btn btn-secondary w-100 btn-sm">{% trans "back to settings" %}</a>
+<a href="{% url 'settings' %}" class="btn btn-secondary w-100 btn-sm">{% trans "Back to settings" %}</a>
 
 {% endblock %}
diff --git a/InvenTree/templates/allauth_2fa/setup.html b/InvenTree/templates/allauth_2fa/setup.html
index ce795a3c98..2b74ad9c47 100644
--- a/InvenTree/templates/allauth_2fa/setup.html
+++ b/InvenTree/templates/allauth_2fa/setup.html
@@ -37,6 +37,6 @@
 </form>
 
 <div>
-<a href="{% url 'settings' %}" class="btn btn-secondary w-100 btn-sm mt-3">{% trans "back to settings" %}</a>
+<a href="{% url 'settings' %}" class="btn btn-secondary w-100 btn-sm mt-3">{% trans "Back to settings" %}</a>
 </div>
 {% endblock %}

From 0baffcaee55cc3e844a749af518be5f21280868f Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mair@oewf.org>
Date: Sun, 20 Feb 2022 21:12:20 +0100
Subject: [PATCH 2/3] fix string concat

---
 InvenTree/InvenTree/serializers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/InvenTree/InvenTree/serializers.py b/InvenTree/InvenTree/serializers.py
index 98e03fdc0e..7f0c966914 100644
--- a/InvenTree/InvenTree/serializers.py
+++ b/InvenTree/InvenTree/serializers.py
@@ -620,7 +620,7 @@ class DataFileExtractSerializer(serializers.Serializer):
             # Check for missing required columns
             if required:
                 if name not in self.columns:
-                    raise serializers.ValidationError(_("Missing required column") + f": '{name}'")
+                    raise serializers.ValidationError(_("Missing required column: '{name}'"))
 
         for col in self.columns:
 
@@ -629,7 +629,7 @@ class DataFileExtractSerializer(serializers.Serializer):
 
             # Check for duplicated columns
             if col in cols_seen:
-                raise serializers.ValidationError(_("Duplicate column") + f": '{col}'")
+                raise serializers.ValidationError(_("Duplicate column: '{col}'"))
 
             cols_seen.add(col)
 

From b974b5fc306f49b9089486729c9b9df4710d2ba3 Mon Sep 17 00:00:00 2001
From: Matthias <matthias.mair@oewf.org>
Date: Sun, 20 Feb 2022 21:47:39 +0100
Subject: [PATCH 3/3] use f-string annotation

---
 InvenTree/InvenTree/serializers.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/InvenTree/InvenTree/serializers.py b/InvenTree/InvenTree/serializers.py
index 7f0c966914..e21e2fb0fc 100644
--- a/InvenTree/InvenTree/serializers.py
+++ b/InvenTree/InvenTree/serializers.py
@@ -620,7 +620,7 @@ class DataFileExtractSerializer(serializers.Serializer):
             # Check for missing required columns
             if required:
                 if name not in self.columns:
-                    raise serializers.ValidationError(_("Missing required column: '{name}'"))
+                    raise serializers.ValidationError(_(f"Missing required column: '{name}'"))
 
         for col in self.columns:
 
@@ -629,7 +629,7 @@ class DataFileExtractSerializer(serializers.Serializer):
 
             # Check for duplicated columns
             if col in cols_seen:
-                raise serializers.ValidationError(_("Duplicate column: '{col}'"))
+                raise serializers.ValidationError(_(f"Duplicate column: '{col}'"))
 
             cols_seen.add(col)