Constant strings

microsoft · Mar 22, 2024 · d8da579 · d8da579
1 parent ab0b8cb
commit d8da579
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/teachertool/src/components/BlockPickerModal.tsx b/teachertool/src/components/BlockPickerModal.tsx
@@ -11,6 +11,7 @@ import { getReadableBlockString } from "../utils";
 import { setParameterValue } from "../transforms/setParameterValue";
 import { ErrorCode } from "../types/errorCode";
 import { logError } from "../services/loggingService";
+import { Strings } from "../constants";
 import css from "./styling/BlockPickerModal.module.scss";
 
 interface PickBlockButtonProps {
@@ -118,7 +119,7 @@ export const BlockPickerModal: React.FC<BlockPickerModalProps> = ({}) => {
 
     const modalActions = [
         {
-            label: lf("Cancel"),
+            label: Strings.Cancel,
             className: "secondary",
             onClick: hideModal,
         },
@@ -127,7 +128,7 @@ export const BlockPickerModal: React.FC<BlockPickerModalProps> = ({}) => {
     return teacherTool.modal === "block-picker" && teacherTool.blockPickerOptions ? (
         <Modal
             className={css["block-picker-modal"]}
-            title={lf("Select block")}
+            title={Strings.SelectBlock}
             onClose={hideModal}
             actions={modalActions}
         >

diff --git a/teachertool/src/components/CatalogModal.tsx b/teachertool/src/components/CatalogModal.tsx
@@ -7,6 +7,7 @@ import { addCriteriaToRubric } from "../transforms/addCriteriaToRubric";
 import { CatalogCriteria } from "../types/criteria";
 import { getSelectableCatalogCriteria } from "../state/helpers";
 import { ReadOnlyCriteriaDisplay } from "./ReadonlyCriteriaDisplay";
+import { Strings } from "../constants";
 import css from "./styling/CatalogModal.module.scss";
 
 interface CatalogModalProps {}
@@ -47,12 +48,12 @@ export const CatalogModal: React.FC<CatalogModalProps> = ({}) => {
 
     const modalActions = [
         {
-            label: lf("Cancel"),
+            label: Strings.Cancel,
             className: "secondary",
             onClick: closeModal,
         },
         {
-            label: lf("Add Selected"),
+            label: Strings.AddSelected,
             className: "primary",
             onClick: handleAddSelectedClicked,
         },

diff --git a/teachertool/src/components/ConfirmationModal.tsx b/teachertool/src/components/ConfirmationModal.tsx
@@ -2,6 +2,7 @@ import { useContext, useEffect, useState } from "react";
 import { AppStateContext } from "../state/appStateContext";
 import { Modal } from "react-common/components/controls/Modal";
 import { hideModal } from "../transforms/hideModal";
+import { Strings } from "../constants";
 
 export interface IProps {}
 export const ConfirmationModal: React.FC<IProps> = () => {
@@ -19,12 +20,12 @@ export const ConfirmationModal: React.FC<IProps> = () => {
 
     const actions = [
         {
-            label: lf("Cancel"),
+            label: Strings.Cancel,
             className: "secondary",
             onClick: handleCancel,
         },
         {
-            label: lf("Continue"),
+            label: Strings.Continue,
             className: "primary",
             onClick: handleContinue,
         },

diff --git a/teachertool/src/components/CriteriaInstanceDisplay.tsx b/teachertool/src/components/CriteriaInstanceDisplay.tsx
@@ -11,6 +11,7 @@ import { Input } from "react-common/components/controls/Input";
 import { Button } from "react-common/components/controls/Button";
 import { showBlockPicker } from "../transforms/showBlockPicker";
 import { AppStateContext } from "../state/appStateContext";
+import { Strings } from "../constants";
 
 interface InlineInputSegmentProps {
     initialValue: string;
@@ -33,7 +34,7 @@ const InlineInputSegment: React.FC<InlineInputSegmentProps> = ({
         setParameterValue(instance.instanceId, param.name, newValue);
     }
 
-    const tooltip = isEmpty ? lf("{0}: value required", param.name) : param.name;
+    const tooltip = isEmpty ? `"${param.name}: ${Strings.ValueRequired}` : param.name;
     return (
         <div title={tooltip} className={css["inline-input-wrapper"]}>
             <Input
@@ -92,7 +93,7 @@ const BlockInputSegment: React.FC<BlockInputSegmentProps> = ({ instance, param }
             label={blockData ? getReadableBlockString(blockData.block.name) : param.value || param.name}
             className={classList(css["block-input-btn"], param.value ? undefined : css["error"])}
             onClick={handleClick}
-            title={param.value ? lf("select block") : lf("select block: value required")}
+            title={param.value ? Strings.SelectBlock : `${Strings.SelectBlock}: ${Strings.ValueRequired}`}
             leftIcon={param.value ? undefined : "fas fa-exclamation-triangle"}
             style={style}
         />

diff --git a/teachertool/src/constants.ts b/teachertool/src/constants.ts
@@ -20,6 +20,11 @@ export namespace Strings {
     export const Browse = lf("Browse");
     export const SelectRubricFile = lf("Select Rubric File");
     export const InvalidRubricFile = lf("Invalid Rubric File");
+    export const Cancel = lf("Cancel");
+    export const SelectBlock = lf("Select Block");
+    export const ValueRequired = lf("Value Required");
+    export const AddSelected = lf("Add Selected");
+    export const Continue = lf("Continue");
 }
 
 export namespace Ticks {