Fix: Moved towards get function from lit-translate (openscd#1471)

* Fix: Moved towards get function from lit-translate * Updated translate to get * Updated snapshots (translations are included)
sprinteins · Mar 15, 2024 · 03dabf9 · 03dabf9
1 parent 200c030
commit 03dabf9
Show file tree

Hide file tree

Showing 121 changed files with 2,175 additions and 765 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/open-scd/src/Historing.ts b/packages/open-scd/src/Historing.ts
@@ -1,6 +1,6 @@
 import { html, state, property, query, TemplateResult } from 'lit-element';
 import { ifDefined } from 'lit-html/directives/if-defined';
-import { get, translate } from 'lit-translate';
+import { get } from 'lit-translate';
 
 import '@material/mwc-button';
 import '@material/mwc-dialog';
@@ -284,7 +284,7 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
         return this.log.slice().reverse().map(this.renderLogEntry, this);
       else
         return html`<mwc-list-item disabled graphic="icon">
-          <span>${translate('log.placeholder')}</span>
+          <span>${get('log.placeholder')}</span>
           <mwc-icon slot="graphic">info</mwc-icon>
         </mwc-list-item>`;
     }
@@ -297,7 +297,7 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
           .map(this.renderHistoryEntry, this);
       else
         return html`<mwc-list-item disabled graphic="icon">
-          <span>${translate('history.placeholder')}</span>
+          <span>${get('history.placeholder')}</span>
           <mwc-icon slot="graphic">info</mwc-icon>
         </mwc-list-item>`;
     }
@@ -334,7 +334,7 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
       return issueItems.length
         ? issueItems
         : html`<mwc-list-item disabled graphic="icon">
-            <span>${translate('diag.placeholder')}</span>
+            <span>${get('diag.placeholder')}</span>
             <mwc-icon slot="graphic">info</mwc-icon>
           </mwc-list-item>`;
     }
@@ -349,37 +349,34 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
     }
 
     private renderLogDialog(): TemplateResult {
-      return html` <mwc-dialog id="log" heading="${translate('log.name')}">
+      return html` <mwc-dialog id="log" heading="${get('log.name')}">
         ${this.renderFilterButtons()}
         <mwc-list id="content" wrapFocus>${this.renderLog()}</mwc-list>
         <mwc-button slot="primaryAction" dialogaction="close"
-          >${translate('close')}</mwc-button
+          >${get('close')}</mwc-button
         >
       </mwc-dialog>`;
     }
 
     private renderHistoryDialog(): TemplateResult {
-      return html` <mwc-dialog
-        id="history"
-        heading="${translate('history.name')}"
-      >
+      return html` <mwc-dialog id="history" heading="${get('history.name')}">
         <mwc-list id="content" wrapFocus>${this.renderHistory()}</mwc-list>
         <mwc-button
           icon="undo"
-          label="${translate('undo')}"
+          label="${get('undo')}"
           ?disabled=${!this.canUndo}
           @click=${this.undo}
           slot="secondaryAction"
         ></mwc-button>
         <mwc-button
           icon="redo"
-          label="${translate('redo')}"
+          label="${get('redo')}"
           ?disabled=${!this.canRedo}
           @click=${this.redo}
           slot="secondaryAction"
         ></mwc-button>
         <mwc-button slot="primaryAction" dialogaction="close"
-          >${translate('close')}</mwc-button
+          >${get('close')}</mwc-button
         >
       </mwc-dialog>`;
     }
@@ -444,12 +441,12 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
           }
         </style>
         ${this.renderLogDialog()} ${this.renderHistoryDialog()}
-        <mwc-dialog id="diagnostic" heading="${translate('diag.name')}">
+        <mwc-dialog id="diagnostic" heading="${get('diag.name')}">
           <filtered-list id="content" wrapFocus
             >${this.renderIssues()}</filtered-list
           >
           <mwc-button slot="primaryAction" dialogaction="close"
-            >${translate('close')}</mwc-button
+            >${get('close')}</mwc-button
           >
         </mwc-dialog>
 
@@ -477,7 +474,7 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
             slot="action"
             icon="history"
             @click=${() => this.logUI.show()}
-            >${translate('log.snackbar.show')}</mwc-button
+            >${get('log.snackbar.show')}</mwc-button
           >
           <mwc-icon-button icon="close" slot="dismiss"></mwc-icon-button>
         </mwc-snackbar>
@@ -494,7 +491,7 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
             slot="action"
             icon="history"
             @click=${() => this.logUI.show()}
-            >${translate('log.snackbar.show')}</mwc-button
+            >${get('log.snackbar.show')}</mwc-button
           >
           <mwc-icon-button icon="close" slot="dismiss"></mwc-icon-button>
         </mwc-snackbar>
@@ -508,7 +505,7 @@ export function Historing<TBase extends LitElementConstructor>(Base: TBase) {
             slot="action"
             icon="rule"
             @click=${() => this.diagnosticUI.show()}
-            >${translate('log.snackbar.show')}</mwc-button
+            >${get('log.snackbar.show')}</mwc-button
           >
           <mwc-icon-button icon="close" slot="dismiss"></mwc-icon-button>
         </mwc-snackbar>`;

diff --git a/packages/open-scd/src/addons/Settings.ts b/packages/open-scd/src/addons/Settings.ts
@@ -7,7 +7,7 @@ import {
   LitElement,
   css,
 } from 'lit-element';
-import { get, registerTranslateConfig, translate, use } from 'lit-translate';
+import { get, registerTranslateConfig, use } from 'lit-translate';
 
 import '@material/mwc-button';
 import '@material/mwc-dialog';
@@ -224,7 +224,7 @@ export class OscdSettings extends LitElement {
         @change="${(evt: Event) => this.uploadNsdocFile(evt)}}"
       />
       <mwc-button
-        label="${translate('settings.selectFileButton')}"
+        label="${get('settings.selectFileButton')}"
         id="selectFileButton"
         @click=${() => {
           const input = <HTMLInputElement | null>(
@@ -384,39 +384,39 @@ export class OscdSettings extends LitElement {
   render(): TemplateResult {
     return html`<mwc-dialog
         id="settings"
-        heading="${translate('settings.title')}"
+        heading="${get('settings.title')}"
         @closing=${this.onClosing}
       >
         <form>
           <mwc-select
             fixedMenuPosition
             id="language"
             icon="language"
-            label="${translate('settings.language')}"
+            label="${get('settings.language')}"
           >
             ${Object.keys(languages).map(
               lang =>
                 html`<mwc-list-item
                   graphic="icon"
                   value="${lang}"
                   ?selected=${lang === this.settings.language}
-                  >${translate(`settings.languages.${lang}`)}</mwc-list-item
+                  >${get(`settings.languages.${lang}`)}</mwc-list-item
                 >`
             )}
           </mwc-select>
-          <mwc-formfield label="${translate('settings.dark')}">
+          <mwc-formfield label="${get('settings.dark')}">
             <mwc-switch
               id="dark"
               ?checked=${this.settings.theme === 'dark'}
             ></mwc-switch>
           </mwc-formfield>
-          <mwc-formfield label="${translate('settings.mode')}">
+          <mwc-formfield label="${get('settings.mode')}">
             <mwc-switch
               id="mode"
               ?checked=${this.settings.mode === 'pro'}
             ></mwc-switch>
           </mwc-formfield>
-          <mwc-formfield label="${translate('settings.showieds')}">
+          <mwc-formfield label="${get('settings.showieds')}">
             <mwc-switch
               id="showieds"
               ?checked=${this.settings.showieds === 'on'}
@@ -425,7 +425,7 @@ export class OscdSettings extends LitElement {
         </form>
         <wizard-divider></wizard-divider>
         <section>
-          <h3>${translate('settings.loadNsdTranslations')}</h3>
+          <h3>${get('settings.loadNsdTranslations')}</h3>
           ${this.renderFileSelect()}
         </section>
         <mwc-list id="nsdocList">
@@ -435,22 +435,22 @@ export class OscdSettings extends LitElement {
           ${this.renderNsdocItem('IEC 61850-8-1')}
         </mwc-list>
         <mwc-button slot="secondaryAction" dialogAction="close">
-          ${translate('cancel')}
+          ${get('cancel')}
         </mwc-button>
         <mwc-button
           style="--mdc-theme-primary: var(--mdc-theme-error)"
           slot="secondaryAction"
           dialogAction="reset"
         >
-          ${translate('reset')}
+          ${get('reset')}
         </mwc-button>
         <mwc-button
           icon="save"
           trailingIcon
           slot="primaryAction"
           dialogAction="save"
         >
-          ${translate('save')}
+          ${get('save')}
         </mwc-button>
       </mwc-dialog>
       <slot></slot>

diff --git a/packages/open-scd/src/filtered-list.ts b/packages/open-scd/src/filtered-list.ts
@@ -8,7 +8,7 @@ import {
   TemplateResult,
   unsafeCSS,
 } from 'lit-element';
-import { translate } from 'lit-translate';
+import { get } from 'lit-translate';
 
 import '@material/mwc-checkbox';
 import '@material/mwc-formfield';
@@ -45,14 +45,14 @@ function hideFiltered(item: ListItemBase, searchText: string): void {
     .split(/\s+/g);
 
   (terms.length === 1 && terms[0] === '') ||
-    terms.every(term => {
-      // regexp escape
-      const reTerm = new RegExp(
-        `*${term}*`.replace(/\*/g, '.*').replace(/\?/g, '.{1}'),
-        'i'
-      );
-      return reTerm.test(filterTarget);
-    })
+  terms.every(term => {
+    // regexp escape
+    const reTerm = new RegExp(
+      `*${term}*`.replace(/\*/g, '.*').replace(/\?/g, '.{1}'),
+      'i'
+    );
+    return reTerm.test(filterTarget);
+  })
     ? slotItem(item).classList.remove('hidden')
     : slotItem(item).classList.add('hidden');
 }
@@ -136,16 +136,16 @@ export class FilteredList extends ListBase {
             ?indeterminate=${!this.isAllSelected && this.isSomeSelected}
             ?checked=${this.isAllSelected}
             @change=${() => {
-          this.onCheckAll();
-        }}
+              this.onCheckAll();
+            }}
           ></mwc-checkbox
         ></mwc-formfield>`
       : html``;
   }
 
   render(): TemplateResult {
     return html`<div id="tfcontainer">
-        <abbr title="${this.searchFieldLabel ?? translate('filter')}"
+        <abbr title="${this.searchFieldLabel ?? get('filter')}"
           ><mwc-textfield
             label="${this.searchFieldLabel ?? ''}"
             iconTrailing="search"

diff --git a/packages/open-scd/src/finder-list.ts b/packages/open-scd/src/finder-list.ts
@@ -8,7 +8,7 @@ import {
   TemplateResult,
 } from 'lit-element';
 import { until } from 'lit-html/directives/until';
-import { translate } from 'lit-translate';
+import { get } from 'lit-translate';
 
 import '@material/mwc-icon';
 import '@material/mwc-list';
@@ -33,9 +33,7 @@ export interface Directory {
 const waitingList = html`<div class="column">
   <mwc-list
     ><mwc-list-item noninteractive hasMeta
-      >${translate('loading')}<mwc-icon slot="meta"
-        >pending</mwc-icon
-      ></mwc-list-item
+      >${get('loading')}<mwc-icon slot="meta">pending</mwc-icon></mwc-list-item
     ></mwc-list
   >
 </div>`;