Merge branch 'master' into next

docs/content/docs/developer-guide/customizing-models.md

@@ -13,19 +13,19 @@ They are specified in the VendureConfig:
 const config = {
     // ...
     dbConnectionOptions: {
-         // ...
-         synchronize: true,  
+        // ...
+        synchronize: true,  
     },
     customFields: {
         Product: [
-                { name: 'infoUrl', type: 'string' },
-                { name: 'downloadable', type: 'boolean' },
-                { name: 'shortName', type: 'localeString' },
-            ],
-            User: [
-                { name: 'socialLoginToken', type: 'string' },
-            ],
-        },
+            { name: 'infoUrl', type: 'string' },
+            { name: 'downloadable', type: 'boolean' },
+            { name: 'shortName', type: 'localeString' },
+        ],
+        User: [
+            { name: 'socialLoginToken', type: 'string' },
+        ],
+    },
 }
 ```
 

docs/layouts/index.en.html

@@ -133,7 +133,7 @@
                 <div class="feature-copy">
                     <h3>Works with your favourite tech</h3>
                     <p class="lead">
-                        With Vendure you <strong>free to choose</strong> the front-end technology you know best.
+                        With Vendure you are <strong>free to choose</strong> the front-end technology you know best.
                     </p>
                     <p class="lead">
                         You and your team have expertise. Use it to <strong>rapidly</strong> build the storefront your clients have dreamed of.

packages/admin-ui/i18n-coverage.json

@@ -1,45 +1,45 @@
 {
-  "generatedOn": "2020-10-26T14:24:59.367Z",
-  "lastCommit": "861a7bde2a8182785c0ab5e723ec642587ef018e",
+  "generatedOn": "2020-11-02T18:52:26.628Z",
+  "lastCommit": "345bcbf915abe30eb390ceaa02ce5fdedd1a0ff6",
   "translationStatus": {
     "cs": {
-      "tokenCount": 672,
-      "translatedCount": 662,
-      "percentage": 99
+      "tokenCount": 676,
+      "translatedCount": 674,
+      "percentage": 100
     },
     "de": {
-      "tokenCount": 672,
-      "translatedCount": 598,
+      "tokenCount": 676,
+      "translatedCount": 601,
       "percentage": 89
     },
     "en": {
-      "tokenCount": 672,
-      "translatedCount": 671,
-      "percentage": 100
+      "tokenCount": 676,
+      "translatedCount": 672,
+      "percentage": 99
     },
     "es": {
-      "tokenCount": 672,
-      "translatedCount": 455,
-      "percentage": 68
+      "tokenCount": 676,
+      "translatedCount": 466,
+      "percentage": 69
     },
     "pl": {
-      "tokenCount": 672,
-      "translatedCount": 553,
+      "tokenCount": 676,
+      "translatedCount": 556,
       "percentage": 82
     },
     "pt_BR": {
-      "tokenCount": 672,
-      "translatedCount": 644,
+      "tokenCount": 676,
+      "translatedCount": 647,
       "percentage": 96
     },
     "zh_Hans": {
-      "tokenCount": 672,
-      "translatedCount": 537,
+      "tokenCount": 676,
+      "translatedCount": 540,
       "percentage": 80
     },
     "zh_Hant": {
-      "tokenCount": 672,
-      "translatedCount": 537,
+      "tokenCount": 676,
+      "translatedCount": 540,
       "percentage": 80
     }
   }

packages/admin-ui/src/lib/core/src/public_api.ts

@@ -175,7 +175,7 @@ export * from './shared/pipes/custom-field-label.pipe';
 export * from './shared/pipes/duration.pipe';
 export * from './shared/pipes/file-size.pipe';
 export * from './shared/pipes/has-permission.pipe';
-export * from './shared/pipes/order-state-i18n-token.pipe';
+export * from './shared/pipes/state-i18n-token.pipe';
 export * from './shared/pipes/sentence-case.pipe';
 export * from './shared/pipes/sort.pipe';
 export * from './shared/pipes/string-to-color.pipe';

packages/admin-ui/src/lib/core/src/shared/components/order-state-label/order-state-label.component.html

@@ -2,6 +2,6 @@
     <clr-icon shape="success-standard" *ngIf="state === 'Delivered'" size="12"></clr-icon>
     <clr-icon shape="success-standard" *ngIf="state === 'PartiallyDelivered'" size="12"></clr-icon>
     <clr-icon shape="ban" *ngIf="state === 'Cancelled'" size="12"></clr-icon>
-    {{ state | orderStateI18nToken | translate }}
+    {{ state | stateI18nToken | translate }}
     <ng-content></ng-content>
 </vdr-chip>

packages/admin-ui/src/lib/core/src/shared/pipes/order-state-i18n-token.pipe.ts

@@ -1,33 +0,0 @@
-import { Pipe, PipeTransform } from '@angular/core';
-import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
-
-@Pipe({
-    name: 'orderStateI18nToken',
-})
-export class OrderStateI18nTokenPipe implements PipeTransform {
-    private readonly stateI18nTokens = {
-        AddingItems: _('order.state-adding-items'),
-        ArrangingPayment: _('order.state-arranging-payment'),
-        PaymentAuthorized: _('order.state-payment-authorized'),
-        PaymentSettled: _('order.state-payment-settled'),
-        PartiallyShipped: _('order.state-partially-shipped'),
-        Shipped: _('order.state-shipped'),
-        PartiallyDelivered: _('order.state-partially-delivered'),
-        Delivered: _('order.state-delivered'),
-        Cancelled: _('order.state-cancelled'),
-    };
-    transform<T extends unknown>(value: T): T {
-        if (typeof value === 'string') {
-            const defaultStateToken = this.stateI18nTokens[value as any];
-            if (defaultStateToken) {
-                return defaultStateToken;
-            }
-            return ('order.state-' +
-                value
-                    .replace(/([a-z])([A-Z])/g, '$1-$2')
-                    .replace(/ +/g, '-')
-                    .toLowerCase()) as any;
-        }
-        return value;
-    }
-}

packages/admin-ui/src/lib/core/src/shared/pipes/order-state-i18n-token.pipe.spec.ts → packages/admin-ui/src/lib/core/src/shared/pipes/state-i18n-token.pipe.spec.ts

@@ -1,29 +1,29 @@
-import { OrderStateI18nTokenPipe } from './order-state-i18n-token.pipe';
+import { StateI18nTokenPipe } from './state-i18n-token.pipe';
 
-describe('orderStateI18nTokenPipe', () => {
-    const pipe = new OrderStateI18nTokenPipe();
+describe('StateI18nTokenPipe', () => {
+    const pipe = new StateI18nTokenPipe();
 
     it('works with default states', () => {
         const result = pipe.transform('AddingItems');
 
-        expect(result).toBe('order.state-adding-items');
+        expect(result).toBe('state.adding-items');
     });
 
     it('works with unknown states', () => {
         const result = pipe.transform('ValidatingCustomer');
 
-        expect(result).toBe('order.state-validating-customer');
+        expect(result).toBe('state.validating-customer');
     });
 
     it('works with unknown states with various formatting', () => {
         const result1 = pipe.transform('validating-Customer');
-        expect(result1).toBe('order.state-validating-customer');
+        expect(result1).toBe('state.validating-customer');
 
         const result2 = pipe.transform('validating-Customer');
-        expect(result2).toBe('order.state-validating-customer');
+        expect(result2).toBe('state.validating-customer');
 
         const result3 = pipe.transform('Validating Customer');
-        expect(result3).toBe('order.state-validating-customer');
+        expect(result3).toBe('state.validating-customer');
     });
 
     it('passes through non-string values', () => {

packages/admin-ui/src/lib/core/src/shared/pipes/state-i18n-token.pipe.ts

@@ -0,0 +1,36 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+
+@Pipe({
+    name: 'stateI18nToken',
+})
+export class StateI18nTokenPipe implements PipeTransform {
+    private readonly stateI18nTokens = {
+        AddingItems: _('state.adding-items'),
+        ArrangingPayment: _('state.arranging-payment'),
+        PaymentAuthorized: _('state.payment-authorized'),
+        PaymentSettled: _('state.payment-settled'),
+        PartiallyShipped: _('state.partially-shipped'),
+        Shipped: _('state.shipped'),
+        PartiallyDelivered: _('state.partially-delivered'),
+        Delivered: _('state.delivered'),
+        Cancelled: _('state.cancelled'),
+        Pending: _('state.pending'),
+        Settled: _('state.settled'),
+        Failed: _('state.failed'),
+    };
+    transform<T extends unknown>(value: T): T {
+        if (typeof value === 'string') {
+            const defaultStateToken = this.stateI18nTokens[value as any];
+            if (defaultStateToken) {
+                return defaultStateToken;
+            }
+            return ('state.' +
+                value
+                    .replace(/([a-z])([A-Z])/g, '$1-$2')
+                    .replace(/ +/g, '-')
+                    .toLowerCase()) as any;
+        }
+        return value;
+    }
+}

packages/admin-ui/src/lib/core/src/shared/shared.module.ts

@@ -95,9 +95,9 @@ import { CustomFieldLabelPipe } from './pipes/custom-field-label.pipe';
 import { DurationPipe } from './pipes/duration.pipe';
 import { FileSizePipe } from './pipes/file-size.pipe';
 import { HasPermissionPipe } from './pipes/has-permission.pipe';
-import { OrderStateI18nTokenPipe } from './pipes/order-state-i18n-token.pipe';
 import { SentenceCasePipe } from './pipes/sentence-case.pipe';
 import { SortPipe } from './pipes/sort.pipe';
+import { StateI18nTokenPipe } from './pipes/state-i18n-token.pipe';
 import { StringToColorPipe } from './pipes/string-to-color.pipe';
 import { TimeAgoPipe } from './pipes/time-ago.pipe';
 import { CanDeactivateDetailGuard } from './providers/routing/can-deactivate-detail-guard';
@@ -187,7 +187,7 @@ const DECLARATIONS = [
     HistoryEntryDetailComponent,
     EditNoteDialogComponent,
     ProductSelectorFormInputComponent,
-    OrderStateI18nTokenPipe,
+    StateI18nTokenPipe,
     ProductSelectorComponent,
     HelpTooltipComponent,
     CustomerGroupFormInputComponent,

packages/admin-ui/src/lib/order/src/components/fulfillment-card/fulfillment-card.component.html

@@ -15,7 +15,7 @@
     <div class="card-footer">
         <ng-container *ngIf="nextSuggestedState() as suggestedState">
             <button class="btn btn-sm btn-primary" (click)="transitionState.emit(suggestedState)">
-                {{ 'order.set-fulfillment-state' | translate: { state: suggestedState } }}
+                {{ 'order.set-fulfillment-state' | translate: { state: (suggestedState | stateI18nToken | translate) } }}
             </button>
         </ng-container>
         <vdr-dropdown>
@@ -32,7 +32,7 @@
                     >
                         <ng-container *ngIf="nextState !== 'Cancelled'; else cancel">
                             <clr-icon shape="step-forward-2"></clr-icon>
-                            {{ 'order.transition-to-state' | translate: { state: nextState } }}
+                            {{ 'order.transition-to-state' | translate: { state: (nextState | stateI18nToken | translate) } }}
                         </ng-container>
                         <ng-template #cancel>
                             <clr-icon shape="error-standard" class="is-error"></clr-icon>

packages/admin-ui/src/lib/order/src/components/fulfillment-state-label/fulfillment-state-label.component.html

@@ -1,4 +1,4 @@
 <vdr-chip [title]="'order.payment-state' | translate" [colorType]="chipColorType">
     <clr-icon shape="check-circle" *ngIf="state === 'Delivered'"></clr-icon>
-    {{ state }}
+    {{ state | stateI18nToken | translate }}
 </vdr-chip>

packages/admin-ui/src/lib/order/src/components/order-detail/order-detail.component.html

@@ -49,7 +49,7 @@
                     <div class="dropdown-divider"></div>
                     <button type="button" class="btn" vdrDropdownItem (click)="transitionToState(nextState)">
                         <clr-icon shape="step-forward-2"></clr-icon>
-                        {{ 'order.transition-to-state' | translate: { state: nextState } }}
+                        {{ 'order.transition-to-state' | translate: { state: (nextState | stateI18nToken | translate) } }}
                     </button>
                 </ng-container>
             </vdr-dropdown-menu>

packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.html

@@ -2,9 +2,9 @@
     <vdr-ab-left>
         <div class="search-form">
             <select clrSelect name="state" [formControl]="stateFilter">
-                <option value="all">{{ 'order.state-all-orders' | translate }}</option>
+                <option value="all">{{ 'state.all-orders' | translate }}</option>
                 <option *ngFor="let orderState of orderStates" [value]="orderState">
-                    {{ orderState | orderStateI18nToken | translate }}
+                    {{ orderState | stateI18nToken | translate }}
                 </option>
             </select>
             <input

packages/admin-ui/src/lib/order/src/components/order-process-graph/order-process-node.component.html

@@ -3,14 +3,14 @@
         class="node"
         [class.active-target]="activeTarget$ | async"
     >
-        {{ node.name | orderStateI18nToken | translate }}
+        {{ node.name | stateI18nToken | translate }}
     </div>
     <div class="cancelled-wrapper" *ngIf="isCancellable">
         <div class="cancelled-edge">
         </div>
         <clr-icon shape="dot-circle"></clr-icon>
         <div class="cancelled-node">
-            {{ cancelledState | orderStateI18nToken | translate }}
+            {{ cancelledState | stateI18nToken | translate }}
         </div>
     </div>
 </div>

packages/admin-ui/src/lib/order/src/components/payment-state-label/payment-state-label.component.html

@@ -1,4 +1,4 @@
 <vdr-chip [title]="'order.payment-state' | translate" [colorType]="chipColorType">
     <clr-icon shape="check-circle" *ngIf="state === 'Settled'"></clr-icon>
-    {{ state }}
+    {{ state | stateI18nToken | translate }}
 </vdr-chip>

packages/admin-ui/src/lib/order/src/components/refund-state-label/refund-state-label.component.html

@@ -1,4 +1,4 @@
 <vdr-chip [title]="'order.payment-state' | translate" [colorType]="chipColorType">
     <clr-icon shape="check-circle" *ngIf="state === 'Settled'"></clr-icon>
-    {{ state }}
+    {{ state | stateI18nToken | translate }}
 </vdr-chip>

packages/admin-ui/src/lib/static/i18n-messages/cs.json

@@ -599,32 +599,22 @@
     "return-to-stock": "Vrátit do skladu",
     "search-by-order-code": "Hledat na základě kódu objednávky",
     "set-fulfillment-state": "Označit jako {state}",
-    "settle-payment": "Vyřízení platby",
+    "settle-payment": "Vypořádání platby",
     "settle-payment-error": "Nelze vyřídit platbu",
     "settle-payment-success": "Platba úspěšně vypořádana",
-    "settle-refund": "Vyřízení refundace",
-    "settle-refund-manual-instructions": "Po manuálním vyřízení refundace ({method}), zadejte ID transakce.",
+    "settle-refund": "Vypořádání refundace",
+    "settle-refund-manual-instructions": "Po manuálním vypořádání refundace ({method}), zadejte ID transakce.",
     "settle-refund-success": "Úspěšně vypořádana refundace",
     "shipping": "Dodání",
     "shipping-address": "Dodací adresa",
     "shipping-method": "Dodací metoda",
     "state": "Stav",
-    "state-adding-items": "Košík",
-    "state-all-orders": "Všechny objednávky",
-    "state-arranging-payment": "Zřizování platby",
-    "state-cancelled": "Zrušeno",
-    "state-delivered": "Doručeno",
-    "state-partially-delivered": "Částečně doručeno",
-    "state-partially-shipped": "Částečně expedováno",
-    "state-payment-authorized": "Platba autorizovaná",
-    "state-payment-settled": "Platba vypořádána",
-    "state-shipped": "Expedováno",
     "sub-total": "Mezisoučet",
     "successfully-updated-fulfillment": "Zpracování aktualizováno",
     "total": "Celkem",
     "tracking-code": "Kód sledování zásilky",
     "transaction-id": "ID transakce",
-    "transition-to-state": "Změna stavu { state }",
+    "transition-to-state": "Změna stavu na { state }",
     "transitioned-to-state-success": "Stav úspěšně změněn na { state }",
     "unfulfilled": "Nevyřízeno",
     "unit-price": "Cena za kus"
@@ -683,6 +673,21 @@
     "view-zone-members": "Zobrazit členy",
     "zone": "Zóna"
   },
+  "state": {
+    "adding-items": "Košík",
+    "all-orders": "Všechny objednávky",
+    "arranging-payment": "Zřizování platby",
+    "cancelled": "Zrušeno",
+    "delivered": "Doručeno",
+    "failed": "Selhalo",
+    "partially-delivered": "Částečně doručeno",
+    "partially-shipped": "Částečně expedováno",
+    "payment-authorized": "Platba autorizovaná",
+    "payment-settled": "Platba vypořádána",
+    "pending": "Čeká na vyřízení",
+    "settled": "Vypořádáno",
+    "shipped": "Expedováno"
+  },
   "system": {
     "all-job-queues": "Všechny fronty úloh",
     "health-all-systems-up": "Všechny systémy běží",

packages/admin-ui/src/lib/static/i18n-messages/de.json

@@ -609,16 +609,6 @@
     "shipping-address": "Lieferadresse",
     "shipping-method": "Versandart",
     "state": "Status",
-    "state-adding-items": "Artikel hinzufügen",
-    "state-all-orders": "Alle Bestellungen",
-    "state-arranging-payment": "Zahlung einrichten",
-    "state-cancelled": "Storniert",
-    "state-delivered": "Ausgeführt",
-    "state-partially-delivered": "Teilweise ausgeführt",
-    "state-partially-shipped": "",
-    "state-payment-authorized": "Zahlung autorisiert",
-    "state-payment-settled": "Bezahlt",
-    "state-shipped": "",
     "sub-total": "Zwischensumme",
     "successfully-updated-fulfillment": "",
     "total": "Gesamtsumme",
@@ -683,6 +673,21 @@
     "view-zone-members": "Mitglieder anzeigen",
     "zone": "Zone"
   },
+  "state": {
+    "adding-items": "Artikel hinzufügen",
+    "all-orders": "Alle Bestellungen",
+    "arranging-payment": "Zahlung einrichten",
+    "cancelled": "Storniert",
+    "delivered": "Ausgeführt",
+    "failed": "",
+    "partially-delivered": "Teilweise ausgeführt",
+    "partially-shipped": "",
+    "payment-authorized": "Zahlung autorisiert",
+    "payment-settled": "Bezahlt",
+    "pending": "",
+    "settled": "",
+    "shipped": ""
+  },
   "system": {
     "all-job-queues": "Alle Job-Warteschlangen",
     "health-all-systems-up": "Alle Systeme betriesbereit",
@@ -701,4 +706,4 @@
     "job-result": "Job-Ergebnis",
     "job-state": "Job-Status"
   }
-}
+}

packages/admin-ui/src/lib/static/i18n-messages/en.json

@@ -609,16 +609,6 @@
     "shipping-address": "Shipping address",
     "shipping-method": "Shipping method",
     "state": "State",
-    "state-adding-items": "Adding items",
-    "state-all-orders": "All orders",
-    "state-arranging-payment": "Arranging payment",
-    "state-cancelled": "Cancelled",
-    "state-delivered": "Delivered",
-    "state-partially-delivered": "Partially delivered",
-    "state-partially-shipped": "Partially shipped",
-    "state-payment-authorized": "Payment authorized",
-    "state-payment-settled": "Payment settled",
-    "state-shipped": "Shipped",
     "sub-total": "Sub total",
     "successfully-updated-fulfillment": "Successfully updated fulfillment",
     "total": "Total",
@@ -683,6 +673,21 @@
     "view-zone-members": "View members",
     "zone": "Zone"
   },
+  "state": {
+    "adding-items": "Adding items",
+    "all-orders": "All orders",
+    "arranging-payment": "Arranging payment",
+    "cancelled": "Cancelled",
+    "delivered": "Delivered",
+    "failed": "Failed",
+    "partially-delivered": "Partially delivered",
+    "partially-shipped": "Partially shipped",
+    "payment-authorized": "Payment authorized",
+    "payment-settled": "Payment settled",
+    "pending": "Pending",
+    "settled": "Settled",
+    "shipped": "Shipped"
+  },
   "system": {
     "all-job-queues": "All job queues",
     "health-all-systems-up": "All systems up",

packages/admin-ui/src/lib/static/i18n-messages/es.json

@@ -609,16 +609,6 @@
     "shipping-address": "Dirección de envío",
     "shipping-method": "",
     "state": "Estado",
-    "state-adding-items": "",
-    "state-all-orders": "",
-    "state-arranging-payment": "",
-    "state-cancelled": "",
-    "state-delivered": "",
-    "state-partially-delivered": "",
-    "state-partially-shipped": "",
-    "state-payment-authorized": "",
-    "state-payment-settled": "",
-    "state-shipped": "",
     "sub-total": "Sub total",
     "successfully-updated-fulfillment": "",
     "total": "Total",
@@ -683,6 +673,21 @@
     "view-zone-members": "Ver países",
     "zone": "Zona"
   },
+  "state": {
+    "adding-items": "",
+    "all-orders": "",
+    "arranging-payment": "",
+    "cancelled": "",
+    "delivered": "",
+    "failed": "",
+    "partially-delivered": "",
+    "partially-shipped": "",
+    "payment-authorized": "",
+    "payment-settled": "",
+    "pending": "",
+    "settled": "",
+    "shipped": ""
+  },
   "system": {
     "all-job-queues": "Todas las colas de trabajo",
     "health-all-systems-up": "Todos los sistemas activos",

packages/admin-ui/src/lib/static/i18n-messages/pl.json

@@ -609,16 +609,6 @@
     "shipping-address": "Adres wysyłki",
     "shipping-method": "Metoda wysyłki",
     "state": "Status",
-    "state-adding-items": "Dodawanie",
-    "state-all-orders": "Wszystkie zamówienia",
-    "state-arranging-payment": "Oczekiwanie na płatność",
-    "state-cancelled": "Anulowano",
-    "state-delivered": "Zrealizowano",
-    "state-partially-delivered": "Częściowo zrealizowano",
-    "state-partially-shipped": "",
-    "state-payment-authorized": "Płatność zaakceptowana",
-    "state-payment-settled": "Płatność rozliczona",
-    "state-shipped": "",
     "sub-total": "Sub total",
     "successfully-updated-fulfillment": "",
     "total": "Total",
@@ -683,6 +673,21 @@
     "view-zone-members": "",
     "zone": "Strefa"
   },
+  "state": {
+    "adding-items": "Dodawanie",
+    "all-orders": "Wszystkie zamówienia",
+    "arranging-payment": "Oczekiwanie na płatność",
+    "cancelled": "Anulowano",
+    "delivered": "Zrealizowano",
+    "failed": "",
+    "partially-delivered": "Częściowo zrealizowano",
+    "partially-shipped": "",
+    "payment-authorized": "Płatność zaakceptowana",
+    "payment-settled": "Płatność rozliczona",
+    "pending": "",
+    "settled": "",
+    "shipped": ""
+  },
   "system": {
     "all-job-queues": "Kolejka wszystkich zadań",
     "health-all-systems-up": "",
@@ -701,4 +706,4 @@
     "job-result": "Rezultat zlecenia",
     "job-state": "Status zlecenia"
   }
-}
+}

packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json

@@ -609,16 +609,6 @@
     "shipping-address": "Endereço de envio",
     "shipping-method": "Método de envio",
     "state": "Estado",
-    "state-adding-items": "Criando itens",
-    "state-all-orders": "Todos os pedidos",
-    "state-arranging-payment": "Organização de pagamento",
-    "state-cancelled": "Cancelado",
-    "state-delivered": "Realizado",
-    "state-partially-delivered": "Parcialmente realizado",
-    "state-partially-shipped": "",
-    "state-payment-authorized": "Pagamento autorizado",
-    "state-payment-settled": "Pagamento liquidado",
-    "state-shipped": "",
     "sub-total": "Subtotal",
     "successfully-updated-fulfillment": "",
     "total": "Total",
@@ -683,6 +673,21 @@
     "view-zone-members": "Visualizar membros",
     "zone": "Zona"
   },
+  "state": {
+    "adding-items": "Criando itens",
+    "all-orders": "Todos os pedidos",
+    "arranging-payment": "Organização de pagamento",
+    "cancelled": "Cancelado",
+    "delivered": "Realizado",
+    "failed": "",
+    "partially-delivered": "Parcialmente realizado",
+    "partially-shipped": "",
+    "payment-authorized": "Pagamento autorizado",
+    "payment-settled": "Pagamento liquidado",
+    "pending": "",
+    "settled": "",
+    "shipped": ""
+  },
   "system": {
     "all-job-queues": "Todas as filas de trabalhos",
     "health-all-systems-up": "Todos os sistemas ativos",
@@ -701,4 +706,4 @@
     "job-result": "Resultado do trabalho",
     "job-state": "Estado do trabalho"
   }
-}
+}

packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json

@@ -609,16 +609,6 @@
     "shipping-address": "配送地址",
     "shipping-method": "配送方式",
     "state": "状态",
-    "state-adding-items": "正在选择商品",
-    "state-all-orders": "所有订单",
-    "state-arranging-payment": "正在付款",
-    "state-cancelled": "已取消",
-    "state-delivered": "已完成",
-    "state-partially-delivered": "部分配货",
-    "state-partially-shipped": "",
-    "state-payment-authorized": "已授权支付",
-    "state-payment-settled": "已结算",
-    "state-shipped": "",
     "sub-total": "小计金额",
     "successfully-updated-fulfillment": "",
     "total": "总计金额",
@@ -683,6 +673,21 @@
     "view-zone-members": "",
     "zone": "销售区域"
   },
+  "state": {
+    "adding-items": "正在选择商品",
+    "all-orders": "所有订单",
+    "arranging-payment": "正在付款",
+    "cancelled": "已取消",
+    "delivered": "已完成",
+    "failed": "",
+    "partially-delivered": "部分配货",
+    "partially-shipped": "",
+    "payment-authorized": "已授权支付",
+    "payment-settled": "已结算",
+    "pending": "",
+    "settled": "",
+    "shipped": ""
+  },
   "system": {
     "all-job-queues": "",
     "health-all-systems-up": "",
@@ -701,4 +706,4 @@
     "job-result": "",
     "job-state": ""
   }
-}
+}

packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json

@@ -609,16 +609,6 @@
     "shipping-address": "配送地址",
     "shipping-method": "配送方式",
     "state": "狀態",
-    "state-adding-items": "正在選擇商品",
-    "state-all-orders": "所有訂單",
-    "state-arranging-payment": "正在付款",
-    "state-cancelled": "已取消",
-    "state-delivered": "已完成",
-    "state-partially-delivered": "部分配貨",
-    "state-partially-shipped": "",
-    "state-payment-authorized": "已授權支付",
-    "state-payment-settled": "已結算",
-    "state-shipped": "",
     "sub-total": "小計金額",
     "successfully-updated-fulfillment": "",
     "total": "總計金額",
@@ -683,6 +673,21 @@
     "view-zone-members": "",
     "zone": "銷售區域"
   },
+  "state": {
+    "adding-items": "正在選擇商品",
+    "all-orders": "所有訂單",
+    "arranging-payment": "正在付款",
+    "cancelled": "已取消",
+    "delivered": "已完成",
+    "failed": "",
+    "partially-delivered": "部分配貨",
+    "partially-shipped": "",
+    "payment-authorized": "已授權支付",
+    "payment-settled": "已結算",
+    "pending": "",
+    "settled": "",
+    "shipped": ""
+  },
   "system": {
     "all-job-queues": "",
     "health-all-systems-up": "",
@@ -701,4 +706,4 @@
     "job-result": "",
     "job-state": ""
   }
-}
+}