Merge branch 'master' into minor

vendure-ecommerce · Jan 8, 2024 · ba12cdb · ba12cdb
2 parents 415bc97 + f5ecd9a
commit ba12cdb
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 6 deletions.
diff --git 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:

diff --git 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 `<languageCode>.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 `<languageCode>.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`
 
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
@@ -20,7 +20,7 @@
             <hr />
             <vdr-main-nav displayMode="settings" (itemClick)="collapseNav()"></vdr-main-nav>
         </div>
-        <div class="mx-2 flex center mb-2">
+        <div class="mx-2 flex center mb-1" [class.mt-2]="hideVersion && !devMode">
             <div *ngIf="!hideVersion" class="version">
                 v{{ version }}
             </div>

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
@@ -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);

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
@@ -477,7 +477,8 @@
   },
   "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.",
     "no-default-tax-zone-set": "Este canal não possui zona de imposto padrão, o que causará erros no cálculo de preços. Por favor, crie ou selecione uma zona."

diff --git 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 }),

diff --git 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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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 `<languageCode>.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 `<languageCode>.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`