nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6778 from Zauberstuhl/facebook_review_changes

Browse source 
Changes for my successful facebook reviews
This commit is contained in:
Dennis Schubert 2016-04-21 06:50:13 +02:00
commit d6171e53c3
4 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -97,6 +97,7 @@ Contributions are very welcome, the hard work is done!
* Redesign stream pages [#6535](https://github.com/diaspora/diaspora/pull/6535) * Redesign stream pages [#6535](https://github.com/diaspora/diaspora/pull/6535)
* Improve search and mentions suggestions [#6788](https://github.com/diaspora/diaspora/pull/6788) * Improve search and mentions suggestions [#6788](https://github.com/diaspora/diaspora/pull/6788)
* Redesign back to top button [#6782](https://github.com/diaspora/diaspora/pull/6782) * Redesign back to top button [#6782](https://github.com/diaspora/diaspora/pull/6782)
* Adjusted Facebook integration for a successful review [#6778](https://github.com/diaspora/diaspora/pull/6778)
## Bug fixes ## Bug fixes
* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852) * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

5
app/helpers/publisher_helper.rb
View file

@ -12,9 +12,12 @@ module PublisherHelper
end end
def service_button(service) def service_button(service)
provider_title = I18n.t(
"services.index.share_to",
provider: service.provider.titleize)
content_tag :div, content_tag :div,
class: "btn btn-link service_icon dim", class: "btn btn-link service_icon dim",
title: "#{service.provider.titleize} (#{service.nickname})", title: "#{provider_title} (#{service.nickname})",
id: "#{service.provider}", id: "#{service.provider}",
maxchar: "#{service.class::MAX_CHARACTERS}", maxchar: "#{service.class::MAX_CHARACTERS}",
data: {toggle: "tooltip", placement: "bottom"} do data: {toggle: "tooltip", placement: "bottom"} do

1
config/initializers/omniauth.rb
View file

@ -13,7 +13,6 @@ Rails.application.config.middleware.use OmniAuth::Builder do
if AppConfig.services.facebook.enable? if AppConfig.services.facebook.enable?
provider :facebook, AppConfig.services.facebook.app_id, AppConfig.services.facebook.secret, { provider :facebook, AppConfig.services.facebook.app_id, AppConfig.services.facebook.secret, {
display: "popup",
scope: "public_profile,publish_actions", scope: "public_profile,publish_actions",
client_options: { client_options: {
ssl: { ssl: {

1
config/locales/diaspora/en.yml
View file

@ -1172,6 +1172,7 @@ en:
really_disconnect: "Disconnect %{service}?" really_disconnect: "Disconnect %{service}?"
edit_services: "Edit services" edit_services: "Edit services"
services_explanation: "Connecting to third-party sharing services gives you the ability to publish your posts to them as you write them in diaspora*." services_explanation: "Connecting to third-party sharing services gives you the ability to publish your posts to them as you write them in diaspora*."
share_to: "Share to %{provider}"
create: create:
success: "Authentication successful." success: "Authentication successful."
failure: "Authentication failed." failure: "Authentication failed."