Translate search option props.

Signed-off-by: Akos Kitta <[email protected]>

Author: Akos Kitta

arduino-ide-extension/src/browser/widgets/component-list/filter-renderer.tsx

@@ -5,7 +5,6 @@ import {
   LibrarySearch,
   Searchable,
 } from '../../../common/protocol';
-import { firstToUpperCase } from '../../../common/utils';
 
 @injectable()
 export abstract class FilterRenderer<S extends Searchable.Options> {
@@ -20,8 +19,7 @@ export abstract class FilterRenderer<S extends Searchable.Options> {
           .filter(([prop]) => props.includes(prop as keyof S))
           .map(([prop, value]) => (
             <div key={prop}>
-              {/* TODO: translations? */}
-              {firstToUpperCase(prop)}:
+              {this.propertyLabel(prop as keyof S)}:
               <select
                 className="theia-select"
                 value={value}
@@ -32,7 +30,7 @@ export abstract class FilterRenderer<S extends Searchable.Options> {
               >
                 {this.options(prop as keyof S).map((key) => (
                   <option key={key} value={key}>
-                    {this.label(prop as keyof S, key)}
+                    {this.valueLabel(prop as keyof S, key)}
                   </option>
                 ))}
               </select>
@@ -43,7 +41,8 @@ export abstract class FilterRenderer<S extends Searchable.Options> {
   }
   protected abstract props(): (keyof S)[];
   protected abstract options(prop: keyof S): string[];
-  protected abstract label(prop: keyof S, key: string): string;
+  protected abstract valueLabel(prop: keyof S, key: string): string;
+  protected abstract propertyLabel(prop: keyof S): string;
 }
 
 @injectable()
@@ -60,7 +59,7 @@ export class BoardsFilterRenderer extends FilterRenderer<BoardSearch> {
         throw new Error(`Unexpected prop: ${prop}`);
     }
   }
-  protected label(prop: keyof BoardSearch, key: string): string {
+  protected valueLabel(prop: keyof BoardSearch, key: string): string {
     switch (prop) {
       case 'type':
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -69,6 +68,14 @@ export class BoardsFilterRenderer extends FilterRenderer<BoardSearch> {
         throw new Error(`Unexpected key: ${prop}`);
     }
   }
+  protected propertyLabel(prop: keyof BoardSearch): string {
+    switch (prop) {
+      case 'type':
+        return BoardSearch.PropertyLabels[prop];
+      default:
+        throw new Error(`Unexpected key: ${prop}`);
+    }
+  }
 }
 
 @injectable()
@@ -88,7 +95,16 @@ export class LibraryFilterRenderer extends FilterRenderer<LibrarySearch> {
         throw new Error(`Unexpected prop: ${prop}`);
     }
   }
-  protected label(prop: keyof LibrarySearch, key: string): string {
+  protected propertyLabel(prop: keyof LibrarySearch): string {
+    switch (prop) {
+      case 'type':
+      case 'topic':
+        return LibrarySearch.PropertyLabels[prop];
+      default:
+        throw new Error(`Unexpected key: ${prop}`);
+    }
+  }
+  protected valueLabel(prop: keyof LibrarySearch, key: string): string {
     switch (prop) {
       case 'type':
         // eslint-disable-next-line @typescript-eslint/no-explicit-any

arduino-ide-extension/src/common/nls.ts

@@ -4,6 +4,7 @@ export const Unknown = nls.localize('arduino/common/unknown', 'Unknown');
 export const Later = nls.localize('arduino/common/later', 'Later');
 export const Updatable = nls.localize('arduino/common/updateable', 'Updatable');
 export const All = nls.localize('arduino/common/all', 'All');
+export const Type = nls.localize('arduino/common/type', 'Type');
 export const Partner = nls.localize('arduino/common/partner', 'Partner');
 export const Contributed = nls.localize(
   'arduino/common/contributed',

arduino-ide-extension/src/common/protocol/boards-service.ts

@@ -3,7 +3,7 @@ import { Searchable } from './searchable';
 import { Installable } from './installable';
 import { ArduinoComponent } from './arduino-component';
 import { nls } from '@theia/core/lib/common/nls';
-import { All, Contributed, Partner, Updatable } from '../nls';
+import { All, Contributed, Partner, Type, Updatable } from '../nls';
 
 export type AvailablePorts = Record<string, [Port, Array<Board>]>;
 export namespace AvailablePorts {
@@ -173,6 +173,12 @@ export namespace BoardSearch {
     Partner: Partner,
     'Arduino@Heart': 'Arduino@Heart',
   };
+  export const PropertyLabels: Record<
+    keyof Omit<BoardSearch, 'query'>,
+    string
+  > = {
+    type: Type,
+  };
 }
 
 export interface Port {

arduino-ide-extension/src/common/protocol/library-service.ts

@@ -8,6 +8,7 @@ import {
   Partner,
   Recommended,
   Retired,
+  Type,
   Updatable,
 } from '../nls';
 
@@ -119,6 +120,13 @@ export namespace LibrarySearch {
       'Uncategorized'
     ),
   };
+  export const PropertyLabels: Record<
+    keyof Omit<LibrarySearch, 'query'>,
+    string
+  > = {
+    topic: nls.localize('arduino/librarySearchProperty/topic', 'Topic'),
+    type: Type,
+  };
 }
 
 export namespace LibraryService {

i18n/en.json

@@ -126,6 +126,7 @@
       "retired": "Retired",
       "selectedOn": "on {0}",
       "serialMonitor": "Serial Monitor",
+      "type": "Type",
       "unknown": "Unknown",
       "updateable": "Updatable"
     },
@@ -251,6 +252,9 @@
       "uninstalledSuccessfully": "Successfully uninstalled library {0}:{1}",
       "zipLibrary": "Library"
     },
+    "librarySearchProperty": {
+      "topic": "Topic"
+    },
     "libraryTopic": {
       "communication": "Communication",
       "dataProcessing": "Data Processing",