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

Issue #5662 Fix text on change button #5671

Merged
merged 1 commit into from Feb 15, 2015

Conversation

@giniouxe
Copy link
Contributor

commented Feb 15, 2015

No description provided.

@jhass

This comment has been minimized.

Copy link
Member

commented Feb 15, 2015

Hey, please check this comment in the issue ;)

@@ -1319,6 +1319,7 @@ en:
privacy_settings:
title: "Privacy settings"
strip_exif: "Strip metadata such as location, author, and camera model from uploaded images (recommended)"
change: "Change"

This comment has been minimized.

Copy link
@goobertron

goobertron Feb 15, 2015

I think this addition can be removed as you're using an existing string.

@goobertron

This comment has been minimized.

Copy link

commented Feb 15, 2015

Thanks for your PR - the first of many, I hope! It's great to see a new contributor.

@giniouxe giniouxe force-pushed the giniouxe:5662-privacy-button-text branch from 1fb9870 to 549e2c9 Feb 15, 2015

@svbergerem

This comment has been minimized.

Copy link
Member

commented Feb 15, 2015

Hooray, a new contributor! :)

Like @goobertron said, please remove the line from config/locales/diaspora/en.yml you added as you don't need it anymore. Squash the commits afterwards into one and then this should be ready to merge.

@jhass

This comment has been minimized.

Copy link
Member

commented Feb 15, 2015

Let's extract the single wanted commit

git remote add upstream git://github.com/diaspora/diaspora.git
git fetch upstream
git checkout 5662-privacy-button-text
git reset --hard upstream/develop
git cherry-pick a8a44e6f87f78791c1e2d3814299f34ec4337bb0
git push -f origin 5662-privacy-button-text

In the future you can edit a commit wit git commit --amend and then force push it into your feature branch (git push -f).

@giniouxe

This comment has been minimized.

Copy link
Contributor Author

commented Feb 15, 2015

Sorry @jhass ! Just corrected this point with a new commit.
Hope it's OK now.

@giniouxe

This comment has been minimized.

Copy link
Contributor Author

commented Feb 15, 2015

And I'm cleaning the mess in the commits right now.

@giniouxe giniouxe force-pushed the giniouxe:5662-privacy-button-text branch from 549e2c9 to e2866a1 Feb 15, 2015

@giniouxe

This comment has been minimized.

Copy link
Contributor Author

commented Feb 15, 2015

@goobertron && @svbergerem Thanks for the welcome messages :)

@jhass jhass added this to the next-major milestone Feb 15, 2015

@jhass jhass merged commit e2866a1 into diaspora:develop Feb 15, 2015

1 of 2 checks passed

continuous-integration/travis-ci The Travis CI build is in progress
Details
hound Hound has reviewed the changes.

jhass added a commit that referenced this pull request Feb 15, 2015

@jhass

This comment has been minimized.

Copy link
Member

commented Feb 15, 2015

Perfect, thank you!

@goobertron

This comment has been minimized.

Copy link

commented Feb 15, 2015

Hooray! :-)

@Flaburgan

This comment has been minimized.

Copy link
Member

commented Feb 15, 2015

@giniouxe heeey! Welcome aboard! Guys let me introduce you Aurélie who discovered diaspora* with framasphere (I guess). Aurélie don't hesitate if you have any question, you can join #diaspora-dev or #diaspora-fr on IRC Freenode.

@giniouxe

This comment has been minimized.

Copy link
Contributor Author

commented Feb 15, 2015

@Flaburgan Thanks :)

@giniouxe giniouxe deleted the giniouxe:5662-privacy-button-text branch Feb 15, 2015

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