202604 upstream merge#255
Merged
Merged
Conversation
this allows for example to make the replaced parts to use additional html markup:
```js
selection.call(t.append('stringId', {
key1: 'replacementString',
key2: sel => sel.append('a')
.attr('href', 'https://example.com')
.text(…);
})
```
* fields * commit.js / uploader * conflicts resolution pane * contributors list
(left are: intro modules, and situations where markup is passed through `marked` which should sanitize the content sufficiently)
Bumps [netlify-cli](https://github.com/netlify/cli) from 24.0.1 to 24.1.0. - [Release notes](https://github.com/netlify/cli/releases) - [Changelog](https://github.com/netlify/cli/blob/main/CHANGELOG.md) - [Commits](netlify/cli@v24.0.1...v24.1.0) --- updated-dependencies: - dependency-name: netlify-cli dependency-version: 24.1.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…okenize-replacements
Allow string replacements to use callback functions. This allows to implement replacement parts that can inject additional html markup:
```
selection.call(t.append('stringId', {
key1: 'replacementString',
key2: sel => sel.append('a')
.attr('href', 'https://example.com')
.text(…);
})
```
Further, it allows to have the correct locales on a replacement part if the respective substring is not yet translated in that locale.
cherry-picks commits: 48264e1 ce093c4 6253f62 Fix: Preset search bar linebreaking issue (openstreetmap#12053) fix duplicate strings/user images in upload dialog, fixes openstreetmap#12063 fix crash when a checkbox-field is rendered using a custom (non-yes/no) value, fixes openstreetmap#12078
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
4 participants
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.
No description provided.