feat(ui): remove unifiedCanvas translation key namespace

2026-04-23 03:00:31 -04:00 · 2024-09-25 16:55:08 +10:00
parent aad81a83a3
commit c8246b99d3
12 changed files with 38 additions and 51 deletions
--- a/invokeai/frontend/web/public/locales/en.json
+++ b/invokeai/frontend/web/public/locales/en.json
@@ -335,7 +335,8 @@
        "compareHelp3": "Press <Kbd>C</Kbd> to swap the compared images.",
        "compareHelp4": "Press <Kbd>Z</Kbd> or <Kbd>Esc</Kbd> to exit.",
        "openViewer": "Open Viewer",
-        "closeViewer": "Close Viewer"
+        "closeViewer": "Close Viewer",
+        "move": "Move"
    },
    "hotkeys": {
        "hotkeys": "Hotkeys",
@@ -1024,7 +1025,10 @@
        "remixImage": "Remix Image",
        "usePrompt": "Use Prompt",
        "useSeed": "Use Seed",
-        "width": "Width"
+        "width": "Width",
+        "gaussianBlur": "Gaussian Blur",
+        "boxBlur": "Box Blur",
+        "staged": "Staged"
    },
    "dynamicPrompts": {
        "showDynamicPrompts": "Show Dynamic Prompts",
@@ -1488,34 +1492,6 @@
            ]
        }
    },
-    "unifiedCanvas": {
-        "accept": "Accept",
-        "base": "Base",
-        "brush": "Brush",
-        "canvasSettings": "Canvas Settings",
-        "clearHistory": "Clear History",
-        "coherenceModeGaussianBlur": "Gaussian Blur",
-        "coherenceModeBoxBlur": "Box Blur",
-        "coherenceModeStaged": "Staged",
-        "colorPicker": "Color Picker",
-        "copyToClipboard": "Copy to Clipboard",
-        "discardAll": "Discard All & Cancel Pending Generations",
-        "discardCurrent": "Discard Current",
-        "eraser": "Eraser",
-        "invertBrushSizeScrollDirection": "Invert Scroll for Brush Size",
-        "layer": "Layer",
-        "mask": "Mask",
-        "mergeVisible": "Merge Visible",
-        "move": "Move",
-        "next": "Next",
-        "previous": "Previous",
-        "redo": "Redo",
-        "saveToGallery": "Save To Gallery",
-        "showResultsOn": "Show Results (On)",
-        "showResultsOff": "Show Results (Off)",
-        "snapToGrid": "Snap to Grid",
-        "undo": "Undo"
-    },
    "workflows": {
        "ascending": "Ascending",
        "created": "Created",
@@ -1816,7 +1792,8 @@
            "isolatedPreview": "Isolated Preview",
            "isolatedStagingPreview": "Isolated Staging Preview",
            "isolatedFilteringPreview": "Isolated Filtering Preview",
-            "isolatedTransformingPreview": "Isolated Transforming Preview"
+            "isolatedTransformingPreview": "Isolated Transforming Preview",
+            "invertBrushSizeScrollDirection": "Invert Scroll for Brush Size"
        },
        "HUD": {
            "bbox": "Bbox",
@@ -1839,6 +1816,16 @@
            "newRegionalReferenceImage": "New Regional Reference Image",
            "newControlLayer": "New Control Layer",
            "newRasterLayer": "New Raster Layer"
+        },
+        "stagingArea": {
+            "accept": "Accept",
+            "discardAll": "Discard All",
+            "discard": "Discard",
+            "previous": "Previous",
+            "next": "Next",
+            "saveToGallery": "Save To Gallery",
+            "showResultsOn": "Showing Results",
+            "showResultsOff": "Hiding Results"
        }
    },
    "upscaling": {
--- a/invokeai/frontend/web/src/features/controlLayers/components/Settings/CanvasSettingsInvertScrollCheckbox.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/Settings/CanvasSettingsInvertScrollCheckbox.tsx
@@ -26,7 +26,7 @@ export const CanvasSettingsInvertScrollCheckbox = memo(() => {
  );
  return (
    <FormControl w="full">
-      <FormLabel flexGrow={1}>{t('unifiedCanvas.invertBrushSizeScrollDirection')}</FormLabel>
+      <FormLabel flexGrow={1}>{t('controlLayers.settings.invertBrushSizeScrollDirection')}</FormLabel>
      <Checkbox isChecked={invertScrollForToolWidth} onChange={onChange} />
    </FormControl>
  );
--- a/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarAcceptButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarAcceptButton.tsx
@@ -57,8 +57,8 @@ export const StagingAreaToolbarAcceptButton = memo(() => {

  return (
    <IconButton
-      tooltip={`${t('unifiedCanvas.accept')} (Enter)`}
-      aria-label={`${t('unifiedCanvas.accept')} (Enter)`}
+      tooltip={`${t('common.accept')} (Enter)`}
+      aria-label={`${t('common.accept')} (Enter)`}
      icon={<PiCheckBold />}
      onClick={acceptSelected}
      colorScheme="invokeBlue"
--- a/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarDiscardAllButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarDiscardAllButton.tsx
@@ -15,8 +15,8 @@ export const StagingAreaToolbarDiscardAllButton = memo(() => {

  return (
    <IconButton
-      tooltip={`${t('unifiedCanvas.discardAll')} (Esc)`}
-      aria-label={t('unifiedCanvas.discardAll')}
+      tooltip={`${t('controlLayers.stagingArea.discardAll')} (Esc)`}
+      aria-label={t('controlLayers.stagingArea.discardAll')}
      icon={<PiTrashSimpleBold />}
      onClick={discardAll}
      colorScheme="error"
--- a/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarDiscardSelectedButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarDiscardSelectedButton.tsx
@@ -32,8 +32,8 @@ export const StagingAreaToolbarDiscardSelectedButton = memo(() => {

  return (
    <IconButton
-      tooltip={`${t('unifiedCanvas.discardCurrent')}`}
-      aria-label={t('unifiedCanvas.discardCurrent')}
+      tooltip={t('controlLayers.stagingArea.discard')}
+      aria-label={t('controlLayers.stagingArea.discard')}
      icon={<PiXBold />}
      onClick={discardSelected}
      colorScheme="invokeBlue"
--- a/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarNextButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarNextButton.tsx
@@ -37,8 +37,8 @@ export const StagingAreaToolbarNextButton = memo(() => {

  return (
    <IconButton
-      tooltip={`${t('unifiedCanvas.next')} (Right)`}
-      aria-label={`${t('unifiedCanvas.next')} (Right)`}
+      tooltip={`${t('controlLayers.stagingArea.next')} (Right)`}
+      aria-label={`${t('controlLayers.stagingArea.next')} (Right)`}
      icon={<PiArrowRightBold />}
      onClick={selectNext}
      colorScheme="invokeBlue"
--- a/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarPrevButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarPrevButton.tsx
@@ -37,8 +37,8 @@ export const StagingAreaToolbarPrevButton = memo(() => {

  return (
    <IconButton
-      tooltip={`${t('unifiedCanvas.previous')} (Left)`}
-      aria-label={`${t('unifiedCanvas.previous')} (Left)`}
+      tooltip={`${t('controlLayers.stagingArea.previous')} (Left)`}
+      aria-label={`${t('controlLayers.stagingArea.previous')} (Left)`}
      icon={<PiArrowLeftBold />}
      onClick={selectPrev}
      colorScheme="invokeBlue"
--- a/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarSaveSelectedToGalleryButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarSaveSelectedToGalleryButton.tsx
@@ -37,8 +37,8 @@ export const StagingAreaToolbarSaveSelectedToGalleryButton = memo(() => {

  return (
    <IconButton
-      tooltip={t('unifiedCanvas.saveToGallery')}
-      aria-label={t('unifiedCanvas.saveToGallery')}
+      tooltip={t('controlLayers.stagingArea.saveToGallery')}
+      aria-label={t('controlLayers.stagingArea.saveToGallery')}
      icon={<PiFloppyDiskBold />}
      onClick={saveSelectedImageToGallery}
      colorScheme="invokeBlue"
--- a/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarToggleShowResultsButton.tsx
+++ b/invokeai/frontend/web/src/features/controlLayers/components/StagingArea/StagingAreaToolbarToggleShowResultsButton.tsx
@@ -17,8 +17,8 @@ export const StagingAreaToolbarToggleShowResultsButton = memo(() => {

  return (
    <IconButton
-      tooltip={shouldShowStagedImage ? t('unifiedCanvas.showResultsOn') : t('unifiedCanvas.showResultsOff')}
-      aria-label={shouldShowStagedImage ? t('unifiedCanvas.showResultsOn') : t('unifiedCanvas.showResultsOff')}
+      tooltip={shouldShowStagedImage ? t('controlLayers.stagingArea.showResultsOn') : t('controlLayers.stagingArea.showResultsOff')}
+      aria-label={shouldShowStagedImage ? t('controlLayers.stagingArea.showResultsOn') : t('controlLayers.stagingArea.showResultsOff')}
      data-alert={!shouldShowStagedImage}
      icon={shouldShowStagedImage ? <PiEyeBold /> : <PiEyeSlashBold />}
      onClick={toggleShowResults}
--- a/invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/GalleryBoard.tsx
+++ b/invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/GalleryBoard.tsx
@@ -169,7 +169,7 @@ const GalleryBoard = ({ board, isSelected }: GalleryBoardProps) => {
            {board.archived && !editingDisclosure.isOpen && <Icon as={PiArchiveBold} fill="base.300" />}
            {!editingDisclosure.isOpen && <Text variant="subtext">{board.image_count}</Text>}

-            <IAIDroppable data={droppableData} dropLabel={t('unifiedCanvas.move')} />
+            <IAIDroppable data={droppableData} dropLabel={t('gallery.move')} />
          </Flex>
        </Tooltip>
      )}
--- a/invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/NoBoardBoard.tsx
+++ b/invokeai/frontend/web/src/features/gallery/components/Boards/BoardsList/NoBoardBoard.tsx
@@ -92,7 +92,7 @@ const NoBoardBoard = memo(({ isSelected }: Props) => {
            </Text>
            {autoAddBoardId === 'none' && <AutoAddBadge />}
            <Text variant="subtext">{imagesTotal}</Text>
-            <IAIDroppable data={droppableData} dropLabel={t('unifiedCanvas.move')} />
+            <IAIDroppable data={droppableData} dropLabel={t('gallery.move')} />
          </Flex>
        </Tooltip>
      )}
--- a/invokeai/frontend/web/src/features/parameters/components/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceMode.tsx
+++ b/invokeai/frontend/web/src/features/parameters/components/Canvas/Compositing/CoherencePass/ParamCanvasCoherenceMode.tsx
@@ -14,9 +14,9 @@ const ParamCanvasCoherenceMode = () => {

  const options = useMemo<ComboboxOption[]>(
    () => [
-      { label: t('unifiedCanvas.coherenceModeGaussianBlur'), value: 'Gaussian Blur' },
-      { label: t('unifiedCanvas.coherenceModeBoxBlur'), value: 'Box Blur' },
-      { label: t('unifiedCanvas.coherenceModeStaged'), value: 'Staged' },
+      { label: t('parameters.gaussianBlur'), value: 'Gaussian Blur' },
+      { label: t('parameters.boxBlur'), value: 'Box Blur' },
+      { label: t('parameters.staged'), value: 'Staged' },
    ],
    [t]
  );