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

Apply modifications for 4.11 guides #171

Merged
merged 1 commit into from Mar 31, 2023
Merged

Apply modifications for 4.11 guides #171

merged 1 commit into from Mar 31, 2023

Conversation

BlueCutOfficial
Copy link
Member

@BlueCutOfficial BlueCutOfficial commented Mar 31, 2023

I modified the French files directly, it was just about Ember Data -> EmberData and adding the new section in the menu.

For the record:

git diff -R upstream/master -- guides/release > diff
git apply diff
  • Applying the diff fails by highlighting all the French files that couldn't be patched automatically
  • For each file listed:
    • I found the diff in the "diff" file and applied manually the modification to the French translation
    • I deleted the diff block so it no longer gets in the way of git apply diff
  • I re-run git apply diff to apply automatically the modification to the English files that are not translated yet

@GreatWizard GreatWizard merged commit efa9ba7 into master Mar 31, 2023
2 checks passed
@MrChocolatine MrChocolatine deleted the catchup-4.11 branch March 31, 2023 18:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants