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

Subtree pull Scribe-i18n #483

Merged
merged 3 commits into from
Aug 2, 2024
Merged

Conversation

wkyoshida
Copy link
Member

Contributor checklist


Description

Just an example of how the workflow might look like..

  • Running the following in project root to pull in changes from Scribe-i18n:
    git subtree pull --prefix Scribe/i18n [email protected]:scribe-org/Scribe-i18n.git main --squash
  • Then two commits as seen here in this PR get auto-created

I'll look into formalizing the documentation for this over the weekend. It'll likely be best to have a generic version in the Scribe-i18n repo, but then quick repo-specific ones for each project.

P.S. Cool to see, though, that the command still appears to work despite other updates having occurred without using the command. The diff here likely appears empty, since I'd guess the manual updates to the i18n folder still matched, which is a good sign.

Related issue

  • 🌐

812482a Merge pull request scribe-org#30 from weblate/weblate-scribe-scribe-i18n
446ec73 Translated using Weblate (Spanish)
c553b4e Merge pull request scribe-org#29 from weblate/weblate-scribe-scribe-i18n
80c0a4e Translated using Weblate (Swedish)
563a96f Translated using Weblate (Spanish)
416a9e4 Translated using Weblate (German)
019a084 Translated using Weblate (English (United States))
41f7450 Translated using Weblate (English (United States))
74263da Translated using Weblate (English (United States))
ba64ae1 Translated using Weblate (English (United States))
0e2f944 Minor updates to readme headers and text
d9b2226 Merge pull request scribe-org#26 from Jag-Marcel/action-fix
0cb65ed Small fix to action for converting jsons to xcstrings
cd28e5e Merge pull request scribe-org#25 from weblate/weblate-scribe-scribe-i18n
dc922d8 Translated using Weblate (Swedish)
997460b Translated using Weblate (Spanish)
a99deb4 Translated using Weblate (German)
eff6dee Merge pull request scribe-org#24 from Jag-Marcel/new-strings
7ad62b4 Merge branch 'main' into new-strings
b020823 Merge pull request scribe-org#23 from weblate/weblate-scribe-scribe-i18n
463dd85 New strings for Scribe-iOS translation picker
dde9e54 Translated using Weblate (Swedish)
65d4274 Translated using Weblate (Swedish)
f2c989d Translated using Weblate (Swedish)
d230853 Merge pull request scribe-org#22 from Jag-Marcel/minor-fix
dc219d4 Minor fix to conversion script

git-subtree-dir: Scribe/i18n
git-subtree-split: 812482a104212e84ccb7aa620e580e9130a6581b
Copy link

github-actions bot commented Aug 2, 2024

Thank you for the pull request!

The Scribe team will do our best to address your contribution as soon as we can. The following is a checklist for maintainers to make sure this process goes as well as possible. Feel free to address the points below yourself in further commits if you realize that actions are needed :)

If you're not already a member of our public Matrix community, please consider joining! We'd suggest using Element as your Matrix client, and definitely join the General and iOS rooms once you're in. Also consider joining our bi-weekly Saturday dev syncs. It'd be great to have you!

Maintainer checklist

  • The commit messages for the remote branch should be checked to make sure the contributor's email is set up correctly so that they receive credit for their contribution

    • The contributor's name and icon in remote commits should be the same as what appears in the PR
    • If there's a mismatch, the contributor needs to make sure that the email they use for GitHub matches what they have for git config user.email in their local Scribe-iOS repo
  • The linting and formatting workflows within the PR checks do not indicate new errors in the files changed

  • The CHANGELOG has been updated with a description of the changes for the upcoming release and the corresponding issue (if necessary)

@wkyoshida
Copy link
Member Author

btw - attempting to run the same command again logs out the following message

From github.com:scribe-org/Scribe-i18n
 * branch            main       -> FETCH_HEAD
Subtree is already at commit 812482a104212e84ccb7aa620e580e9130a6581b.

nice

@andrewtavis andrewtavis self-requested a review August 2, 2024 21:41
@andrewtavis
Copy link
Member

This is one cool looking commit to branch visual :)

Screenshot_2024-08-02 23 45 51

@andrewtavis
Copy link
Member

CC @Jag-Marcel, as this PR has some info we were discussing :)

@andrewtavis andrewtavis merged commit 4270ad5 into scribe-org:main Aug 2, 2024
1 check passed
@andrewtavis
Copy link
Member

Nice and I was able to bring in the most recent changes in 900d068 😊

@wkyoshida wkyoshida deleted the pull-i18n branch August 3, 2024 02:54
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.

2 participants