) {
if (disabled) {
return (
- {children}
+ {children}
{disabledAccesibilityText ? (
{disabledAccesibilityText}
) : null}
@@ -51,7 +53,7 @@ export default function LeftMenuButton({
return (
)
} else {
@@ -63,7 +65,7 @@ export default function LeftMenuButton({
className="left-menu-button"
>
- {children}
+ {children}
)
}
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-compiler.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-compiler.tsx
index 8d7076ebd4..2eab7f25b5 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-compiler.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-compiler.tsx
@@ -34,6 +34,7 @@ export default function SettingsCompiler() {
]}
label={t('compiler')}
name="compiler"
+ translateOptions="no"
/>
)
}
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-document.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-document.tsx
index 839bd499eb..8655a63cfc 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-document.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-document.tsx
@@ -43,6 +43,7 @@ export default function SettingsDocument() {
options={validDocsOptions}
label={t('main_document')}
name="rootDocId"
+ translateOptions="no"
/>
)
}
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-editor-theme.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-editor-theme.tsx
index 5f9ad51869..870ce48ca1 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-editor-theme.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-editor-theme.tsx
@@ -40,6 +40,7 @@ export default function SettingsEditorTheme() {
options={options}
label={t('editor_theme')}
name="editorTheme"
+ translateOptions="no"
/>
)
}
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx
index 5a327093a4..a0c2ec49dc 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-font-family.tsx
@@ -29,6 +29,7 @@ export default function SettingsFontFamily() {
]}
label={t('font_family')}
name="fontFamily"
+ translateOptions="no"
/>
)
}
diff --git a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-menu-select.tsx b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-menu-select.tsx
index 6b1f06ec36..c48486ec1c 100644
--- a/services/web/frontend/js/features/editor-left-menu/components/settings/settings-menu-select.tsx
+++ b/services/web/frontend/js/features/editor-left-menu/components/settings/settings-menu-select.tsx
@@ -28,6 +28,7 @@ type SettingsMenuSelectProps = {
onChange: (val: T) => void
value?: T
disabled?: boolean
+ translateOptions?: 'yes' | 'no'
}
export default function SettingsMenuSelect({
@@ -39,6 +40,7 @@ export default function SettingsMenuSelect({
onChange,
value,
disabled = false,
+ translateOptions,
}: SettingsMenuSelectProps) {
const handleChange: ChangeEventHandler = useCallback(
event => {
@@ -95,6 +97,7 @@ export default function SettingsMenuSelect({
value={value?.toString()}
disabled={disabled}
ref={selectRef}
+ translate={translateOptions}
>
{options.map(option => (
)
}
diff --git a/services/web/frontend/js/features/editor-navigation-toolbar/components/online-users-widget.tsx b/services/web/frontend/js/features/editor-navigation-toolbar/components/online-users-widget.tsx
index 6188d5e8ea..e9d8f52506 100644
--- a/services/web/frontend/js/features/editor-navigation-toolbar/components/online-users-widget.tsx
+++ b/services/web/frontend/js/features/editor-navigation-toolbar/components/online-users-widget.tsx
@@ -60,6 +60,7 @@ function OnlineUsersWidget({
id="online-user"
description={user.name}
overlayProps={{ placement: 'bottom', trigger: ['hover', 'focus'] }}
+ tooltipProps={{ translate: 'no' }}
>
{/* OverlayTrigger won't fire unless UserIcon is wrapped in a span */}
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-doc.tsx b/services/web/frontend/js/features/file-tree/components/file-tree-doc.tsx
index 3b67073316..48006b0dee 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-doc.tsx
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-doc.tsx
@@ -28,6 +28,7 @@ function FileTreeDoc({
{...selectableEntityProps}
aria-label={name}
tabIndex={0}
+ translate="no"
>
{pathname}
@@ -41,6 +42,7 @@ function Changes({ pathnames, projectOps }: ChangesProps) {
{getProjectOpDoc(op)}
diff --git a/services/web/frontend/js/features/history/components/change-list/tag-tooltip.tsx b/services/web/frontend/js/features/history/components/change-list/tag-tooltip.tsx
index 18736c4f37..c766c4e25b 100644
--- a/services/web/frontend/js/features/history/components/change-list/tag-tooltip.tsx
+++ b/services/web/frontend/js/features/history/components/change-list/tag-tooltip.tsx
@@ -87,6 +87,7 @@ const ChangeTag = forwardRef(
className="history-version-badge"
data-testid="history-version-badge"
{...props}
+ translate={isPseudoCurrentStateLabel ? 'yes' : 'no'}
>
{isPseudoCurrentStateLabel
? t('history_label_project_current_state')
@@ -147,24 +148,32 @@ function TagTooltip({ label, currentUserId, showTooltip }: LabelBadgesProps) {
const isPseudoCurrentStateLabel = isPseudoLabel(label)
const currentLabelData = allLabels?.find(({ id }) => id === label.id)
- const labelOwnerName =
- currentLabelData && !isPseudoLabel(currentLabelData)
- ? currentLabelData.user_display_name
- : t('anonymous')
+ const isAnonymous = !currentLabelData || isPseudoLabel(currentLabelData)
+ const labelOwnerName = isAnonymous
+ ? t('anonymous')
+ : currentLabelData.user_display_name
+ const labelOwnerNameComponent = isAnonymous ? (
+ labelOwnerName
+ ) : (
+ {labelOwnerName}
+ )
return !isPseudoCurrentStateLabel ? (
- {t('history_label_created_by')} {labelOwnerName}
+ {t('history_label_created_by')} {labelOwnerNameComponent}