chore: update origin to v21.2.10+sha-42d57c3#1163
Merged
lacolaco merged 66 commits intoangular:mainfrom Apr 29, 2026
Merged
Conversation
…/2-loading-error-placeholder
…/3-defer-triggers
Upstream PR 67201 integrated native {#id} support in heading.mts.
… insert new sections in English)
The 8 removals were English-only stylistic rewordings; effective change is purely additive (NOTE about zoneless + HELPFUL link).
…artial hybrid Tracking values for array fields: pure addition (English). Form submission / reset: existing-section API rewrite (FormRoot directive); replaced JP body with new English.
Removed Japanese translation of the relocated 'Route Loading Strategies' section (moved to loading-strategies.md upstream); preserved remaining translation.
Builder name rename, table cell expansions, and new lazy-loaded bundle section all translated inline.
Replace structural defer with hybrid: preserve previously translated docs-cards moved into Completed projects (Signal debugging in DevTools, Improve HMR, Zoneless Angular). Insert new English sections (AI experience, Compiler, Reactivity, Components, etc.) for follow-up translation. Remove deleted Future work section. Resolve textlint conjunction/joshi issues in restored Japanese text.
Special-prefix annotations (IMPORTANT:, TIP:, etc.) at line start are recognized as docs callouts by the adev build pipeline. Restore the uppercase English prefix in two files where the annotation had been translated: - making-requests.md: Tip: -> TIP: - 6-next-steps/README.md: 重要: -> IMPORTANT:
…ection.md
The Self example code block was updated upstream to use inject() with
the {self: true} option instead of @self() constructor injection. Mirror
the same change to the JA-side .md so the fenced code blocks stay in
sync.
Fixes surfaced by the new verify-migration.ts structural-marker check
(code-fence / heading / line-prefix-annotation positions must match
between .en.md and .md):
- directives/attribute-directives.md: remove stray blank line that
shifted the next heading +1; add trailing newline.
- directives/overview.md: same shape — extra blank line before the
'## Hosting a directive...' heading; add trailing newline.
- image-optimization.md L219: revert spurious 'NOTE:' annotation
prefix on a JA line whose EN counterpart is plain prose ('Note that
...') — the JA was rendering an extra docs callout absent from
upstream.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Sync angular-ja with upstream angular/angular @ v21.2.10+sha-42d57c3.
Migration breakdown
.mdfiles migrated (origin snapshot copy).en.mdfiles in 25 directories.en.{ts,html}files in 3 directoriesfix-generate-routes-explicit-id.patch(upstream PR 67201 integrated{#id}natively)Class-d hybrid restored (translation preserved + new sections handled)
English-as-is sections in the additive files are flagged for follow-up translation PRs.
Class-d-structural (full re-translation needed)
Existing translations diverge significantly; reset to English with
.md.bakbackup of the previous translation:Test plan
adev-ja/src/content(299 file pairs)