From 55bce9244ee663c66047c8429bf1c2903b015a22 Mon Sep 17 00:00:00 2001 From: Michael Bromley Date: Tue, 19 Dec 2023 16:07:59 +0100 Subject: [PATCH 1/6] chore(admin-ui): Tweak positioning of version label --- .../lib/core/src/components/app-shell/app-shell.component.html | 2 +- .../lib/core/src/components/app-shell/app-shell.component.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/admin-ui/src/lib/core/src/components/app-shell/app-shell.component.html b/packages/admin-ui/src/lib/core/src/components/app-shell/app-shell.component.html index 5e7d8e8746..0da8d9d8f7 100644 --- a/packages/admin-ui/src/lib/core/src/components/app-shell/app-shell.component.html +++ b/packages/admin-ui/src/lib/core/src/components/app-shell/app-shell.component.html @@ -20,7 +20,7 @@
-
+
v{{ version }}
diff --git a/packages/admin-ui/src/lib/core/src/components/app-shell/app-shell.component.scss b/packages/admin-ui/src/lib/core/src/components/app-shell/app-shell.component.scss index ed25bad2a7..6215d23d71 100644 --- a/packages/admin-ui/src/lib/core/src/components/app-shell/app-shell.component.scss +++ b/packages/admin-ui/src/lib/core/src/components/app-shell/app-shell.component.scss @@ -76,7 +76,7 @@ } .settings-nav-container { - margin: calc(var(--space-unit) * 3) 0; + margin: calc(var(--space-unit) * 3) 0 -10px 0; hr { margin: 0 calc(var(--space-unit) * 4); margin-bottom: calc(var(--space-unit) * 4); From bbc391a3490c3d35a21a89fc701917cce3a11083 Mon Sep 17 00:00:00 2001 From: Bruno de Souza Lobo Almeida Date: Mon, 8 Jan 2024 12:31:53 -0300 Subject: [PATCH 2/6] fix(server): Fix pt_br error message translation (#2610) --- packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json b/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json index fbfe91d8af..41a05cd2cc 100644 --- a/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json +++ b/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json @@ -477,7 +477,7 @@ }, "error": { "403-forbidden": "No momento, você não está autorizado a acessar \"{ path }\". Você não tem permissão ou sua sessão expirou.", - "could-not-connect-to-server": "Não foi possível ao servidor Mercado NetBrit no link { url }", + "could-not-connect-to-server": "Não foi possível ao servidor Vendure no link { url }", "facet-value-form-values-do-not-match": "O número de valores no formulário de etiqueta não corresponde ao número real de valores", "health-check-failed": "Falha na verificação de integridade do sistema", "no-default-shipping-zone-set": "Este canal não possui zona de entrega padrão. Isso pode causar erros ao calcular as despesas de envio do pedido.", From 6d5529ac1ef15d8e762e73a84652c1f2e73ec74c Mon Sep 17 00:00:00 2001 From: greyhere <57859708+greyhere@users.noreply.github.com> Date: Mon, 8 Jan 2024 21:05:53 +0530 Subject: [PATCH 3/6] docs: Improve clarity (#2604) --- docs/docs/guides/developer-guide/the-service-layer/index.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docs/guides/developer-guide/the-service-layer/index.mdx b/docs/docs/guides/developer-guide/the-service-layer/index.mdx index 2166d16bbe..f1c3374a33 100644 --- a/docs/docs/guides/developer-guide/the-service-layer/index.mdx +++ b/docs/docs/guides/developer-guide/the-service-layer/index.mdx @@ -184,7 +184,7 @@ Further examples can be found in the [TypeORM Find Options documentation](https: ### The QueryBuilder API When the Find API is not sufficient, the QueryBuilder API can be used to construct more complex queries. For instance, -if you want to have a more complex `WHERE` clause than can be achieved with the Find API, or if you want to perform +if you want to have a more complex `WHERE` clause than what can be achieved with the Find API, or if you want to perform sub-queries, then the QueryBuilder API is the way to go. Here are some examples of using the QueryBuilder API: From b99dfbc29bb87daa359b22d38a3f1e9f93adfc26 Mon Sep 17 00:00:00 2001 From: Chris <134155599+chrislaai@users.noreply.github.com> Date: Mon, 8 Jan 2024 23:38:06 +0800 Subject: [PATCH 4/6] fix(create): Add a slash at the end of assetUrl to avoid being ignored (#2605) --- packages/create/templates/vendure-config.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/create/templates/vendure-config.hbs b/packages/create/templates/vendure-config.hbs index ea89d818d6..0ba38b8204 100644 --- a/packages/create/templates/vendure-config.hbs +++ b/packages/create/templates/vendure-config.hbs @@ -76,7 +76,7 @@ export const config: VendureConfig = { // For local dev, the correct value for assetUrlPrefix should // be guessed correctly, but for production it will usually need // to be set manually to match your production url. - assetUrlPrefix: IS_DEV ? undefined : 'https://www.my-shop.com/assets', + assetUrlPrefix: IS_DEV ? undefined : 'https://www.my-shop.com/assets/', }), DefaultJobQueuePlugin.init({ useDatabaseForBuffer: true }), DefaultSearchPlugin.init({ bufferUpdates: false, indexStockStatus: true }), From 4e57ef50a092e2dc8f910c6d687debf7fc4d0c64 Mon Sep 17 00:00:00 2001 From: Chris <134155599+chrislaai@users.noreply.github.com> Date: Mon, 8 Jan 2024 23:39:32 +0800 Subject: [PATCH 5/6] docs(elasticsearch-plugin): Add missing line break in docs (#2606) --- packages/elasticsearch-plugin/src/plugin.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/elasticsearch-plugin/src/plugin.ts b/packages/elasticsearch-plugin/src/plugin.ts index d3e4bedc4b..20148d647c 100644 --- a/packages/elasticsearch-plugin/src/plugin.ts +++ b/packages/elasticsearch-plugin/src/plugin.ts @@ -66,7 +66,8 @@ function getCustomResolvers(options: ElasticsearchRuntimeOptions) { * * **Requires Elasticsearch v7.0 < required Elasticsearch version < 7.10 ** * Elasticsearch version 7.10.2 will throw error due to incompatibility with elasticsearch-js client. - * [Check here for more info](https://github.com/elastic/elasticsearch-js/issues/1519) + * [Check here for more info](https://github.com/elastic/elasticsearch-js/issues/1519). + * * `yarn add \@elastic/elasticsearch \@vendure/elasticsearch-plugin` * * or From f5ecd9a1f5ddbddda60eb1e8e942508400440045 Mon Sep 17 00:00:00 2001 From: Marensius Bae Pettersen Date: Mon, 8 Jan 2024 16:45:36 +0100 Subject: [PATCH 6/6] docs: Added clarification for testing i18n changes (#2612) Co-authored-by: Marensius Bae Pettersen --- packages/admin-ui/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/admin-ui/README.md b/packages/admin-ui/README.md index 7f8f2946e1..915eea2046 100644 --- a/packages/admin-ui/README.md +++ b/packages/admin-ui/README.md @@ -46,4 +46,5 @@ This report data is also saved to the [i18n-coverage.json](./i18n-coverage.json) To add support for a new language, create a new empty json file (`{}`) in the `i18n-messages` directory named `.json`, where `languageCode` is one of the supported codes as given in the [LanguageCode enum type](../core/src/api/schema/common/language-code.graphql), then run `yarn extract-translations` +To verify localization changes add `.json` to `./src/lib/static/vendure-ui-config.json` in the array `availableLanguages`. This will make the localization available in Admin UI development mode using `yarn start`