From 2ce684f71b1b8cb3305a67147f7afa10155c5ef7 Mon Sep 17 00:00:00 2001
From: Maxim Janssens <maxim@mpjconsultancy.nl>
Date: Wed, 22 Aug 2018 14:10:01 +0200
Subject: [PATCH] 2.3-8.4.1 -- Fix EPS/Giropay switch and delete remaining
 Mistercash language files.

---
 admin/language/de-de/extension/payment/mollie_mistercash.php  | 4 ----
 admin/language/es-es/extension/payment/mollie_mistercash.php  | 4 ----
 admin/language/german/extension/payment/mollie_mistercash.php | 4 ----
 .../language/spanish/extension/payment/mollie_mistercash.php  | 4 ----
 catalog/language/de-de/extension/payment/mollie.php           | 4 ++--
 catalog/language/dutch/extension/payment/mollie.php           | 4 ++--
 catalog/language/en-gb/extension/payment/mollie.php           | 4 ++--
 catalog/language/english/extension/payment/mollie.php         | 4 ++--
 catalog/language/es-es/extension/payment/mollie.php           | 4 ++--
 catalog/language/fr-fr/extension/payment/mollie.php           | 4 ++--
 catalog/language/french/extension/payment/mollie.php          | 4 ++--
 catalog/language/german/extension/payment/mollie.php          | 4 ++--
 catalog/language/nl-nl/extension/payment/mollie.php           | 4 ++--
 catalog/language/spanish/extension/payment/mollie.php         | 4 ++--
 14 files changed, 20 insertions(+), 36 deletions(-)
 delete mode 100644 admin/language/de-de/extension/payment/mollie_mistercash.php
 delete mode 100644 admin/language/es-es/extension/payment/mollie_mistercash.php
 delete mode 100644 admin/language/german/extension/payment/mollie_mistercash.php
 delete mode 100644 admin/language/spanish/extension/payment/mollie_mistercash.php

diff --git a/admin/language/de-de/extension/payment/mollie_mistercash.php b/admin/language/de-de/extension/payment/mollie_mistercash.php
deleted file mode 100644
index ca502219..00000000
--- a/admin/language/de-de/extension/payment/mollie_mistercash.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-require(dirname(__FILE__) . "/mollie.php");
-
-$_['heading_title'] .= " &ndash; " . $_['name_mollie_mistercash'];
diff --git a/admin/language/es-es/extension/payment/mollie_mistercash.php b/admin/language/es-es/extension/payment/mollie_mistercash.php
deleted file mode 100644
index ca502219..00000000
--- a/admin/language/es-es/extension/payment/mollie_mistercash.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-require(dirname(__FILE__) . "/mollie.php");
-
-$_['heading_title'] .= " &ndash; " . $_['name_mollie_mistercash'];
diff --git a/admin/language/german/extension/payment/mollie_mistercash.php b/admin/language/german/extension/payment/mollie_mistercash.php
deleted file mode 100644
index ca502219..00000000
--- a/admin/language/german/extension/payment/mollie_mistercash.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-require(dirname(__FILE__) . "/mollie.php");
-
-$_['heading_title'] .= " &ndash; " . $_['name_mollie_mistercash'];
diff --git a/admin/language/spanish/extension/payment/mollie_mistercash.php b/admin/language/spanish/extension/payment/mollie_mistercash.php
deleted file mode 100644
index ca502219..00000000
--- a/admin/language/spanish/extension/payment/mollie_mistercash.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-require(dirname(__FILE__) . "/mollie.php");
-
-$_['heading_title'] .= " &ndash; " . $_['name_mollie_mistercash'];
diff --git a/catalog/language/de-de/extension/payment/mollie.php b/catalog/language/de-de/extension/payment/mollie.php
index 8efe4a60..1d1db8ce 100644
--- a/catalog/language/de-de/extension/payment/mollie.php
+++ b/catalog/language/de-de/extension/payment/mollie.php
@@ -79,5 +79,5 @@
 $_['method_paysafecard']                = 'paysafecard';
 $_['method_giftcard']                   = 'Giftcard';
 $_['method_inghomepay']                 = 'ING Home\'Pay';
-$_['method_eps']                        = 'Giropay';
-$_['method_giropay']                    = 'EPS';
+$_['method_eps']                        = 'EPS';
+$_['method_giropay']                    = 'Giropay';
diff --git a/catalog/language/dutch/extension/payment/mollie.php b/catalog/language/dutch/extension/payment/mollie.php
index 5d4838c8..d4f73217 100644
--- a/catalog/language/dutch/extension/payment/mollie.php
+++ b/catalog/language/dutch/extension/payment/mollie.php
@@ -79,5 +79,5 @@
 $_['method_paysafecard']                = 'paysafecard';
 $_['method_giftcard']                   = 'Giftcard';
 $_['method_inghomepay']                 = 'ING Home\'Pay';
-$_['method_eps']                        = 'Giropay';
-$_['method_giropay']                    = 'EPS';
+$_['method_eps']                        = 'EPS';
+$_['method_giropay']                    = 'Giropay';
diff --git a/catalog/language/en-gb/extension/payment/mollie.php b/catalog/language/en-gb/extension/payment/mollie.php
index e3471522..9ed6aa5e 100644
--- a/catalog/language/en-gb/extension/payment/mollie.php
+++ b/catalog/language/en-gb/extension/payment/mollie.php
@@ -79,5 +79,5 @@
 $_['method_paysafecard']  = 'paysafecard';
 $_['method_giftcard']     = 'Giftcard';
 $_['method_inghomepay']   = 'ING Home\'Pay';
-$_['method_eps']          = 'Giropay';
-$_['method_giropay']      = 'EPS';
+$_['method_eps']          = 'EPS';
+$_['method_giropay']      = 'Giropay';
diff --git a/catalog/language/english/extension/payment/mollie.php b/catalog/language/english/extension/payment/mollie.php
index 84048009..a17ab9f8 100644
--- a/catalog/language/english/extension/payment/mollie.php
+++ b/catalog/language/english/extension/payment/mollie.php
@@ -79,5 +79,5 @@
 $_['method_paysafecard']  = 'paysafecard';
 $_['method_giftcard']     = 'Webshop Giftcard';
 $_['method_inghomepay']   = 'ING Home\'Pay';
-$_['method_eps']          = 'Giropay';
-$_['method_giropay']      = 'EPS';
+$_['method_eps']          = 'EPS';
+$_['method_giropay']      = 'Giropay';
diff --git a/catalog/language/es-es/extension/payment/mollie.php b/catalog/language/es-es/extension/payment/mollie.php
index 245d33f7..71532e59 100644
--- a/catalog/language/es-es/extension/payment/mollie.php
+++ b/catalog/language/es-es/extension/payment/mollie.php
@@ -79,5 +79,5 @@
 $_['method_paysafecard']                = 'paysafecard';
 $_['method_giftcard']                   = 'Giftcard';
 $_['method_inghomepay']                 = 'ING Home\'Pay';
-$_['method_eps']                        = 'Giropay';
-$_['method_giropay']                    = 'EPS';
+$_['method_eps']                        = 'EPS';
+$_['method_giropay']                    = 'Giropay';
diff --git a/catalog/language/fr-fr/extension/payment/mollie.php b/catalog/language/fr-fr/extension/payment/mollie.php
index 7fcddd77..50e362ee 100644
--- a/catalog/language/fr-fr/extension/payment/mollie.php
+++ b/catalog/language/fr-fr/extension/payment/mollie.php
@@ -79,5 +79,5 @@
 $_['method_paysafecard']                = 'paysafecard';
 $_['method_giftcard']                   = 'Giftcard';
 $_['method_inghomepay']                 = 'ING Home\'Pay';
-$_['method_eps']                        = 'Giropay';
-$_['method_giropay']                    = 'EPS';
+$_['method_eps']                        = 'EPS';
+$_['method_giropay']                    = 'Giropay';
diff --git a/catalog/language/french/extension/payment/mollie.php b/catalog/language/french/extension/payment/mollie.php
index 85aff8a9..dd6672d6 100644
--- a/catalog/language/french/extension/payment/mollie.php
+++ b/catalog/language/french/extension/payment/mollie.php
@@ -79,5 +79,5 @@
 $_['method_paysafecard']  = 'paysafecard';
 $_['method_giftcard']     = 'Giftcard';
 $_['method_inghomepay']   = 'ING Home\'Pay';
-$_['method_eps']          = 'Giropay';
-$_['method_giropay']      = 'EPS';
+$_['method_eps']          = 'EPS';
+$_['method_giropay']      = 'Giropay';
diff --git a/catalog/language/german/extension/payment/mollie.php b/catalog/language/german/extension/payment/mollie.php
index 8efe4a60..1d1db8ce 100644
--- a/catalog/language/german/extension/payment/mollie.php
+++ b/catalog/language/german/extension/payment/mollie.php
@@ -79,5 +79,5 @@
 $_['method_paysafecard']                = 'paysafecard';
 $_['method_giftcard']                   = 'Giftcard';
 $_['method_inghomepay']                 = 'ING Home\'Pay';
-$_['method_eps']                        = 'Giropay';
-$_['method_giropay']                    = 'EPS';
+$_['method_eps']                        = 'EPS';
+$_['method_giropay']                    = 'Giropay';
diff --git a/catalog/language/nl-nl/extension/payment/mollie.php b/catalog/language/nl-nl/extension/payment/mollie.php
index 1b3b43a2..0b47f087 100644
--- a/catalog/language/nl-nl/extension/payment/mollie.php
+++ b/catalog/language/nl-nl/extension/payment/mollie.php
@@ -79,5 +79,5 @@
 $_['method_paysafecard']  = 'paysafecard';
 $_['method_giftcard']     = 'Giftcard';
 $_['method_inghomepay']   = 'ING Home\'Pay';
-$_['method_eps']          = 'Giropay';
-$_['method_giropay']      = 'EPS';
+$_['method_eps']          = 'EPS';
+$_['method_giropay']      = 'Giropay';
diff --git a/catalog/language/spanish/extension/payment/mollie.php b/catalog/language/spanish/extension/payment/mollie.php
index 245d33f7..71532e59 100644
--- a/catalog/language/spanish/extension/payment/mollie.php
+++ b/catalog/language/spanish/extension/payment/mollie.php
@@ -79,5 +79,5 @@
 $_['method_paysafecard']                = 'paysafecard';
 $_['method_giftcard']                   = 'Giftcard';
 $_['method_inghomepay']                 = 'ING Home\'Pay';
-$_['method_eps']                        = 'Giropay';
-$_['method_giropay']                    = 'EPS';
+$_['method_eps']                        = 'EPS';
+$_['method_giropay']                    = 'Giropay';