fix(directive): translate by attribute (not binding) with translation key as value #1268
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
hosuaby
commented
Nov 19, 2020
| node.data = content; | ||
| } | ||
| } | ||
|
|
There was a problem hiding this comment.
Interface for listing all custom fileds used by directive
hosuaby
commented
Nov 19, 2020
| @@ -17,14 +40,12 @@ export class TranslateDirective implements AfterViewChecked, OnDestroy { | |||
| @Input() set translate(key: string) { | |||
| if (key) { | |||
| this.key = key; | |||
| this.checkNodes(); | |||
There was a problem hiding this comment.
Will be called by ngAfterViewChecked
hosuaby
commented
Nov 19, 2020
| } | ||
| } | ||
|
|
||
| @Input() set translateParams(params: any) { | ||
| if (!equals(this.currentParams, params)) { | ||
| this.currentParams = params; | ||
| this.checkNodes(true); |
There was a problem hiding this comment.
Will be called by ngAfterViewChecked
hosuaby
commented
Nov 19, 2020
| } else if (node.originalContent) { // the content seems ok, but the lang has changed | ||
| // the current content is the translation, not the key, use the last real content as key | ||
| key = node.originalContent.trim(); | ||
| } else if (content !== node.currentValue) { |
There was a problem hiding this comment.
This code block completelly diplucates the first one
hosuaby
commented
Nov 19, 2020
|
|
||
| @Injectable() |
hosuaby
commented
Nov 19, 2020
| import {ComponentFixture, TestBed} from '@angular/core/testing'; | ||
| import {TranslateModule, TranslateService} from '../src/public_api'; | ||
|
|
||
| @Injectable() |
There was a problem hiding this comment.
Compoenent not need to be injectable.
hosuaby
changed the title
hosuaby
changed the title
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.
Fix for angular 9 & 10
This PR fixes the behaiviour of
TranslateDirectivewhen it is used as a simple attributetranslate(not attribute binding[translate]) with value and translated element already contains some text. Example:Currently (without this fix) this code will result in text translated twice. If value for
'TEST'in english is "This is a test", after directive is executed, value of #attributeWithValue will be "This is a testThis is a test".There was no such problem while using ng-translate with Angular 8. But since Angular 9 it appeared.
This PR also contains some refactorings.