Merge pull request #6778 from Zauberstuhl/facebook_review_changes

Changes for my successful facebook reviews
diaspora · Apr 21, 2016 · d6171e5 · d6171e5
2 parents b0e608a + b9cf599
commit d6171e5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -97,6 +97,7 @@ Contributions are very welcome, the hard work is done!
 * Redesign stream pages [#6535](https://github.com/diaspora/diaspora/pull/6535)
 * 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)
+* Adjusted Facebook integration for a successful review [#6778](https://github.com/diaspora/diaspora/pull/6778)
 
 ## Bug fixes
 * Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

diff --git a/app/helpers/publisher_helper.rb b/app/helpers/publisher_helper.rb
@@ -12,9 +12,12 @@ def all_aspects_selected?(selected_aspects)
   end
 
   def service_button(service)
+    provider_title = I18n.t(
+      "services.index.share_to",
+      provider: service.provider.titleize)
     content_tag :div,
                 class:   "btn btn-link service_icon dim",
-                title:   "#{service.provider.titleize} (#{service.nickname})",
+                title:   "#{provider_title} (#{service.nickname})",
                 id:      "#{service.provider}",
                 maxchar: "#{service.class::MAX_CHARACTERS}",
                 data:    {toggle: "tooltip", placement: "bottom"} do

diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb
@@ -13,7 +13,6 @@
 
   if AppConfig.services.facebook.enable?
     provider :facebook, AppConfig.services.facebook.app_id, AppConfig.services.facebook.secret, {
-      display:        "popup",
       scope:          "public_profile,publish_actions",
       client_options: {
         ssl: {

diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
@@ -1172,6 +1172,7 @@ en:
       really_disconnect: "Disconnect %{service}?"
       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*."
+      share_to: "Share to %{provider}"
     create:
       success: "Authentication successful."
       failure: "Authentication failed."