mirror of
https://github.com/Comfy-Org/ComfyUI_frontend.git
synced 2026-02-28 02:34:10 +00:00
8f48b11f6a
## Summary Fix multiple i18n missing key console warnings by correcting key paths and adding missing translations. ## Changes - **What**: - `ScrubableNumberInput`: Fixed references to non-existent `g.ariaLabel.decrement`/`g.ariaLabel.increment` keys → use `g.decrement`/`g.increment` - `SidebarIcon`: Replaced `t()` with `st()` (safe translate) to prevent double-translation when parent components pass pre-translated strings - `en/main.json`: Added missing `menuLabels.Copy`, `menuLabels.Paste`, `menuLabels.Select All` keys ## Review Focus The `SidebarIcon` change from `t()` to `st()` is the key design decision. `SidebarIcon` receives both i18n keys (from sidebar tabs via `SideToolbar`) and pre-translated strings (from dedicated sidebar button components). Using `st()` (which checks `te()` before translating) handles both cases without warnings. ┆Issue is synchronized with this [Notion page](https://www.notion.so/PR-9064-fix-resolve-missing-i18n-key-warnings-30e6d73d3650816eaad3ce030f9c1d3f) by [Unito](https://www.unito.io) --------- Co-authored-by: Amp <amp@ampcode.com>
139 lines
3.4 KiB
Vue
139 lines
3.4 KiB
Vue
<template>
|
|
<Button
|
|
v-tooltip="{
|
|
value: computedTooltip,
|
|
showDelay: 300,
|
|
hideDelay: 300
|
|
}"
|
|
:class="
|
|
cn(
|
|
'side-bar-button cursor-pointer border-none',
|
|
selected && 'side-bar-button-selected'
|
|
)
|
|
"
|
|
variant="muted-textonly"
|
|
:aria-label="computedTooltip"
|
|
@click="emit('click', $event)"
|
|
>
|
|
<div class="side-bar-button-content">
|
|
<slot name="icon">
|
|
<div class="sidebar-icon-wrapper relative">
|
|
<i
|
|
v-if="typeof icon === 'string'"
|
|
:class="icon + ' side-bar-button-icon'"
|
|
/>
|
|
<component
|
|
:is="icon"
|
|
v-else-if="typeof icon === 'object'"
|
|
class="side-bar-button-icon"
|
|
/>
|
|
<span
|
|
v-if="shouldShowBadge"
|
|
:class="
|
|
cn(
|
|
'sidebar-icon-badge absolute min-w-[16px] rounded-full bg-primary-background py-0.25 text-[10px] font-medium leading-[14px] text-base-foreground',
|
|
badgeClass || '-top-1 -right-1'
|
|
)
|
|
"
|
|
>
|
|
{{ overlayValue }}
|
|
</span>
|
|
</div>
|
|
</slot>
|
|
<span v-if="label && !isSmall" class="side-bar-button-label">{{
|
|
st(label, label)
|
|
}}</span>
|
|
</div>
|
|
</Button>
|
|
</template>
|
|
|
|
<script setup lang="ts">
|
|
import { computed } from 'vue'
|
|
import type { Component } from 'vue'
|
|
|
|
import Button from '@/components/ui/button/Button.vue'
|
|
import { st } from '@/i18n'
|
|
import { cn } from '@/utils/tailwindUtil'
|
|
const {
|
|
icon = '',
|
|
selected = false,
|
|
tooltip = '',
|
|
tooltipSuffix = '',
|
|
iconBadge = '',
|
|
badgeClass = '',
|
|
label = '',
|
|
isSmall = false
|
|
} = defineProps<{
|
|
icon?: string | Component
|
|
selected?: boolean
|
|
tooltip?: string
|
|
tooltipSuffix?: string
|
|
iconBadge?: string | (() => string | null)
|
|
badgeClass?: string
|
|
label?: string
|
|
isSmall?: boolean
|
|
}>()
|
|
|
|
const emit = defineEmits<{
|
|
(e: 'click', event: MouseEvent): void
|
|
}>()
|
|
const overlayValue = computed(() =>
|
|
typeof iconBadge === 'function' ? (iconBadge() ?? '') : iconBadge
|
|
)
|
|
const shouldShowBadge = computed(() => !!overlayValue.value)
|
|
const computedTooltip = computed(() => st(tooltip, tooltip) + tooltipSuffix)
|
|
</script>
|
|
|
|
<style>
|
|
.side-bar-button-icon {
|
|
font-size: var(--sidebar-icon-size) !important;
|
|
}
|
|
|
|
.side-bar-button-selected {
|
|
background-color: var(--interface-panel-selected-surface);
|
|
color: var(--content-hover-fg);
|
|
}
|
|
.side-bar-button:hover {
|
|
background-color: var(--interface-panel-hover-surface);
|
|
color: var(--content-hover-fg);
|
|
}
|
|
|
|
.side-bar-button-selected .side-bar-button-icon {
|
|
font-size: var(--sidebar-icon-size) !important;
|
|
}
|
|
</style>
|
|
|
|
<style scoped>
|
|
@reference '../../assets/css/style.css';
|
|
|
|
.side-bar-button {
|
|
width: var(--sidebar-width);
|
|
height: var(--sidebar-item-height);
|
|
border-radius: 0;
|
|
flex-shrink: 0;
|
|
}
|
|
|
|
.side-tool-bar-end .side-bar-button {
|
|
height: var(--sidebar-width);
|
|
}
|
|
|
|
.side-bar-button-content {
|
|
@apply flex flex-col items-center gap-2;
|
|
}
|
|
|
|
.side-bar-button-label {
|
|
@apply text-[10px] text-center;
|
|
line-height: 1;
|
|
}
|
|
|
|
.comfyui-body-left .side-bar-button.side-bar-button-selected,
|
|
.comfyui-body-left .side-bar-button.side-bar-button-selected:hover {
|
|
border-left: 4px solid var(--p-button-text-primary-color);
|
|
}
|
|
|
|
.comfyui-body-right .side-bar-button.side-bar-button-selected,
|
|
.comfyui-body-right .side-bar-button.side-bar-button-selected:hover {
|
|
border-right: 4px solid var(--p-button-text-primary-color);
|
|
}
|
|
</style>
|