Skip to content

Fix internationalization issues on settings and prompt pages, and resolve rules file accessibility #1723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mrubens merged 3 commits into from
Mar 17, 2025
Merged

Fix internationalization issues on settings and prompt pages, and resolve rules file accessibility #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
02b7843
fix missing settings and apiOptions
feifei325 Mar 17, 2025
104292e
Resolving Conflicts
feifei325 Mar 17, 2025
05c7245
Resolving Conflicts
feifei325 Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 83 additions & 8 deletions webview-ui/src/components/prompts/PromptsView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { vscode } from "../../utils/vscode"
import { Tab, TabContent, TabHeader } from "../common/Tab"
import i18next from "i18next"
import { useAppTranslation } from "../../i18n/TranslationContext"
import { Trans } from "react-i18next"

// Get all available groups that should show in prompts view
const availableGroups = (Object.keys(TOOL_GROUPS) as ToolGroup[]).filter((group) => !TOOL_GROUPS[group].alwaysAvailable)
Expand Down Expand Up @@ -781,10 +782,38 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {
color: "var(--vscode-descriptionForeground)",
marginTop: "5px",
}}>
{t("prompts:customInstructions.loadFromFile", {
modeName: getCurrentMode()?.name || "Code",
modeSlug: getCurrentMode()?.slug || "code",
})}
<Trans
i18nKey="prompts:customInstructions.loadFromFile"
values={{
mode: getCurrentMode()?.name || "Code",
slug: getCurrentMode()?.slug || "code",
}}
components={{
span: (
<span
style={{
color: "var(--vscode-textLink-foreground)",
cursor: "pointer",
textDecoration: "underline",
}}
onClick={() => {
const currentMode = getCurrentMode()
if (!currentMode) return

// Open or create an empty file
vscode.postMessage({
type: "openFile",
text: `./.clinerules-${currentMode.slug}`,
values: {
create: true,
content: "",
},
})
}}
/>
),
}}
/>
</div>
</div>
</div>
Expand Down Expand Up @@ -866,9 +895,32 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {

{isSystemPromptDisclosureOpen && (
<div className="text-xs text-vscode-descriptionForeground mt-2 ml-5">
{t("prompts:advancedSystemPrompt.description", {
modeSlug: getCurrentMode()?.slug || "code",
})}
<Trans
i18nKey="prompts:advancedSystemPrompt.description"
values={{
slug: getCurrentMode()?.slug || "code",
}}
components={{
span: (
<span
className="text-vscode-textLink-foreground cursor-pointer underline"
onClick={() => {
const currentMode = getCurrentMode()
if (!currentMode) return

vscode.postMessage({
type: "openFile",
text: `./.roo/system-prompt-${currentMode.slug}`,
values: {
create: true,
content: "",
},
})
}}
/>
),
}}
/>
</div>
)}
</div>
Expand Down Expand Up @@ -900,7 +952,30 @@ const PromptsView = ({ onDone }: PromptsViewProps) => {
data-testid="global-custom-instructions-textarea"
/>
<div className="text-xs text-vscode-descriptionForeground mt-1.5 mb-10">
{t("prompts:globalCustomInstructions.loadFromFile")}
<Trans
i18nKey="prompts:globalCustomInstructions.loadFromFile"
components={{
span: (
<span
style={{
color: "var(--vscode-textLink-foreground)",
cursor: "pointer",
textDecoration: "underline",
}}
onClick={() =>
vscode.postMessage({
type: "openFile",
text: "./.clinerules",
values: {
create: true,
content: "",
},
})
}
/>
),
}}
/>
</div>
</div>

Expand Down
Loading