Skip to content
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

Add unique fieldName validation for group controls #866

Merged

Conversation

mournfulCoroner
Copy link
Contributor

@mournfulCoroner mournfulCoroner commented Apr 11, 2024

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.control-dialog.edit (ru)
dash.control-dialog.edit (en)

Wait for the reviewers to check your changes in Weblate and try running github action again.

Copy link
Contributor

github-actions bot commented Apr 11, 2024

📦 Statoscope quick diff with main-branch:

⏱ Build time: -4.5 sec (-2.86%)

⚖️ Initial size: 7.27 kb (0.3%)

🕵️ Validation errors: 0

Full Statoscope report could be found here ↗️

Copy link
Contributor

github-actions bot commented Apr 11, 2024

E2E Report is ready.

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.control-dialog.edit (ru)
dash.control-dialog.edit (en)

Wait for the reviewers to check your changes in Weblate and try running github action again.

@robot-charts
Copy link
Collaborator

i18n-check

The following components have not been translated

dash.control-dialog.edit (ru)
dash.control-dialog.edit (en)

Wait for the reviewers to check your changes in Weblate and try running github action again.

flops
flops previously approved these changes Apr 12, 2024
dtikhonova and others added 2 commits April 15, 2024 08:25
Currently translated at 100.0% (89 of 89 strings)

Translation: DataLens/dash.control-dialog.edit__866
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-9511-add-unique-field-name-validation-for-group-866/dash-control-dialog-edit-866/ru/
Currently translated at 100.0% (89 of 89 strings)

Translation: DataLens/dash.control-dialog.edit__866
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-9511-add-unique-field-name-validation-for-group-866/dash-control-dialog-edit-866/en/
dtikhonova and others added 2 commits April 15, 2024 09:03
Currently translated at 100.0% (89 of 89 strings)

Translation: DataLens/dash.control-dialog.edit__866
Translate-URL: https://weblate.gravity-ui.com/projects/datalens/charts-9511-add-unique-field-name-validation-for-group-866/dash-control-dialog-edit-866/en/
Co-authored-by: Darya Tikhonova <tihonova-d@yandex-team.ru>
Co-authored-by: Matthew Casserly <matveymc@yandex-team.ru>
@robot-charts
Copy link
Collaborator

i18n-check

Errors occurred when merging changes from your branch with the Weblate branch.
Rebasing (1/3)
dropping de1df3de9c3871a406572ab26dd3a18e59d7dc8b Translated using Weblate (Russian) -- patch contents already upstream
Rebasing (2/3)
Auto-merging src/i18n-keysets/dash.control-dialog.edit/en.json
CONFLICT (content): Merge conflict in src/i18n-keysets/dash.control-dialog.edit/en.json
error: could not apply db75d358... Translated using Weblate (English)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply db75d358... Translated using Weblate (English)
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-9511-Add-unique-fieldName-validation-for-group
  1. Add Weblate as remote. And remove previous upstream with the same name:
git remote remove weblate 2> /dev/null
git remote add weblate https://weblate.gravity-ui.com/git/datalens/charts-9511-add-unique-field-name-validation-for-group-866/chartkit-866/
git -c http.sslVerify=false remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-9511-Add-unique-fieldName-validation-for-group
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@mournfulCoroner mournfulCoroner merged commit 1d7733d into main Apr 15, 2024
8 checks passed
@mournfulCoroner mournfulCoroner deleted the CHARTS-9511-Add-unique-fieldName-validation-for-group branch April 15, 2024 12:04
melikhov-dev pushed a commit that referenced this pull request Apr 26, 2024
Co-authored-by: Darya Tikhonova <tihonova-d@yandex-team.ru>
Co-authored-by: Matthew Casserly <matveymc@yandex-team.ru>
Co-authored-by: WeblateGravity <150622038+WeblateGravity@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants