From 53ce848145c3137581ce0b8ea7b6315e82165b74 Mon Sep 17 00:00:00 2001
From: Matthias <matmair@live.de>
Date: Sat, 22 May 2021 14:48:56 +0200
Subject: [PATCH 1/3] better translation

---
 InvenTree/templates/InvenTree/settings/currencies.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/InvenTree/templates/InvenTree/settings/currencies.html b/InvenTree/templates/InvenTree/settings/currencies.html
index fa9d234988..d9b046b9f5 100644
--- a/InvenTree/templates/InvenTree/settings/currencies.html
+++ b/InvenTree/templates/InvenTree/settings/currencies.html
@@ -24,7 +24,7 @@
 
 <div class='row'>
     <div class='col-sm-6'>
-        <h4>{% trans "Exchange Rates - Convert to " %}{{ default_currency }}</h4>
+        <h4>{% blocktrans with cur=default_currency %}Exchange Rates - Convert to {{cur}}{% endblocktrans %}</h4>
     </div>
 </div>
 

From 4503f23ae4e7c8292c59c93ba66d7a6a021d71a4 Mon Sep 17 00:00:00 2001
From: Matthias <matmair@live.de>
Date: Sat, 22 May 2021 14:55:05 +0200
Subject: [PATCH 2/3] beeing safe with wrong / unknown setttings

---
 InvenTree/InvenTree/exchange.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/InvenTree/InvenTree/exchange.py b/InvenTree/InvenTree/exchange.py
index ce1db06711..8de0c9902f 100644
--- a/InvenTree/InvenTree/exchange.py
+++ b/InvenTree/InvenTree/exchange.py
@@ -13,8 +13,10 @@ def get_exchange_rate_backend():
 
     if 'InvenTreeManualExchangeBackend' in inventree_settings.EXCHANGE_BACKEND:
         return InvenTreeManualExchangeBackend()
-    else:
+    elif 'InvenTreeFixerExchangeBackend' in inventree_settings.EXCHANGE_BACKEND:
         return InvenTreeFixerExchangeBackend()
+    else:
+        raise ImproperlyConfigured('Exchange Backend wrongly configured')
 
 
 class InvenTreeManualExchangeBackend(BaseExchangeBackend):

From b1b974a1f611141dd5c8a751bcfc0b79264ef756 Mon Sep 17 00:00:00 2001
From: Matthias <matmair@live.de>
Date: Sat, 22 May 2021 14:55:41 +0200
Subject: [PATCH 3/3] safer check if fixer-backend is used

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

diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py
index 48e42dd890..778316ddd5 100644
--- a/InvenTree/InvenTree/views.py
+++ b/InvenTree/InvenTree/views.py
@@ -959,7 +959,7 @@ class CurrencySettingsView(FormView):
         stored_rates = exchange_rate_backend.get_stored_rates()
             
         for field in form.fields:
-            if 'fixer' in exchange_rate_backend.name:
+            if exchange_rate_backend.name.startswith('fixer-'):
                 # Disable all the fields
                 form.fields[field].disabled = True
             form.fields[field].initial = clean_decimal(stored_rates.get(field, 0))
@@ -973,7 +973,7 @@ class CurrencySettingsView(FormView):
         # Get exchange rate backend
         exchange_rate_backend = self.get_exchange_rate_backend()
 
-        if 'fixer' in exchange_rate_backend.name:
+        if exchange_rate_backend.name.startswith('fixer-'):
             # Refresh rate from Fixer.IO API
             exchange_rate_backend.update_rates(base_currency=exchange_rate_backend.base_currency)
             # Check if rates have been updated