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

Added locale files (Fixes #30) #33

Merged
merged 20 commits into from Aug 7, 2019

Conversation

@JakeMakesStuff
Copy link
Member

commented Jul 29, 2019

No description provided.

@JakeMakesStuff JakeMakesStuff changed the title ocale files Added locale files (Fixes #30) Jul 29, 2019

@JakeMakesStuff JakeMakesStuff changed the title Added locale files (Fixes #30) 🚧 Added locale files (Fixes #30) Jul 29, 2019

@MattIPv4

This comment has been minimized.

Copy link
Member

commented Jul 29, 2019

Sir you branched from skeleton instead of master it seems.

@MattIPv4

This comment has been minimized.

Copy link
Member

commented Aug 2, 2019

@JakeMakesStuff What's the situation here, looks like we have some conflicts that need resolving?

@JakeMakesStuff

This comment has been minimized.

Copy link
Member Author

commented Aug 2, 2019

@MattIPv4 Honestly, I've been working on other things over this. I can definitely merge master into this though and update it. Seems like it might be useful now we have lots of large text.

JakeMakesStuff added some commits Aug 2, 2019

@JakeMakesStuff JakeMakesStuff changed the title 🚧 Added locale files (Fixes #30) Added locale files (Fixes #30) Aug 2, 2019

@MattIPv4
Copy link
Member

left a comment

Can we rebase this and drop all the merge commits so we have a cleaner history?
(Let me know if you'd rather I do it)

@MattIPv4

This comment has been minimized.

Copy link
Member

commented Aug 6, 2019

Actually, would you be happy for it to just be squashed? @JakeMakesStuff

@JakeMakesStuff

This comment has been minimized.

Copy link
Member Author

commented Aug 6, 2019

Yeah, we should do this PR last due to having to add the stuff from the other PR's in and there'll be small conflicts.

@JakeMakesStuff JakeMakesStuff requested a review from MattIPv4 Aug 7, 2019

src/templates/app.vue Outdated Show resolved Hide resolved
src/templates/record.vue Outdated Show resolved Hide resolved
src/i18n/en/truncated_record.ts Outdated Show resolved Hide resolved

@JakeMakesStuff JakeMakesStuff requested a review from MattIPv4 Aug 7, 2019

JakeMakesStuff added some commits Aug 7, 2019

src/i18n/en/propagation_modal.ts Outdated Show resolved Hide resolved

@JakeMakesStuff JakeMakesStuff requested a review from MattIPv4 Aug 7, 2019

@MattIPv4
Copy link
Member

left a comment

Lgtm. Squash & merge.

@MattIPv4 MattIPv4 merged commit 64da8d0 into master Aug 7, 2019

2 checks passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@MattIPv4 MattIPv4 deleted the locale_files branch Aug 7, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.