Add email as common data string

homeassistant/components/abode/strings.json

@@ -3,7 +3,10 @@
     "step": {
       "user": {
         "title": "Fill in your Abode login information",
-        "data": { "username": "Email Address", "password": "Password" }
+        "data": {
+          "username": "[%key:common::config_flow::data::email%]",
+          "password": "Password"
+        }
       }
     },
     "error": {

homeassistant/components/hangouts/strings.json

@@ -12,7 +12,7 @@
     "step": {
       "user": {
         "data": {
-          "email": "E-Mail Address",
+          "email": "[%key:common::config_flow::data::email%]",
           "password": "Password",
           "authorization_code": "Authorization Code (required for manual authentication)"
         },

homeassistant/components/icloud/strings.json

@@ -5,7 +5,7 @@
         "title": "iCloud credentials",
         "description": "Enter your credentials",
         "data": {
-          "username": "Email",
+          "username": "[%key:common::config_flow::data::email%]",
           "password": "Password",
           "with_family": "With family"
         }

homeassistant/components/linky/strings.json

@@ -4,7 +4,10 @@
       "user": {
         "title": "Linky",
         "description": "Enter your credentials",
-        "data": { "username": "Email", "password": "Password" }
+        "data": {
+          "username": "[%key:common::config_flow::data::email%]",
+          "password": "Password"
+        }
       }
     },
     "error": {

homeassistant/components/melcloud/strings.json

@@ -5,7 +5,7 @@
         "title": "Connect to MELCloud",
         "description": "Connect using your MELCloud account.",
         "data": {
-          "username": "Email used to login to MELCloud.",
+          "username": "[%key:common::config_flow::data::email%]",
           "password": "MELCloud password."
         }
       }

homeassistant/components/sense/strings.json

@@ -3,7 +3,10 @@
     "step": {
       "user": {
         "title": "Connect to your Sense Energy Monitor",
-        "data": { "email": "Email Address", "password": "Password" }
+        "data": {
+          "email": "[%key:common::config_flow::data::email%]",
+          "password": "Password"
+        }
       }
     },
     "error": {

homeassistant/components/simplisafe/strings.json

@@ -4,7 +4,7 @@
       "user": {
         "title": "Fill in your information.",
         "data": {
-          "username": "Email Address",
+          "username": "[%key:common::config_flow::data::email%]",
           "password": "Password",
           "code": "Code (used in Home Assistant UI)"
         }

homeassistant/components/tesla/strings.json

@@ -8,7 +8,10 @@
     },
     "step": {
       "user": {
-        "data": { "username": "Email Address", "password": "Password" },
+        "data": {
+          "username": "[%key:common::config_flow::data::email%]",
+          "password": "Password"
+        },
         "description": "Please enter your information.",
         "title": "Tesla - Configuration"
       }

homeassistant/components/vesync/strings.json

@@ -3,7 +3,10 @@
     "step": {
       "user": {
         "title": "Enter Username and Password",
-        "data": { "username": "Email Address", "password": "Password" }
+        "data": {
+          "username": "[%key:common::config_flow::data::email%]",
+          "password": "Password"
+        }
       }
     },
     "error": { "invalid_login": "Invalid username or password" },

homeassistant/strings.json

@@ -25,6 +25,7 @@
         "confirm_setup": "Do you want to start set up?"
       },
       "data": {
+        "email": "Email",
         "username": "Username",
         "password": "Password",
         "host": "Host",

script/translations/migrate.py

@@ -392,30 +392,16 @@ def clean_wled():
 
 def run():
     """Migrate translations."""
-    clean_wled()
-
-    # Import new common keys
-    # rename_keys(
-    #     CORE_PROJECT_ID,
-    #     {
-    #         "component::netatmo::config::step::pick_implementation::title": "common::config_flow::title::oauth2_pick_implementation",
-    #         "component::doorbird::config::step::user::data::username": "common::config_flow::data::username",
-    #         "component::doorbird::config::step::user::data::password": "common::config_flow::data::password",
-    #         "component::adguard::config::step::user::data::host": "common::config_flow::data::host",
-    #         "component::adguard::config::step::user::data::port": "common::config_flow::data::port",
-    #         "component::zha::config::step::user::data::usb_path": "common::config_flow::data::usb_path",
-    #         "component::smartthings::config::step::pat::data::access_token": "common::config_flow::data::access_token",
-    #         "component::airvisual::config::step::geography::data::api_key": "common::config_flow::data::api_key",
-    #         "component::doorbird::config::error::invalid_auth": "common::config_flow::error::invalid_auth",
-    #         "component::airvisual::config::error::invalid_api_key": "common::config_flow::error::invalid_api_key",
-    #         "component::tibber::config::error::invalid_access_token": "common::config_flow::error::invalid_access_token",
-    #         "component::doorbird::config::error::unknown": "common::config_flow::error::unknown",
-    #         "component::life360::config::abort::user_already_configured": "common::config_flow::abort::already_configured_account",
-    #         "component::xiaomi_miio::config::abort::already_configured": "common::config_flow::abort::already_configured_device",
-    #         "component::netatmo::config::abort::missing_configuration": "common::config_flow::abort::oauth2_missing_configuration",
-    #         "component::netatmo::config::abort::authorize_url_timeout": "common::config_flow::abort::oauth2_authorize_url_timeout",
-    #     },
-    # )
+    # clean_wled()
+
+    # Rename existing keys to common keys,
+    # Old keys have been updated with reference to the common key
+    rename_keys(
+        CORE_PROJECT_ID,
+        {
+            "component::icloud::config::step::user::data::username": "common::config_flow::data::email",
+        },
+    )
 
     # find_frontend_states()