Fix GraphQL schema localization. #17041
Merged
Conversation
This file contains 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
|
This pull request has merge conflicts. Please resolve those before requesting a review. |
|
Fix conflict |
MikeAlhayek
requested changes
Nov 25, 2024
src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Services/SchemaService.cs
Show resolved
Hide resolved
src/OrchardCore.Modules/OrchardCore.Apis.GraphQL/Views/Admin/Index.cshtml
Show resolved
Hide resolved
src/OrchardCore.Modules/OrchardCore.Lists/GraphQL/ContainedInputObjectType.cs
Outdated
Show resolved
Hide resolved
src/OrchardCore.Modules/OrchardCore.Media/GraphQL/MediaAssetObjectType.cs
Outdated
Show resolved
Hide resolved
src/OrchardCore.Modules/OrchardCore.Queries/Sql/GraphQL/SqlQueryFieldTypeProvider.cs
Show resolved
Hide resolved
src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/WhereInputObjectGraphType.cs
Outdated
Show resolved
Hide resolved
src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/WhereInputObjectGraphType.cs
Show resolved
Hide resolved
src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/ContentItemWhereInput.cs
Outdated
Show resolved
Hide resolved
...rdCore/OrchardCore.ContentManagement.GraphQL/Queries/Types/DynamicPartWhereInputGraphType.cs
Outdated
Show resolved
Hide resolved
test/OrchardCore.Tests/Apis/GraphQL/ContentItemsFieldTypeTests.cs
Outdated
Show resolved
Hide resolved
…utObjectType.cs Co-authored-by: Mike Alhayek <[email protected]>
…jectType.cs Co-authored-by: Mike Alhayek <[email protected]>
…ryFieldTypeProvider.cs Co-authored-by: Mike Alhayek <[email protected]>
…QL/ElasticQueryFieldTypeProvider.cs Co-authored-by: Mike Alhayek <[email protected]>
…Types/ContentItemWhereInput.cs Co-authored-by: Mike Alhayek <[email protected]>
…ries/OrchardCore into gvkries/graphql-localization
…neQueryFieldTypeProvider.cs Co-authored-by: Mike Alhayek <[email protected]>
MikeAlhayek
requested changes
Nov 26, 2024
src/OrchardCore.Modules/OrchardCore.ContentFields/GraphQL/Fields/ContentFieldsProvider.cs
Outdated
Show resolved
Hide resolved
src/OrchardCore/OrchardCore.Apis.GraphQL.Abstractions/Queries/WhereInputObjectGraphType.cs
Show resolved
Hide resolved
src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemsFieldType.cs
Outdated
Show resolved
Hide resolved
…ds/ContentFieldsProvider.cs Co-authored-by: Mike Alhayek <[email protected]>
…ContentItemsFieldType.cs Co-authored-by: Mike Alhayek <[email protected]>
MikeAlhayek
approved these changes
Nov 26, 2024
Comment on lines
107
to
110
| Field<StringGraphType>("fileName").Description(S["the file name of the media file item"]).Resolve(x => x.Source.FileName); | ||
| Field<StringGraphType>("path").Description(S["the path of the media file item"]).Resolve(x => x.Source.Path); | ||
| Field<StringGraphType>("url").Description(S["the url name of the media file item"]).Resolve(x => x.Source.Url); | ||
| Field<StringGraphType>("mediaText").Description(S["the media text of the file item"]).Resolve(x => x.Source.MediaText); |
There was a problem hiding this comment.
Suggested change
| Field<StringGraphType>("fileName").Description(S["the file name of the media file item"]).Resolve(x => x.Source.FileName); | |
| Field<StringGraphType>("path").Description(S["the path of the media file item"]).Resolve(x => x.Source.Path); | |
| Field<StringGraphType>("url").Description(S["the url name of the media file item"]).Resolve(x => x.Source.Url); | |
| Field<StringGraphType>("mediaText").Description(S["the media text of the file item"]).Resolve(x => x.Source.MediaText); | |
| Field<StringGraphType>("fileName").Description(S["the file name of the media file item"]).Resolve(x => x.Source.FileName); | |
| Field<StringGraphType>("path") | |
| .Description(S["the path of the media file item"]) | |
| .Resolve(x => x.Source.Path); | |
| Field<StringGraphType>("url") | |
| .Description(S["the url name of the media file item"]) | |
| .Resolve(x => x.Source.Url); | |
| Field<StringGraphType>("mediaText") | |
| .Description(S["the media text of the file item"]) | |
| .Resolve(x => x.Source.MediaText); |
|
Very well done. You navigated most of the pitfalls of localization we can have in OC. |
With the help of @MikeAlhayek 🤗 |
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.
The GraphQL schema is cached the first time it is being build and only one instance and language is being cached at all. This means that the schema language depends on the first request and does not reflect the currents user language at all.
I have now added a per-culture cache of the schema.
Additionally, parts of the schema are not localized at all. You may end up with a mixture of different languages in the schema. I added localization to different parts of the schema, to make this more complete.
Fixes #2765.