You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Commit cfb7fe5
Browse filesBrowse the repository at this point in the historyBrowse files
One collision, in src/utils/__tests__/jsonFileRecovery.test.ts, at the import of
../jsonFileRecovery. The three stages of that path were base
1bd90d8, trunk ce33e73
and head c2dc472.
Hunk 1, the only conflicted hunk: the trunk side was kept. Its spelling
import { recoverInterruptedReplacement, deleteJsonFile, recoverMissingJsonFile }
was taken as-is, and this branch's own import of LockKeyWalkIncompleteError and
resolveLockKey from services/file-safety/safeWriteText was re-landed below it,
because the three delete-side rows this lane added assert the fail-closed key
resolution that the merged module still has. The branch's spelling of the shared
import line, which named two exports rather than three, was dropped; nothing else
of either side was dropped. The trunk version of the file is a verbatim
subsequence of the result, and every line of the branch version survives except
that one import line.
src/utils/jsonFileRecovery.ts auto-merged: the branch's key resolution in
deleteJsonFile and the trunk's AmbiguousBackupRecencyError tie refusal in
recoverInterruptedReplacement sit in disjoint regions, 45 added and 2 removed
lines against the pre-refresh head.
No suppression added and no suppression count raised.
Copy file name to clipboardExpand all lines: .roo/rules-translate/001-general-rules.md
+5-1Lines changed: 5 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -30,7 +30,10 @@
30
30
# 4. WEBVIEW UI LOCALIZATION (webview-ui/src/)
31
31
32
32
- Located in webview-ui/src/i18n/locales/
33
-
- Uses standard React i18next patterns with the useTranslation hook
33
+
- Use `useAppTranslation` from `@src/i18n/TranslationContext`, not react-i18next's `useTranslation` (ESLint enforces this). It returns `{ t, language }`; switching languages belongs to the provider, so the i18next instance is not exposed:
- Always pass that `t` to `Trans` (`<Trans t={t} i18nKey="..." />`); `Trans` does not follow language changes on its own (ESLint enforces this)
36
+
- Never use the global `t` from `i18next` (`i18next.t`); memoized output would keep showing the previous language after a switch (ESLint enforces this). Pass `t` (and `language` for dates) to helpers instead, as `utils/format.ts` and `utils/validate.ts` do
34
37
- All user interface strings should be internationalized
35
38
- Always use the Trans component with named components for text with embedded components
Copy file name to clipboardExpand all lines: .roo/skills/roo-translation/SKILL.md
+5-1Lines changed: 5 additions & 1 deletion
Display the source diff
Display the rich diff
Original file line number
Diff line number
Diff line change
@@ -70,7 +70,10 @@ This guidance file is loaded at runtime and should be consulted for the latest b
70
70
## WebView UI Localization (webview-ui/src/)
71
71
72
72
- Located in `webview-ui/src/i18n/locales/`
73
-
- Uses standard React i18next patterns with the `useTranslation` hook
73
+
- Use `useAppTranslation` from `@src/i18n/TranslationContext`, not react-i18next's `useTranslation` (ESLint enforces this). It returns `{ t, language }`; switching languages belongs to the provider, so the i18next instance is not exposed:
- Always pass that `t` to `Trans` (`<Trans t={t} i18nKey="..." />`); `Trans` does not follow language changes on its own (ESLint enforces this)
76
+
- Never use the global `t` from `i18next` (`i18next.t`); memoized output would keep showing the previous language after a switch (ESLint enforces this). Pass `t` (and `language` for dates) to helpers instead, as `utils/format.ts` and `utils/validate.ts` do
74
77
- All user interface strings should be internationalized
75
78
- Always use the `Trans` component with named components for text with embedded components
0 commit comments