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

Remove i18n keys with empty strings #460

Merged
merged 1 commit into from
Jan 12, 2024

Conversation

korvin89
Copy link
Contributor

No description provided.

@korvin89 korvin89 force-pushed the CHARTS-8979-remove-unused-i18n-keys branch from fbaa3ee to 3a5fe3c Compare January 12, 2024 16:28
@robot-charts
Copy link
Collaborator

i18n-check
Please merge the Pull Request with the changes from Weblate into your branch.

@robot-charts
Copy link
Collaborator

i18n-check
Errors occurred when merging changes from your branch with the Weblate branch.

Rebasing (1/1)
Auto-merging .github/workflows/i18n-check.yml
CONFLICT (add/add): Merge conflict in .github/workflows/i18n-check.yml
Auto-merging src/i18n-keysets/chartkit.menu.inspector/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu.inspector/en.json
Auto-merging src/i18n-keysets/chartkit.menu.inspector/keyset.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu.inspector/keyset.json
Auto-merging src/i18n-keysets/chartkit.menu.inspector/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/chartkit.menu.inspector/ru.json
Auto-merging src/i18n-keysets/component.dialog-aliases.view/keyset.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-aliases.view/keyset.json
Auto-merging src/i18n-keysets/component.dialog-share.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-share.view/en.json
Auto-merging src/i18n-keysets/component.dialog-share.view/keyset.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-share.view/keyset.json
Auto-merging src/i18n-keysets/component.dialog-share.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.dialog-share.view/ru.json
Auto-merging src/i18n-keysets/component.relative-dates-picker.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.relative-dates-picker.view/en.json
Auto-merging src/i18n-keysets/component.relative-dates-picker.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/component.relative-dates-picker.view/ru.json
Auto-merging src/i18n-keysets/components.common.RangeDatepicker/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/components.common.RangeDatepicker/en.json
Auto-merging src/i18n-keysets/components.common.RangeDatepicker/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/components.common.RangeDatepicker/ru.json
Auto-merging src/i18n-keysets/connections.form/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/connections.form/en.json
Auto-merging src/i18n-keysets/connections.form/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/connections.form/ru.json
Auto-merging src/i18n-keysets/dash.widget-dialog.edit/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.widget-dialog.edit/en.json
Auto-merging src/i18n-keysets/dash.widget-dialog.edit/keyset.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.widget-dialog.edit/keyset.json
Auto-merging src/i18n-keysets/dash.widget-dialog.edit/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/dash.widget-dialog.edit/ru.json
Auto-merging src/i18n-keysets/editor.grid-scheme-select.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.grid-scheme-select.view/en.json
Auto-merging src/i18n-keysets/editor.grid-scheme-select.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/editor.grid-scheme-select.view/ru.json
Auto-merging src/i18n-keysets/main.service-settings.view/en.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/main.service-settings.view/en.json
Auto-merging src/i18n-keysets/main.service-settings.view/ru.json
CONFLICT (add/add): Merge conflict in src/i18n-keysets/main.service-settings.view/ru.json
Auto-merging src/server/modes/charts/plugins/datalens/d3/index.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/d3/index.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-x/d3.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-x/d3.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/bar-y/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/bar-y/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/helpers/axis.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/helpers/axis.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/line/d3.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/line/d3.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/line/highcharts.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/line/highcharts.ts
Auto-merging src/server/modes/charts/plugins/datalens/preparers/scatter/d3.ts
CONFLICT (add/add): Merge conflict in src/server/modes/charts/plugins/datalens/preparers/scatter/d3.ts
Auto-merging src/shared/modules/wizard-helpers.ts
CONFLICT (add/add): Merge conflict in src/shared/modules/wizard-helpers.ts
Auto-merging src/shared/modules/wizard/axis-mode.ts
CONFLICT (add/add): Merge conflict in src/shared/modules/wizard/axis-mode.ts
Auto-merging src/shared/schema/bi-converter/types/index.ts
CONFLICT (add/add): Merge conflict in src/shared/schema/bi-converter/types/index.ts
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Inspector/Sources/SourceSuccess/SourceSuccess.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Inspector/Sources/SourceSuccess/SourceSuccess.tsx
Auto-merging src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Inspector/Timings/Timings.tsx
CONFLICT (add/add): Merge conflict in src/ui/libs/DatalensChartkit/components/ChartKitBase/components/Header/components/Menu/Items/Inspector/Timings/Timings.tsx
Auto-merging src/ui/units/connections/components/custom-forms/GSheetsV2/components/Workspace/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/GSheetsV2/components/Workspace/utils.ts
Auto-merging src/ui/units/connections/components/custom-forms/GSheetsV2/types.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/GSheetsV2/types.ts
Auto-merging src/ui/units/connections/components/custom-forms/Yadocs/Yadocs.scss
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/Yadocs/Yadocs.scss
Auto-merging src/ui/units/connections/components/custom-forms/Yadocs/Yadocs.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/Yadocs/Yadocs.tsx
Auto-merging src/ui/units/connections/components/custom-forms/Yadocs/components/AdditionalTitleContent.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/Yadocs/components/AdditionalTitleContent.tsx
Auto-merging src/ui/units/connections/components/custom-forms/Yadocs/components/Workspace.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/Yadocs/components/Workspace.tsx
Auto-merging src/ui/units/connections/components/custom-forms/Yadocs/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/Yadocs/constants.ts
Auto-merging src/ui/units/connections/components/custom-forms/Yadocs/containers/ActionBarContainer.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/Yadocs/containers/ActionBarContainer.tsx
Auto-merging src/ui/units/connections/components/custom-forms/Yadocs/containers/DocsListContainer.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/Yadocs/containers/DocsListContainer.tsx
Auto-merging src/ui/units/connections/components/custom-forms/Yadocs/containers/WorkspaceContainer.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/Yadocs/containers/WorkspaceContainer.tsx
Auto-merging src/ui/units/connections/components/custom-forms/Yadocs/containers/useYadocsDialogs.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/Yadocs/containers/useYadocsDialogs.ts
Auto-merging src/ui/units/connections/components/custom-forms/utils/render.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/connections/components/custom-forms/utils/render.tsx
Auto-merging src/ui/units/connections/constants/connectors.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/constants/connectors.ts
Auto-merging src/ui/units/connections/store/actions/api.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/actions/api.ts
Auto-merging src/ui/units/connections/store/actions/base.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/actions/base.ts
Auto-merging src/ui/units/connections/store/actions/gsheet/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/actions/gsheet/index.ts
Auto-merging src/ui/units/connections/store/actions/gsheet/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/actions/gsheet/utils.ts
Auto-merging src/ui/units/connections/store/actions/yadoc/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/actions/yadoc/index.ts
Auto-merging src/ui/units/connections/store/actions/yadoc/misc-actions.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/actions/yadoc/misc-actions.ts
Auto-merging src/ui/units/connections/store/actions/yadoc/utils.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/actions/yadoc/utils.ts
Auto-merging src/ui/units/connections/store/constants.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/constants.ts
Auto-merging src/ui/units/connections/store/reducers/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/reducers/index.ts
Auto-merging src/ui/units/connections/store/selectors/form.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/selectors/form.ts
Auto-merging src/ui/units/connections/store/selectors/yadocs.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/selectors/yadocs.ts
Auto-merging src/ui/units/connections/store/typings/gsheet.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/typings/gsheet.ts
Auto-merging src/ui/units/connections/store/typings/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/typings/index.ts
Auto-merging src/ui/units/connections/store/typings/yadocs.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/store/typings/yadocs.ts
Auto-merging src/ui/units/connections/utils/gsheet.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/utils/gsheet.ts
Auto-merging src/ui/units/connections/utils/index.ts
CONFLICT (add/add): Merge conflict in src/ui/units/connections/utils/index.ts
Auto-merging src/ui/units/dash/components/TwoColumnDialog/TwoColumnDialog.scss
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/TwoColumnDialog/TwoColumnDialog.scss
Auto-merging src/ui/units/dash/components/TwoColumnDialog/TwoColumnDialog.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/components/TwoColumnDialog/TwoColumnDialog.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/GroupControl/GroupControl.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/GroupControl/GroupControl.tsx
Auto-merging src/ui/units/dash/containers/Dialogs/Widget/Widget.scss
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Widget/Widget.scss
Auto-merging src/ui/units/dash/containers/Dialogs/Widget/Widget.tsx
CONFLICT (add/add): Merge conflict in src/ui/units/dash/containers/Dialogs/Widget/Widget.tsx
error: could not apply fbaa3eec... Remove i18n keys with empty strings
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 fbaa3eec... Remove i18n keys with empty strings
 (1)

Resolve conflicts according to instructions

  1. Switch to the current branch associated with this pull request.
git checkout CHARTS-8979-remove-unused-i18n-keys
  1. Add Weblate as remote:
git remote add weblate http://158.160.122.254/git/datalens/charts-8979-remove-unused-i-18-n-keys-460/chartkit-460/
git remote update weblate
  1. Merge Weblate changes:
git merge weblate/CHARTS-8979-remove-unused-i18n-keys
  1. Resolve conflicts:
edit ...
git add ...
git commit
  1. Push changes to upstream repository, Weblate will fetch merge from there:
git push origin

@korvin89 korvin89 merged commit 01d7ca1 into main Jan 12, 2024
8 checks passed
@korvin89 korvin89 deleted the CHARTS-8979-remove-unused-i18n-keys branch January 12, 2024 18:59
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.

3 participants