From 355b73c174f0964a3e490bbf711d558e073f5599 Mon Sep 17 00:00:00 2001 From: Joakim Bjerknes Date: Mon, 22 Jan 2024 14:02:55 +0100 Subject: [PATCH 1/2] replace all instances of postal code with postcode --- .../forms/feature-fields/PostalCodeAndCity.mdx | 2 +- .../feature-fields/PostalCodeAndCity/info.mdx | 6 +++--- .../PostalCodeAndCity/properties.mdx | 14 +++++++------- packages/dnb-eufemia/src/shared/locales/en-GB.js | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity.mdx index 4b55c1f350f..90d1599d6c0 100644 --- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity.mdx +++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity.mdx @@ -1,6 +1,6 @@ --- title: 'PostalCodeAndCity' -description: '`Field.PostalCodeAndCity` is a wrapper component for input of two separate values with user experience tailored for postal code and city values.' +description: '`Field.PostalCodeAndCity` is a wrapper component for input of two separate values with user experience tailored for postcode and city values.' showTabs: true theme: 'sbanken' tabs: diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/info.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/info.mdx index 35b4856f0c4..41144773c62 100644 --- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/info.mdx +++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/info.mdx @@ -4,10 +4,10 @@ showTabs: true ## Description -`Field.PostalCodeAndCity` is a wrapper component for input of two separate [input of strings](/uilib/extensions/forms/base-fields/String) with user experience tailored for postal code and city values. +`Field.PostalCodeAndCity` is a wrapper component for input of two separate [input of strings](/uilib/extensions/forms/base-fields/String) with user experience tailored for postcode and city values. -These fields is meant for Norwegian postal codes and cities. The postal code input takes a 4-digit string as values, since its meant for norwegian postal codes. A norwegian postal code can have a leading zero, which is why the value is a string and not a number. -More info about postal codes can be found at [Posten](https://www.bring.no/tjenester/adressetjenester/postnummer). +These fields is meant for Norwegian postcodes and cities. The postcode input takes a 4-digit string as values, since its meant for norwegian postcodes. A norwegian postcode can have a leading zero, which is why the value is a string and not a number. +More info about postcodes can be found at [Posten](https://www.bring.no/tjenester/adressetjenester/postnummer). ```jsx import { Field } from '@dnb/eufemia/extensions/forms' diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/properties.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/properties.mdx index c060f9f4f03..09e14392cdc 100644 --- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/properties.mdx +++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/properties.mdx @@ -4,10 +4,10 @@ showTabs: true ## Properties -| Property | Type | Description | -| ---------------------------------------------------------------------------------- | -------- | ---------------------------------------------------------------------------------------------------------------------- | -| `help` | `object` | _(optional)_ Provide a help button. Object consisting of `title` and `content`. | -| `postalCode` | `object` | _(required)_ Properties for the [Field.String](/uilib/extensions/forms/base-fields/String/) component for postal code. | -| `city` | `object` | _(required)_ Properties for the [Field.String](/uilib/extensions/forms/base-fields/String/) component for city. | -| [Space](/uilib/layout/space/properties) | Various | _(optional)_ Spacing properties like `top` or `bottom` are supported. | -| [FieldBlockProps](/uilib/extensions/forms/create-component/FieldBlock/properties/) | Various | _(optional)_ `FieldBlockProps` properties. | +| Property | Type | Description | +| ---------------------------------------------------------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------- | +| `help` | `object` | _(optional)_ Provide a help button. Object consisting of `title` and `contents`. | +| `postalCode` | `object` | _(required)_ Properties for the [Field.String](/uilib/extensions/forms/base-fields/String/) component for postcode. | +| `city` | `object` | _(required)_ Properties for the [Field.String](/uilib/extensions/forms/base-fields/String/) component for city. | +| [Space](/uilib/layout/space/properties) | Various | _(optional)_ Spacing properties like `top` or `bottom` are supported. | +| [FieldBlockProps](/uilib/extensions/forms/create-component/FieldBlock/properties/) | Various | _(optional)_ `FieldBlockProps` properties. | diff --git a/packages/dnb-eufemia/src/shared/locales/en-GB.js b/packages/dnb-eufemia/src/shared/locales/en-GB.js index 3bd109da2bb..2f2dd8998fb 100644 --- a/packages/dnb-eufemia/src/shared/locales/en-GB.js +++ b/packages/dnb-eufemia/src/shared/locales/en-GB.js @@ -210,8 +210,8 @@ export default { phoneNumberLabel: 'Mobile number', phoneNumberErrorRequired: 'You must enter a valid number', postalCodeLabel: 'Postalc.', - postalCodeErrorRequired: 'You must enter a postal code', - postalCodeErrorPattern: 'This is not a valid postal code', + postalCodeErrorRequired: 'You must enter a postcode', + postalCodeErrorPattern: 'This is not a valid postcode', cityLabel: 'City', cityErrorRequired: 'You must enter a city', selectCountryLabel: 'Country', From 2b85df47d3370353b97af1acf0591fa859c6918b Mon Sep 17 00:00:00 2001 From: Joakim Bjerknes Date: Mon, 22 Jan 2024 14:08:45 +0100 Subject: [PATCH 2/2] merge error fix --- .../forms/feature-fields/PostalCodeAndCity/properties.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/properties.mdx b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/properties.mdx index 09e14392cdc..88378d24156 100644 --- a/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/properties.mdx +++ b/packages/dnb-design-system-portal/src/docs/uilib/extensions/forms/feature-fields/PostalCodeAndCity/properties.mdx @@ -6,7 +6,7 @@ showTabs: true | Property | Type | Description | | ---------------------------------------------------------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------- | -| `help` | `object` | _(optional)_ Provide a help button. Object consisting of `title` and `contents`. | +| `help` | `object` | _(optional)_ Provide a help button. Object consisting of `title` and `content`. | | `postalCode` | `object` | _(required)_ Properties for the [Field.String](/uilib/extensions/forms/base-fields/String/) component for postcode. | | `city` | `object` | _(required)_ Properties for the [Field.String](/uilib/extensions/forms/base-fields/String/) component for city. | | [Space](/uilib/layout/space/properties) | Various | _(optional)_ Spacing properties like `top` or `bottom` are supported. |