From 60be39ed886bf50b73077fbe1d8b4dbef4d7ebf4 Mon Sep 17 00:00:00 2001 From: Daniel Gent Date: Mon, 23 Aug 2021 19:17:01 +0200 Subject: [PATCH 1/6] Remove es locale. --- framework/shopify/api/operations/get-all-pages.ts | 2 +- next.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/framework/shopify/api/operations/get-all-pages.ts b/framework/shopify/api/operations/get-all-pages.ts index 58bc6a94b..c5c26fb9a 100644 --- a/framework/shopify/api/operations/get-all-pages.ts +++ b/framework/shopify/api/operations/get-all-pages.ts @@ -38,7 +38,7 @@ export default function getAllPagesOperation({ preview?: boolean query?: string } = {}): Promise { - const { fetch, locale, locales = ['en-US', 'es'] } = commerce.getConfig( + const { fetch, locale, locales = ['en-US'] } = commerce.getConfig( config ) diff --git a/next.config.js b/next.config.js index 515b2ae7c..721fe46e4 100644 --- a/next.config.js +++ b/next.config.js @@ -14,7 +14,7 @@ const isVendure = provider === 'vendure' module.exports = withCommerceConfig({ commerce, i18n: { - locales: ['en-US', 'es'], + locales: ['en-US'], defaultLocale: 'en-US', }, rewrites() { From 362cf9dd03d4c14f828a68070488908d1a624aad Mon Sep 17 00:00:00 2001 From: Daniel Gent Date: Mon, 23 Aug 2021 19:37:46 +0200 Subject: [PATCH 2/6] Add Swedish locale. --- components/common/I18nWidget/I18nWidget.tsx | 8 ++++---- next.config.js | 2 +- public/flag-se.svg | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 public/flag-se.svg diff --git a/components/common/I18nWidget/I18nWidget.tsx b/components/common/I18nWidget/I18nWidget.tsx index 58135f12a..c5155b74d 100644 --- a/components/common/I18nWidget/I18nWidget.tsx +++ b/components/common/I18nWidget/I18nWidget.tsx @@ -14,11 +14,11 @@ interface LOCALE_DATA { } const LOCALES_MAP: Record = { - es: { - name: 'Español', + se: { + name: 'Swedish', img: { - filename: 'flag-es-co.svg', - alt: 'Bandera Colombiana', + filename: 'flag-se.svg', + alt: 'svensk flagga', }, }, 'en-US': { diff --git a/next.config.js b/next.config.js index 721fe46e4..1d8c2e363 100644 --- a/next.config.js +++ b/next.config.js @@ -14,7 +14,7 @@ const isVendure = provider === 'vendure' module.exports = withCommerceConfig({ commerce, i18n: { - locales: ['en-US'], + locales: ['en-US', 'se'], defaultLocale: 'en-US', }, rewrites() { diff --git a/public/flag-se.svg b/public/flag-se.svg new file mode 100644 index 000000000..521049b4d --- /dev/null +++ b/public/flag-se.svg @@ -0,0 +1,5 @@ + + + + + From 3ffa06a384eee5db926a04bc816e927b59e9ab07 Mon Sep 17 00:00:00 2001 From: Daniel Gent Date: Mon, 23 Aug 2021 19:43:31 +0200 Subject: [PATCH 3/6] Use flag inside circle. --- public/flag-es-ar.svg | 20 -------------------- public/flag-es-co.svg | 10 ---------- public/flag-es.svg | 1 - public/flag-se.svg | 22 ++++++++++++++++++---- 4 files changed, 18 insertions(+), 35 deletions(-) delete mode 100644 public/flag-es-ar.svg delete mode 100644 public/flag-es-co.svg delete mode 100644 public/flag-es.svg diff --git a/public/flag-es-ar.svg b/public/flag-es-ar.svg deleted file mode 100644 index 4d6ffc474..000000000 --- a/public/flag-es-ar.svg +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/public/flag-es-co.svg b/public/flag-es-co.svg deleted file mode 100644 index 618820393..000000000 --- a/public/flag-es-co.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/public/flag-es.svg b/public/flag-es.svg deleted file mode 100644 index 5e8e8f08f..000000000 --- a/public/flag-es.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/public/flag-se.svg b/public/flag-se.svg index 521049b4d..256105d7a 100644 --- a/public/flag-se.svg +++ b/public/flag-se.svg @@ -1,5 +1,19 @@ - - - - + + + + + + + + + + + + + + From fbf6e4af9526c5fe297ad6172a0e6c08dd9fc051 Mon Sep 17 00:00:00 2001 From: Daniel Gent Date: Mon, 23 Aug 2021 19:45:21 +0200 Subject: [PATCH 4/6] Use Swedish. --- components/common/I18nWidget/I18nWidget.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/common/I18nWidget/I18nWidget.tsx b/components/common/I18nWidget/I18nWidget.tsx index c5155b74d..90f505dc0 100644 --- a/components/common/I18nWidget/I18nWidget.tsx +++ b/components/common/I18nWidget/I18nWidget.tsx @@ -15,7 +15,7 @@ interface LOCALE_DATA { const LOCALES_MAP: Record = { se: { - name: 'Swedish', + name: 'Svenska', img: { filename: 'flag-se.svg', alt: 'svensk flagga', From bdfd0cfc31fe2c08b4343535b94352970654e5ba Mon Sep 17 00:00:00 2001 From: Daniel Gent Date: Mon, 23 Aug 2021 20:20:02 +0200 Subject: [PATCH 5/6] Add Danish. --- components/common/I18nWidget/I18nWidget.tsx | 7 +++++++ next.config.js | 2 +- public/flag-dk.png | Bin 0 -> 7100 bytes 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 public/flag-dk.png diff --git a/components/common/I18nWidget/I18nWidget.tsx b/components/common/I18nWidget/I18nWidget.tsx index 90f505dc0..5d3fca744 100644 --- a/components/common/I18nWidget/I18nWidget.tsx +++ b/components/common/I18nWidget/I18nWidget.tsx @@ -14,6 +14,13 @@ interface LOCALE_DATA { } const LOCALES_MAP: Record = { + dk: { + name: 'Dansk', + img: { + filename: 'flag-dk.png', + alt: 'dansk flag', + }, + }, se: { name: 'Svenska', img: { diff --git a/next.config.js b/next.config.js index 1d8c2e363..23aa270a4 100644 --- a/next.config.js +++ b/next.config.js @@ -14,7 +14,7 @@ const isVendure = provider === 'vendure' module.exports = withCommerceConfig({ commerce, i18n: { - locales: ['en-US', 'se'], + locales: ['en-US', 'se', 'dk'], defaultLocale: 'en-US', }, rewrites() { diff --git a/public/flag-dk.png b/public/flag-dk.png new file mode 100644 index 0000000000000000000000000000000000000000..e711f41d0a4500677436927938219f0bccf10ab5 GIT binary patch literal 7100 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 Xi(I0_Cr)AC%7GAOHdpFRvG@K5Zsnt| literal 0 HcmV?d00001 From 9c721d27a0a1fc68f248b9626cdc885882c473de Mon Sep 17 00:00:00 2001 From: Daniel Gent Date: Tue, 24 Aug 2021 14:58:13 +0200 Subject: [PATCH 6/6] Use locales not country codes. --- components/common/I18nWidget/I18nWidget.tsx | 4 ++-- next.config.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/common/I18nWidget/I18nWidget.tsx b/components/common/I18nWidget/I18nWidget.tsx index 5d3fca744..e53a06fc5 100644 --- a/components/common/I18nWidget/I18nWidget.tsx +++ b/components/common/I18nWidget/I18nWidget.tsx @@ -14,14 +14,14 @@ interface LOCALE_DATA { } const LOCALES_MAP: Record = { - dk: { + da: { name: 'Dansk', img: { filename: 'flag-dk.png', alt: 'dansk flag', }, }, - se: { + sv: { name: 'Svenska', img: { filename: 'flag-se.svg', diff --git a/next.config.js b/next.config.js index 23aa270a4..c37781e47 100644 --- a/next.config.js +++ b/next.config.js @@ -14,7 +14,7 @@ const isVendure = provider === 'vendure' module.exports = withCommerceConfig({ commerce, i18n: { - locales: ['en-US', 'se', 'dk'], + locales: ['en-US', 'sv', 'da'], defaultLocale: 'en-US', }, rewrites() {