Skip to content

Commit 19f5efd

Browse files
committed
refactor: remove unrelated scope creep files from PR
Remove files unrelated to the Ollama improvements per review feedback: - flake.nix + flake.lock (Nix build system) - .roo/commands/ formatting changes - .roo/skills/ formatting changes - README.md whitespace change - apps/web-roo-code pricing page formatting - locales/*/README.md whitespace changes
1 parent 3c09ec5 commit 19f5efd

25 files changed

Lines changed: 74 additions & 515 deletions

File tree

.roo/commands/roo-resolve-conflicts.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Resolve merge conflicts for a specific pull request by analyzing git history, co
1111
1. **Provide a PR number** (e.g., `#123` or just `123`)
1212

1313
2. The workflow will automatically:
14-
- Fetch PR information (title, description, branches)
15-
- Checkout the PR branch
16-
- Rebase onto the target branch to reveal conflicts
17-
- Analyze and resolve conflicts using git history
14+
- Fetch PR information (title, description, branches)
15+
- Checkout the PR branch
16+
- Rebase onto the target branch to reveal conflicts
17+
- Analyze and resolve conflicts using git history
1818

1919
## Workflow Steps
2020

@@ -39,7 +39,6 @@ git status --porcelain | grep "^UU"
3939
### 3. Analyze Each Conflict
4040

4141
For each conflicted file:
42-
4342
- Read the conflict markers
4443
- Run `git blame` on conflicting sections
4544
- Fetch commit messages for context
@@ -48,7 +47,6 @@ For each conflicted file:
4847
### 4. Apply Resolution Strategy
4948

5049
Based on the analysis:
51-
5250
- **Bugfixes** generally take precedence over features
5351
- **Recent changes** are often more relevant (unless older is a security fix)
5452
- **Combine** non-conflicting changes when possible

.roo/commands/roo-translate.md

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,32 @@ Perform translation and localization tasks for the Roo Code extension. This comm
99
## Quick Start
1010

1111
1. **Identify the translation scope:**
12-
13-
- If a specific language code is provided (e.g., `de`, `zh-CN`), focus on that language
14-
- If `all` is specified, translate to all supported languages
15-
- If a string key is provided, locate and translate that specific string
16-
- If a file path is provided, work with that translation file
12+
- If a specific language code is provided (e.g., `de`, `zh-CN`), focus on that language
13+
- If `all` is specified, translate to all supported languages
14+
- If a string key is provided, locate and translate that specific string
15+
- If a file path is provided, work with that translation file
1716

1817
2. **Supported languages:** ca, de, en, es, fr, hi, id, it, ja, ko, nl, pl, pt-BR, ru, tr, vi, zh-CN, zh-TW
1918

2019
3. **Translation locations:**
21-
- Core Extension: `src/i18n/locales/`
22-
- WebView UI: `webview-ui/src/i18n/locales/`
20+
- Core Extension: `src/i18n/locales/`
21+
- WebView UI: `webview-ui/src/i18n/locales/`
2322

2423
## Workflow
2524

2625
1. If adding new strings:
27-
28-
- Add the English string first
29-
- Ask for confirmation before translating to other languages
30-
- Use `apply_diff` for efficient file updates
26+
- Add the English string first
27+
- Ask for confirmation before translating to other languages
28+
- Use `apply_diff` for efficient file updates
3129

3230
2. If updating existing strings:
33-
34-
- Identify all affected language files
35-
- Update English first, then propagate changes
31+
- Identify all affected language files
32+
- Update English first, then propagate changes
3633

3734
3. Validate your changes:
38-
```bash
39-
node scripts/find-missing-translations.js
40-
```
35+
```bash
36+
node scripts/find-missing-translations.js
37+
```
4138

4239
## Key Guidelines
4340

.roo/skills/roo-conflict-resolution/SKILL.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ Verify the resolution and prepare for commit:
105105

106106
## Git Commands Reference
107107

108-
| Command | Purpose |
109-
| ---------------------------------------------------------------- | ------------------------------------------------- |
110-
| `gh pr checkout [PR_NUMBER] --force` | Force checkout the PR branch |
111-
| `git fetch origin main` | Get the latest main branch |
112-
| `GIT_EDITOR=true git rebase origin/main` | Rebase current branch onto main (non-interactive) |
113-
| `git blame -L [start],[end] [commit] -- [file]` | Get commit information for specific lines |
114-
| `git show --format="%H%n%an%n%ae%n%ad%n%s%n%b" --no-patch [sha]` | Get commit metadata |
115-
| `git show [sha] -- [file]` | Get the actual changes made in a commit |
116-
| `git ls-files -u` | List unmerged files with stage information |
117-
| `GIT_EDITOR=true git rebase --continue` | Continue rebase after resolving conflicts |
108+
| Command | Purpose |
109+
|---------|---------|
110+
| `gh pr checkout [PR_NUMBER] --force` | Force checkout the PR branch |
111+
| `git fetch origin main` | Get the latest main branch |
112+
| `GIT_EDITOR=true git rebase origin/main` | Rebase current branch onto main (non-interactive) |
113+
| `git blame -L [start],[end] [commit] -- [file]` | Get commit information for specific lines |
114+
| `git show --format="%H%n%an%n%ae%n%ad%n%s%n%b" --no-patch [sha]` | Get commit metadata |
115+
| `git show [sha] -- [file]` | Get the actual changes made in a commit |
116+
| `git ls-files -u` | List unmerged files with stage information |
117+
| `GIT_EDITOR=true git rebase --continue` | Continue rebase after resolving conflicts |
118118

119119
## Best Practices
120120

@@ -141,12 +141,12 @@ Look beyond the immediate conflict to understand related changes in tests, docum
141141

142142
## Resolution Heuristics
143143

144-
| Category | Rule | Exception |
145-
| ------------------- | -------------------------------------------------- | --------------------------------------- |
146-
| Bugfix vs Feature | Bugfixes generally take precedence | When features include the fix |
147-
| Recent vs Old | More recent changes are often more relevant | When older changes are security patches |
148-
| Test Updates | Changes with test updates are likely more complete | - |
149-
| Formatting vs Logic | Logic changes take precedence over formatting | - |
144+
| Category | Rule | Exception |
145+
|----------|------|-----------|
146+
| Bugfix vs Feature | Bugfixes generally take precedence | When features include the fix |
147+
| Recent vs Old | More recent changes are often more relevant | When older changes are security patches |
148+
| Test Updates | Changes with test updates are likely more complete | - |
149+
| Formatting vs Logic | Logic changes take precedence over formatting | - |
150150

151151
## Common Pitfalls
152152

.roo/skills/roo-translation/SKILL.md

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ Localize all strings into the following locale files: ca, de, en, es, fr, hi, id
2929

3030
The VSCode extension has two main areas that require localization:
3131

32-
| Component | Path | Purpose |
33-
| ------------------ | ------------------------------ | ------------------------- |
34-
| **Core Extension** | `src/i18n/locales/` | Extension backend strings |
35-
| **WebView UI** | `webview-ui/src/i18n/locales/` | User interface strings |
32+
| Component | Path | Purpose |
33+
|-----------|------|---------|
34+
| **Core Extension** | `src/i18n/locales/` | Extension backend strings |
35+
| **WebView UI** | `webview-ui/src/i18n/locales/` | User interface strings |
3636

3737
## Brand Voice, Tone, and Word Choice
3838

@@ -77,19 +77,17 @@ This guidance file is loaded at runtime and should be consulted for the latest b
7777
### Trans Component Example
7878

7979
Translation string:
80-
8180
```json
8281
"changeSettings": "You can always change this at the bottom of the <settingsLink>settings</settingsLink>"
8382
```
8483

8584
React component usage:
86-
8785
```tsx
8886
<Trans
89-
i18nKey="welcome:telemetry.changeSettings"
90-
components={{
91-
settingsLink: <VSCodeLink href="#" onClick={handleOpenSettings} />,
92-
}}
87+
i18nKey="welcome:telemetry.changeSettings"
88+
components={{
89+
settingsLink: <VSCodeLink href="#" onClick={handleOpenSettings} />
90+
}}
9391
/>
9492
```
9593

@@ -107,21 +105,19 @@ React component usage:
107105

108106
1. First add or modify English strings, then ask for confirmation before translating to all other languages
109107
2. Use this process for each localization task:
110-
111-
1. Identify where the string appears in the UI/codebase
112-
2. Understand the context and purpose of the string
113-
3. Update English translation first
114-
4. Use the `search_files` tool to find JSON keys that are near new keys in English translations but do not yet exist in the other language files for `apply_diff` SEARCH context
115-
5. Create appropriate translations for all other supported languages utilizing the `search_files` result using `apply_diff` without reading every file
116-
6. Do not output the translated text into the chat, just modify the files
117-
7. Validate your changes with the missing translations script
108+
1. Identify where the string appears in the UI/codebase
109+
2. Understand the context and purpose of the string
110+
3. Update English translation first
111+
4. Use the `search_files` tool to find JSON keys that are near new keys in English translations but do not yet exist in the other language files for `apply_diff` SEARCH context
112+
5. Create appropriate translations for all other supported languages utilizing the `search_files` result using `apply_diff` without reading every file
113+
6. Do not output the translated text into the chat, just modify the files
114+
7. Validate your changes with the missing translations script
118115

119116
3. Flag or comment if an English source string is incomplete ("please see this...") to avoid truncated or unclear translations
120117

121118
4. For UI elements, distinguish between:
122-
123-
- Button labels: Use short imperative commands ("Save", "Cancel")
124-
- Tooltip text: Can be slightly more descriptive
119+
- Button labels: Use short imperative commands ("Save", "Cancel")
120+
- Tooltip text: Can be slightly more descriptive
125121

126122
5. Preserve the original perspective: If text is a user command directed at the software, ensure the translation maintains this direction
127123

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
- [简体中文](locales/zh-CN/README.md)
3636
- [繁體中文](locales/zh-TW/README.md)
3737
- ...
38-
</details>
38+
</details>
3939

4040
---
4141

apps/web-roo-code/src/app/pricing/page.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,11 @@ export default function PricingPage() {
291291
<li>To pay for Cloud Agents running time (${PRICE_CREDITS}/hour)</li>
292292
<li>
293293
To pay for AI model inference costs (
294-
<a href="/provider" target="_blank" rel="noopener noreferrer" className="underline">
294+
<a
295+
href="/provider"
296+
target="_blank"
297+
rel="noopener noreferrer"
298+
className="underline">
295299
varies by model
296300
</a>
297301
)

flake.lock

Lines changed: 0 additions & 61 deletions
This file was deleted.

0 commit comments

Comments
 (0)