Skip to content

Commit

Permalink
Update euro currency formatting for English locales (Issue #13476)
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexgibson
alexgibson committed Aug 2, 2023
1 parent 5a8d92a commit 2a4b0c9
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 22 deletions.
56 changes: 37 additions & 19 deletions bedrock/products/tests/test_helper_misc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@
"monthly": {"id": "price_1N7PQIJNcmPzuWtR2BQdQbtL", "price": "9,99 €", "total": None, "saving": None},
},
"en": { # English
"12-month": {"id": "price_1JcdvBJNcmPzuWtROLbEH9d2", "price": "4,99 €", "total": "59,88 €", "saving": 50},
"monthly": {"id": "price_1JcdsSJNcmPzuWtRGF9Y5TMJ", "price": "9,99 €", "total": None, "saving": None},
"12-month": {"id": "price_1JcdvBJNcmPzuWtROLbEH9d2", "price": "4.99 €", "total": "59.88 €", "saving": 50},
"monthly": {"id": "price_1JcdsSJNcmPzuWtRGF9Y5TMJ", "price": "9.99 €", "total": None, "saving": None},
},
"es": { # Spanish
"12-month": {"id": "price_1J5JCdJNcmPzuWtRrvQMFLlP", "price": "4,99 €", "total": "59,88 €", "saving": 50},
Expand Down Expand Up @@ -1011,13 +1011,19 @@ def test_vpn_monthly_price_usd_ca(self):

def test_vpn_monthly_price_euro(self):
"""Should return expected markup"""
markup = self._render(plan="monthly", country_code="DE", lang="de")
markup = self._render(plan="monthly", country_code="DE", lang="en-US")
expected = '<span class="vpn-monthly-price-display">9,99 €<span>/month</span></span>'
self.assertEqual(markup, expected)

def test_vpn_monthly_price_euro_fi(self):
"""Should return expected markup"""
markup = self._render(plan="monthly", country_code="FI", lang="en-US")
expected = '<span class="vpn-monthly-price-display">9.99 €<span>/month</span></span>'
self.assertEqual(markup, expected)

def test_vpn_monthly_price_chf(self):
"""Should return expected markup"""
markup = self._render(plan="monthly", country_code="CH", lang="de")
markup = self._render(plan="monthly", country_code="CH", lang="en-US")
expected = '<span class="vpn-monthly-price-display">CHF 10.99<span>/month</span></span>'
self.assertEqual(markup, expected)

Expand All @@ -1035,13 +1041,19 @@ def test_vpn_12_month_price_usd_ca(self):

def test_vpn_12_month_price_euro(self):
"""Should return expected markup"""
markup = self._render(plan="12-month", country_code="DE", lang="de")
markup = self._render(plan="12-month", country_code="DE", lang="en-US")
expected = '<span class="vpn-monthly-price-display">4,99 €<span>/month</span></span>'
self.assertEqual(markup, expected)

def test_vpn_12_month_price_euro_fi(self):
"""Should return expected markup"""
markup = self._render(plan="12-month", country_code="FI", lang="en-US")
expected = '<span class="vpn-monthly-price-display">4.99 €<span>/month</span></span>'
self.assertEqual(markup, expected)

def test_vpn_12_month_price_chf(self):
"""Should return expected markup"""
markup = self._render(plan="12-month", country_code="CH", lang="de")
markup = self._render(plan="12-month", country_code="CH", lang="en-US")
expected = '<span class="vpn-monthly-price-display">CHF 5.99<span>/month</span></span>'
self.assertEqual(markup, expected)

Expand All @@ -1059,13 +1071,13 @@ def test_vpn_12_month_price_czk(self):

def test_vpn_monthly_price_dkk(self):
"""Should return expected markup"""
markup = self._render(plan="monthly", country_code="DK", lang="da")
markup = self._render(plan="monthly", country_code="DK", lang="en-US")
expected = '<span class="vpn-monthly-price-display">kr. 75<span>/month</span></span>'
self.assertEqual(markup, expected)

def test_vpn_12_month_price_dkk(self):
"""Should return expected markup"""
markup = self._render(plan="12-month", country_code="DK", lang="da")
markup = self._render(plan="12-month", country_code="DK", lang="en-US")
expected = '<span class="vpn-monthly-price-display">kr. 37<span>/month</span></span>'
self.assertEqual(markup, expected)

Expand Down Expand Up @@ -1108,25 +1120,31 @@ def test_vpn_12_month_total_price_usd_ca(self):

def test_vpn_12_month_total_price_euro(self):
"""Should return expected markup"""
markup = self._render(country_code="DE", lang="de")
markup = self._render(country_code="DE", lang="en-US")
expected = "59,88 € total"
self.assertEqual(markup, expected)

def test_vpn_12_month_total_price_euro_fi(self):
"""Should return expected markup"""
markup = self._render(country_code="FI", lang="en-US")
expected = "59.88 € total"
self.assertEqual(markup, expected)

def test_vpn_12_month_total_price_chf(self):
"""Should return expected markup"""
markup = self._render(country_code="CH", lang="de")
markup = self._render(country_code="CH", lang="en-US")
expected = "CHF 71.88 total"
self.assertEqual(markup, expected)

def test_vpn_12_month_total_price_czk(self):
"""Should return expected markup"""
markup = self._render(country_code="CZ", lang="cs")
markup = self._render(country_code="CZ", lang="en-US")
expected = "1,428 Kč total"
self.assertEqual(markup, expected)

def test_vpn_12_month_total_price_dkk(self):
"""Should return expected markup"""
markup = self._render(country_code="DK", lang="da")
markup = self._render(country_code="DK", lang="en-US")
expected = "kr. 444 total"
self.assertEqual(markup, expected)

Expand All @@ -1144,7 +1162,7 @@ def test_vpn_relay_bundle_12_month_total_price_usd(self):

def test_vpn_relay_bundle_12_month_total_price_ca(self):
"""Should return expected markup"""
markup = self._render(country_code="CA", lang="en-CA", bundle_relay=True)
markup = self._render(country_code="CA", lang="en-US", bundle_relay=True)
expected = "US$83.88 total + tax"
self.assertEqual(markup, expected)

Expand All @@ -1169,13 +1187,13 @@ def test_vpn_12_month_saving_usd(self):

def test_vpn_12_month_saving_euro(self):
"""Should return expected markup"""
markup = self._render(country_code="DE", lang="de")
markup = self._render(country_code="DE", lang="en-US")
expected = "Save 50%"
self.assertEqual(markup, expected)

def test_vpn_12_month_saving_chf(self):
"""Should return expected markup"""
markup = self._render(country_code="CH", lang="de")
markup = self._render(country_code="CH", lang="en-US")
expected = "Save 45%"
self.assertEqual(markup, expected)

Expand All @@ -1187,19 +1205,19 @@ def test_vpn_12_month_saving_bgn(self):

def test_vpn_12_month_saving_czk(self):
"""Should return expected markup"""
markup = self._render(country_code="CZ", lang="cz")
markup = self._render(country_code="CZ", lang="en-US")
expected = "Save 50%"
self.assertEqual(markup, expected)

def test_vpn_12_month_saving_dkk(self):
"""Should return expected markup"""
markup = self._render(country_code="DK", lang="da")
markup = self._render(country_code="DK", lang="en-US")
expected = "Save 50%"
self.assertEqual(markup, expected)

def test_vpn_12_month_saving_huf(self):
"""Should return expected markup"""
markup = self._render(country_code="HU", lang="hu")
markup = self._render(country_code="HU", lang="en-US")
expected = "Save 50%"
self.assertEqual(markup, expected)

Expand All @@ -1223,7 +1241,7 @@ def test_vpn_relay_bundle_12_month_saving_usd(self):

def test_vpn_relay_bundle_12_month_saving_ca(self):
"""Should return expected markup"""
markup = self._render(country_code="CA", lang="en-CA", bundle_relay=True)
markup = self._render(country_code="CA", lang="en-US", bundle_relay=True)
expected = "Save 50%"
self.assertEqual(markup, expected)

Expand Down
6 changes: 3 additions & 3 deletions bedrock/settings/base.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1328,14 +1328,14 @@ def before_send(event, hint):
"en": { # English
"12-month": {
"id": "price_1JcuArKb9q6OnNsLXAnkCSUE" if DEV else "price_1JcdvBJNcmPzuWtROLbEH9d2",
"price": "4,99 €",
"total": "59,88 €",
"price": "4.99 €",
"total": "59.88 €",
"saving": 50,
"analytics": {"brand": "vpn", "plan": "vpn", "currency": "EUR", "discount": "60.00", "price": "59.88", "period": "yearly"},
},
"monthly": {
"id": "price_1Jcu7uKb9q6OnNsLG4JAAXuw" if DEV else "price_1JcdsSJNcmPzuWtRGF9Y5TMJ",
"price": "9,99 €",
"price": "9.99 €",
"total": None,
"saving": None,
"analytics": {"brand": "vpn", "plan": "vpn", "currency": "EUR", "discount": "0", "price": "9.99", "period": "monthly"},
Expand Down

0 comments on commit 2a4b0c9

Please sign in to comment.