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

fix: translations in setup wizard #15401

Merged
merged 7 commits into from
Dec 29, 2021

Conversation

hrwX
Copy link
Contributor

@hrwX hrwX commented Dec 22, 2021

  • Fixes Issue/4742
  • The setup wizard should always default to the browser language and not assume as en.
  • The Translations were not properly picked up by the slides, and if they were, the Next/Previous buttons were not translated.
  • Before fix
    • image
  • After fix
    • Peek 2021-12-22 02-13

@barredterra
Copy link
Collaborator

Tested locally, works fine for me.

@hrwX hrwX marked this pull request as ready for review December 26, 2021 19:44
@hrwX hrwX requested review from a team and surajshetty3416 and removed request for a team December 26, 2021 19:44
frappe/desk/page/setup_wizard/setup_wizard.js Outdated Show resolved Hide resolved
frappe/public/js/frappe/ui/slides.js Outdated Show resolved Hide resolved
frappe/public/js/frappe/ui/slides.js Outdated Show resolved Hide resolved
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Copy link
Collaborator

@barredterra barredterra left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested locally, LGTM.

Cypress failure seems to be unrelated. Semantic Pull Request will be achieved by squashing.

@barredterra
Copy link
Collaborator

@Mergifyio backport version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Dec 28, 2021

backport version-13-hotfix

🟠 Waiting for conditions to match

  • merged [:pushpin: backport requirement]

@codecov
Copy link

codecov bot commented Dec 29, 2021

Codecov Report

Merging #15401 (855aa49) into develop (7e34c27) will increase coverage by 1.88%.
The diff coverage is 0.00%.

@@             Coverage Diff             @@
##           develop   #15401      +/-   ##
===========================================
+ Coverage    50.19%   52.07%   +1.88%     
===========================================
  Files          744      747       +3     
  Lines        64960    65435     +475     
  Branches      5343     5447     +104     
===========================================
+ Hits         32604    34077    +1473     
+ Misses       28551    27586     -965     
+ Partials      3805     3772      -33     
Flag Coverage Δ
ui-tests 41.93% <0.00%> (+5.70%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@surajshetty3416 surajshetty3416 merged commit 8947a54 into frappe:develop Dec 29, 2021
mergify bot pushed a commit that referenced this pull request Dec 29, 2021
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 8947a54)

# Conflicts:
#	frappe/desk/page/setup_wizard/setup_wizard.js
@mergify
Copy link
Contributor

mergify bot commented Dec 29, 2021

backport version-13-hotfix

✅ Backports have been created

hrwX added a commit that referenced this pull request Jan 6, 2022
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 8947a54)
surajshetty3416 added a commit that referenced this pull request Jan 7, 2022
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
conncampbell pushed a commit to conncampbell/frappe that referenced this pull request Jan 9, 2022
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
@ankush
Copy link
Member

ankush commented Jan 17, 2022

@Mergifyio backport version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Jan 17, 2022

backport version-13-hotfix

✅ Backports have been created

@ankush
Copy link
Member

ankush commented Jan 17, 2022

@Mergifyio copy version-13-hotfix

@mergify
Copy link
Contributor

mergify bot commented Jan 17, 2022

copy version-13-hotfix

✅ Pull request copies have been created

mergify bot pushed a commit that referenced this pull request Jan 17, 2022
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 8947a54)
ankush pushed a commit that referenced this pull request Jan 17, 2022
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 8947a54)

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 13, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Setup Wizard titles are not translatable (and some field labels too)
4 participants