Merge branch 'v4.1.8' into v4.2.0-forms

# Conflicts:
#	src/fields/templates/_components/fields/Phone/settings.twig

src/fields/templates/_components/fields/Phone/settings.twig

@@ -2,31 +2,31 @@
 
 {{ forms.selectField({
     name: 'country',
-    instructions: "This country will display as selected when the field loads for the first time."|t('sprout-module-forms'),
-    label: 'Default Country'|t('sprout-module-forms'),
-    options: countryOptions,
+    instructions: "This country will display as selected when the field loads for the first time."|t('sprout-module-fields'),
+    label: 'Default Country'|t('sprout-module-fields'),
+    options: options,
     value: field.country
 }) }}
 
 {{ forms.lightswitchField({
-    label: "Limit to single country"|t('sprout-module-forms'),
-    instructions: "Only accept numbers from your Default Country"|t('sprout-module-forms'),
+    label: "Limit to single country"|t('sprout-module-fields'),
+    instructions: "Only accept numbers from your Default Country"|t('sprout-module-fields'),
     name: 'limitToSingleCountry',
     on: field.limitToSingleCountry
 }) }}
 
 {{ forms.textField({
-    label: "Placeholder Text"|t('sprout-module-forms'),
-    instructions: "The text that will be shown if the field doesn’t have a value."|t('sprout-module-forms'),
+    label: "Placeholder Text"|t('sprout-module-fields'),
+    instructions: "The text that will be shown if the field doesn’t have a value."|t('sprout-module-fields'),
     id: 'placeholder',
     name: 'placeholder',
     value: field.placeholder
 }) }}
 
 {{ forms.textField({
-    label: 'Error Message'|t('sprout-module-forms'),
-    instructions: 'Display this error message when a phone number is invalid.'|t('sprout-module-forms'),
+    label: 'Error Message'|t('sprout-module-fields'),
+    instructions: 'Display this error message when a phone number is invalid.'|t('sprout-module-fields'),
     name: 'customPatternErrorMessage',
-    placeholder: 'Phone number must match the format: ##########'|t('sprout-module-forms'),
+    placeholder: 'Phone number must match the format: ##########'|t('sprout-module-fields'),
     value: field.customPatternErrorMessage
 }) }}