From 29b8f76e574328728a5c7118fd714d041e691434 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 10 Jun 2020 09:26:55 +0300
Subject: [PATCH] Use past tense in messages for already invalidated deprecated
 configs (#36591)

---
 homeassistant/helpers/config_validation.py | 6 ++++--
 tests/helpers/test_config_validation.py    | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/homeassistant/helpers/config_validation.py b/homeassistant/helpers/config_validation.py
index c24adc76597..30cda4e4540 100644
--- a/homeassistant/helpers/config_validation.py
+++ b/homeassistant/helpers/config_validation.py
@@ -659,7 +659,7 @@ def deprecated(
         warning = (
             "The '{key}' option is deprecated,"
             " please replace it with '{replacement_key}'."
-            " This option will become invalid in version"
+            " This option {invalidation_status} invalid in version"
             " {invalidation_version}"
         )
     elif replacement_key:
@@ -671,7 +671,7 @@ def deprecated(
         warning = (
             "The '{key}' option is deprecated,"
             " please remove it from your configuration."
-            " This option will become invalid in version"
+            " This option {invalidation_status} invalid in version"
             " {invalidation_version}"
         )
     else:
@@ -690,6 +690,7 @@ def deprecated(
                 warning.format(
                     key=key,
                     replacement_key=replacement_key,
+                    invalidation_status="became",
                     invalidation_version=invalidation_version,
                 )
             )
@@ -702,6 +703,7 @@ def deprecated(
                 warning,
                 key=key,
                 replacement_key=replacement_key,
+                invalidation_status="will become",
                 invalidation_version=invalidation_version,
             )
 
diff --git a/tests/helpers/test_config_validation.py b/tests/helpers/test_config_validation.py
index d0f19f356ae..e6c3757ec55 100644
--- a/tests/helpers/test_config_validation.py
+++ b/tests/helpers/test_config_validation.py
@@ -642,8 +642,8 @@ def test_deprecated_with_invalidation_version(caplog, schema, version):
         invalidated_schema(test_data)
     assert str(exc_info.value) == (
         "The 'mars' option is deprecated, "
-        "please remove it from your configuration. This option will "
-        "become invalid in version 0.1.0"
+        "please remove it from your configuration. This option became "
+        "invalid in version 0.1.0"
     )
 
 
@@ -702,7 +702,7 @@ def test_deprecated_with_replacement_key_and_invalidation_version(
         invalidated_schema(test_data)
     assert str(exc_info.value) == (
         "The 'mars' option is deprecated, "
-        "please replace it with 'jupiter'. This option will become "
+        "please replace it with 'jupiter'. This option became "
         "invalid in version 0.1.0"
     )
 
@@ -851,7 +851,7 @@ def test_deprecated_with_replacement_key_invalidation_version_default(
         invalidated_schema(test_data)
     assert str(exc_info.value) == (
         "The 'mars' option is deprecated, "
-        "please replace it with 'jupiter'. This option will become "
+        "please replace it with 'jupiter'. This option became "
         "invalid in version 0.1.0"
     )