Merge branch dev with rel-10.6#25844
Merged
40 commits merged intoJul 21, 2026
Merged
Conversation
…ion-coverage Improve framework and module documentation coverage
…-bulk-translation-index Fix bulk translation fallback in `MultiLingualObjectManager`
Merge branch rel-10.6 with rel-10.5
voloagent
marked this pull request as ready for review
July 21, 2026 07:49
voloagent
approved these changes
Jul 21, 2026
voloagent
enabled auto-merge
July 21, 2026 07:49
maliming
self-requested a review
July 21, 2026 07:52
Contributor
There was a problem hiding this comment.
Pull request overview
This auto-generated merge brings dev changes into rel-10.6, mainly updating MultiLingualObjects bulk-translation behavior tests and applying a broad set of documentation additions/clarifications across modules and framework guides.
Changes:
- Adjusted bulk translation selection expectations (including default-language / first-translation fallback) and added coverage for alignment + default-language preference.
- Simplified the bulk-translation fallback assignment in
MultiLingualObjectManager. - Large documentation refresh: new topic pages (e.g., IdentityModel clients, MVC JS clock API, Angular tree/title strategy, MemoryDb) and many clarifications/typo fixes; updated docs navigation.
Reviewed changes
Copilot reviewed 126 out of 127 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| framework/test/Volo.Abp.MultiLingualObjects.Tests/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager_Tests.cs | Expanded/adjusted bulk translation tests |
| framework/test/Volo.Abp.LuckyPenny.AutoMapper.Tests/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager_Tests.cs | Mirrors bulk translation test updates |
| framework/src/Volo.Abp.MultiLingualObjects/Volo/Abp/MultiLingualObjects/MultiLingualObjectManager.cs | Simplifies fallback translation assignment |
| docs/en/solution-templates/layered-web-application/deployment/identityserver-deployment.md | Clarifies legacy IdentityServer deployment |
| docs/en/release-info/migration-guides/identityserver4-step-by-step.md | Refines IdentityServer4 migration steps |
| docs/en/release-info/migration-guides/identityserver-to-openiddict.md | Updates IdentityServer→OpenIddict guide wording |
| docs/en/multi-lingual-entities.md | Replaces stub with Multi-Lingual Objects guide |
| docs/en/modules/virtual-file-explorer.md | Updates NPM version guidance |
| docs/en/modules/tenant-management.md | Adds Angular UI extensibility + event notes |
| docs/en/modules/operation-rate-limiting.md | Adds edge-case/security and extensibility notes |
| docs/en/modules/identity/user-synchronization.md | New: user lookup/sync guidance |
| docs/en/modules/identity/session-management.md | Fixes link + clarifies cache-hit behavior |
| docs/en/modules/identity/password-history.md | Adds options/retention documentation |
| docs/en/modules/identity/oauth-login.md | Adds claim-mapping section |
| docs/en/modules/identity/ldap.md | Fixes sample code typos / async usage |
| docs/en/modules/identity/import-external-users.md | Documents matching behavior |
| docs/en/modules/identity.md | Adds role assignment/security clarifications |
| docs/en/modules/cms-kit/tags.md | Updates DB properties naming |
| docs/en/modules/cms-kit/reactions.md | Clarifies behavior + DB properties naming |
| docs/en/modules/cms-kit/ratings.md | Clarifies behavior + DB properties naming |
| docs/en/modules/cms-kit/pages.md | Adds caching/security notes |
| docs/en/modules/cms-kit/menus.md | Fixes image path + adds behavior notes |
| docs/en/modules/cms-kit/marked-items.md | Updates links + adds behavior notes |
| docs/en/modules/cms-kit/index.md | Adds feature-layer + Angular admin UI notes |
| docs/en/modules/cms-kit/global-resources.md | Adds caching + security notes |
| docs/en/modules/cms-kit/dynamic-widget.md | Clarifies parsing/error behavior |
| docs/en/modules/cms-kit/comments.md | Clarifies options + behavior + security |
| docs/en/modules/cms-kit/blogging.md | Adds feature prerequisites + behavior notes |
| docs/en/modules/cms-kit-pro/url-forwarding.md | Expands middleware/options documentation |
| docs/en/modules/cms-kit-pro/poll.md | Clarifies widget behavior + options |
| docs/en/modules/cms-kit-pro/faq.md | Updates FAQ model + services |
| docs/en/modules/cms-kit-pro/contact-form.md | Clarifies widget/options/settings |
| docs/en/modules/chat.md | Expands permissions/settings + Angular/Blazor docs |
| docs/en/modules/background-jobs.md | Updates DB properties naming |
| docs/en/modules/audit-logging.md | Adds extension/persistence limit notes |
| docs/en/modules/account/shared-user-accounts.md | Adds invitation token + host-only rules |
| docs/en/modules/account/passkey.md | Adds default/limit/enablement notes |
| docs/en/modules/account.md | Adds settings + extensibility notes |
| docs/en/modules/account-pro.md | Adds new options + email-login details |
| docs/en/framework/ui/react/permission-management.md | Adds framework-agnostic config client info |
| docs/en/framework/ui/react/authorization.md | Adds lower-level OIDC client info |
| docs/en/framework/ui/mvc-razor-pages/overall.md | Adds status-specific error view mapping |
| docs/en/framework/ui/mvc-razor-pages/javascript-api/index.md | Adds Clock API entry |
| docs/en/framework/ui/mvc-razor-pages/javascript-api/clock.md | New: MVC JavaScript clock API |
| docs/en/framework/ui/maui/index.md | Updates target framework examples |
| docs/en/framework/ui/blazor/global-scripts-styles.md | Clarifies global assets options |
| docs/en/framework/ui/blazor/authentication.md | Adds authentication URL options |
| docs/en/framework/ui/angular/tree-component.md | New: Angular tree component guide |
| docs/en/framework/ui/angular/title-strategy.md | New: Angular title strategy guide |
| docs/en/framework/ui/angular/testing.md | Adds permission mocking guidance |
| docs/en/framework/ui/angular/ssr-configuration.md | Adds storage + auth change notes |
| docs/en/framework/ui/angular/permission-management.md | Updates selector rules + sample |
| docs/en/framework/ui/angular/oauth-module.md | Updates standalone setup + registered services |
| docs/en/framework/ui/angular/modifying-the-menu.md | Fixes route provider sample |
| docs/en/framework/ui/angular/lookup-search-component.md | New: lookup search component guide |
| docs/en/framework/ui/angular/localization.md | Adds async pipe + locale builder guidance |
| docs/en/framework/ui/angular/list-service.md | Updates debounce + paging result fields |
| docs/en/framework/ui/angular/http-requests.md | Updates RestService error handling description |
| docs/en/framework/ui/angular/http-error-handling.md | Updates standalone config samples/imports |
| docs/en/framework/ui/angular/datetime-format-pipe.md | Rewrites date/time + timezone guidance |
| docs/en/framework/ui/angular/component-replacement.md | Updates locale registration note |
| docs/en/framework/ui/angular/commercial-ui.md | New: commercial UI components guide |
| docs/en/framework/real-time/signalr.md | Adds dynamic-claims interval option |
| docs/en/framework/infrastructure/virtual-file-system.md | Adds dynamic file provider section |
| docs/en/framework/infrastructure/text-templating/index.md | Adds default engine configuration |
| docs/en/framework/infrastructure/string-encryption.md | Fixes AES IV/key size guidance |
| docs/en/framework/infrastructure/sms-sending.md | Updates types + adds provider docs |
| docs/en/framework/infrastructure/settings.md | Documents decrypt-failure behavior option |
| docs/en/framework/infrastructure/object-to-object-mapping.md | Clarifies AutoMapper max depth option |
| docs/en/framework/infrastructure/mail-kit.md | Clarifies default socket options |
| docs/en/framework/infrastructure/json.md | Adds IObjectSerializer section |
| docs/en/framework/infrastructure/interceptors.md | Documents disabling class interceptors |
| docs/en/framework/infrastructure/features.md | Fixes interceptor doc link |
| docs/en/framework/infrastructure/event-bus/distributed/rabbitmq.md | Adds ExchangeType option docs |
| docs/en/framework/infrastructure/event-bus/distributed/index.md | Adds inbox/outbox filter + retry docs |
| docs/en/framework/infrastructure/event-bus/distributed/azure.md | Adds ServiceBus disable option docs |
| docs/en/framework/infrastructure/current-user.md | Adds Name/Surname + ICurrentClient + contributor docs |
| docs/en/framework/infrastructure/csrf-anti-forgery.md | Adds issuer normalization option docs |
| docs/en/framework/infrastructure/blob-storing/database.md | Adds streaming/mapping/property docs |
| docs/en/framework/infrastructure/background-workers/hangfire.md | Adds adapter timezone/queue options docs |
| docs/en/framework/infrastructure/background-jobs/index.md | Fixes sample code typo |
| docs/en/framework/infrastructure/audit-logging.md | Fixes links + option name docs |
| docs/en/framework/fundamentals/validation.md | Updates interceptor link + adds enable override |
| docs/en/framework/fundamentals/options.md | Adds dynamic options manager docs |
| docs/en/framework/fundamentals/logging.md | Adds Serilog enricher options docs |
| docs/en/framework/fundamentals/exception-handling.md | Adds data-to-client + logger exclusion docs |
| docs/en/framework/fundamentals/dependency-injection.md | Fixes interceptor doc link |
| docs/en/framework/fundamentals/caching.md | Adds hybrid cache docs + KeyPrefix default |
| docs/en/framework/fundamentals/application-startup.md | Adds config builder option details |
| docs/en/framework/data/mongodb/index.md | Adds DateTime serialization + client settings docs |
| docs/en/framework/data/memorydb/index.md | New: MemoryDb provider guide |
| docs/en/framework/data/entity-framework-core/index.md | Fixes async API references |
| docs/en/framework/architecture/modularity/extending/module-entity-extensions.md | Adds conditional availability policies |
| docs/en/framework/architecture/modularity/basics.md | Adds lifecycle contributor docs |
| docs/en/framework/architecture/domain-driven-design/unit-of-work.md | Fixes Timeout naming + links |
| docs/en/framework/architecture/domain-driven-design/repositories.md | Notes obsolete WithDetails overload |
| docs/en/framework/api-development/swagger.md | Adds enum/schema ID helpers |
| docs/en/framework/api-development/identitymodel-clients.md | New: IdentityModel clients guide |
| docs/en/framework/api-development/dynamic-csharp-clients.md | Adds pre-send + converter hooks docs |
| docs/en/framework/api-development/auto-controllers.md | Documents ignored URL suffixes option |
| docs/en/docs-nav.json | Adds new docs to navigation |
Comment on lines
+155
to
+159
| //if the src has no translations, don't try to find a translation | ||
| if (translations.Any() && res[index] == null) | ||
| { | ||
| var translation = res[index]; | ||
| if (translation != null) | ||
| { | ||
| continue; | ||
| } | ||
| translation = translations.FirstOrDefault(pt => pt.Language == defaultLanguage); | ||
| if (translation != null) | ||
| { | ||
| res[index] = translation; | ||
| } | ||
| else | ||
| { | ||
| res[index] = translations.FirstOrDefault(); | ||
| } | ||
| res[index] = translations.FirstOrDefault(pt => pt.Language == defaultLanguage) ?? | ||
| translations.FirstOrDefault(); |
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
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.
This PR generated automatically to merge dev with rel-10.6. Please review the changed files before merging to prevent any errors that may occur.