Repository navigation
fix(compiler): fix i18n IDs generation, add a migration tool #17638
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
12d930c
refactor(compiler): add a version to the i18n serializers
ocombe a3c6a25
test(compiler): add tests for i18n serializers V1
vicb ed6b306
refactor(compiler): add a version parameter for i18n extraction
ocombe 2f07c4a
test(compiler): add integration tests for extraction
vicb 8ac8b82
refactor(compiler): misc i18n refactoring
vicb 6a4960a
feat(compiler): generate a mapping from i18n v1 id to v0 ids
ocombe f9e9d51
feat(compiler): add an `@internal` function to return the message con…
vicb d297238
feat(compiler): compute i18n conflicts
ocombe c572371
refactor(compiler): ApplyMapping - to finish
vicb e3120af
feat(compiler): resolve i18n migration conflicts
ocombe e4d7184
feat(compiler-cli): create a `migrate_i18n_0to1` script
ocombe acce4cb
feat(compiler-cli): add ngtools_api entry for the migration script
ocombe 0d9a67a
feat(core): adding I18N_VERSION token for jit compiler
ocombe 0f842fd
feat(compiler-cli): adding i18nVersion to ngc
ocombe ccb2ae9
feat(compiler-cli): adding mapping option for migration tool
ocombe File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
44 changes: 44 additions & 0 deletions
44
packages/compiler-cli/integrationtest/src/mapping_v1_to_v0.json
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| { | ||
| "8136548302122759730": { | ||
| "ids": [ | ||
| "76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" | ||
| ], | ||
| "sources": [ | ||
| { | ||
| "filePath": "src/basic.ts", | ||
| "startLine": 1, | ||
| "startCol": 44, | ||
| "endLine": 1, | ||
| "endCol": 44 | ||
| } | ||
| ] | ||
| }, | ||
| "3492007542396725315": { | ||
| "ids": [ | ||
| "65cc4ab3b4c438e07c89be2b677d08369fb62da2" | ||
| ], | ||
| "sources": [ | ||
| { | ||
| "filePath": "src/basic.ts", | ||
| "startLine": 5, | ||
| "startCol": 35, | ||
| "endLine": 5, | ||
| "endCol": 35 | ||
| } | ||
| ] | ||
| }, | ||
| "126808141597411718": { | ||
| "ids": [ | ||
| "b0a17f08a4bd742b2acf39780c257c2f519d33ed" | ||
| ], | ||
| "sources": [ | ||
| { | ||
| "filePath": "node_modules/third_party/other_comp.d.ts", | ||
| "startLine": 1, | ||
| "startCol": 11, | ||
| "endLine": 2, | ||
| "endCol": 11 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
23 changes: 23 additions & 0 deletions
23
packages/compiler-cli/integrationtest/src/messages_v0.fr.xlf
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"> | ||
| <file source-language="en" datatype="plaintext" original="ng2.template" target-language="fr"> | ||
| <body> | ||
| <trans-unit id="76e1eccb1b772fa9f294ef9c146ea6d0efa8a2d4" datatype="html"> | ||
| <source>translate me</source> | ||
| <target>traduis moi</target> | ||
| <note priority="1" from="description">desc</note> | ||
| <note priority="1" from="meaning">meaning</note> | ||
| </trans-unit> | ||
| <trans-unit id="65cc4ab3b4c438e07c89be2b677d08369fb62da2" datatype="html"> | ||
| <source>Welcome</source> | ||
| <target>Bienvenue</target> | ||
| </trans-unit> | ||
| <trans-unit id="b0a17f08a4bd742b2acf39780c257c2f519d33ed" datatype="html"> | ||
| <source>other-3rdP-component | ||
| multi-lines</source> | ||
| <target>autre-3rdP-component | ||
| multi-lignes</target> | ||
| </trans-unit> | ||
| </body> | ||
| </file> | ||
| </xliff> |
23 changes: 23 additions & 0 deletions
23
packages/compiler-cli/integrationtest/src/messages_v1.fr.xlf
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2"> | ||
| <file source-language="en" datatype="plaintext" original="ng2.template" target-language="fr"> | ||
| <body> | ||
| <trans-unit id="8136548302122759730" datatype="html"> | ||
| <source>translate me</source> | ||
| <target>traduis moi</target> | ||
| <note priority="1" from="description">desc</note> | ||
| <note priority="1" from="meaning">meaning</note> | ||
| </trans-unit> | ||
| <trans-unit id="3492007542396725315" datatype="html"> | ||
| <source>Welcome</source> | ||
| <target>Bienvenue</target> | ||
| </trans-unit> | ||
| <trans-unit id="126808141597411718" datatype="html"> | ||
| <source>other-3rdP-component | ||
| multi-lines</source> | ||
| <target>autre-3rdP-component | ||
| multi-lignes</target> | ||
| </trans-unit> | ||
| </body> | ||
| </file> | ||
| </xliff> |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you create an issue for this bug as discussed in the shared doc ? (startCol = endCol)