From 267d91bf663830ced3db6f0d028ffa1bbd3009d7 Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Wed, 30 Mar 2016 10:36:28 +0200
Subject: [PATCH 1/2] Changes for a successful facebook review

I had two facebook reviews in the past days
Removing the display type and adding a explicit
'Share to' provider tag did the trick

Signed-off-by: Lukas Matt <lukas@zauberstuhl.de>
---
 app/helpers/publisher_helper.rb | 3 ++-
 config/initializers/omniauth.rb | 1 -
 config/locales/diaspora/en.yml  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/helpers/publisher_helper.rb b/app/helpers/publisher_helper.rb
index 3935bc52c..490044a5f 100644
--- a/app/helpers/publisher_helper.rb
+++ b/app/helpers/publisher_helper.rb
@@ -12,9 +12,10 @@ module PublisherHelper
   end
 
   def service_button(service)
+    share_to = I18n.t "services.index.share_to"
     content_tag :div,
                 class:   "btn btn-link service_icon dim",
-                title:   "#{service.provider.titleize} (#{service.nickname})",
+                title:   "#{share_to} #{service.provider.titleize} (#{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
index 855078373..3321cf370 100644
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -13,7 +13,6 @@ Rails.application.config.middleware.use OmniAuth::Builder do
 
   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
index 45a531106..4b2153adf 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -1171,6 +1171,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"
     create:
       success: "Authentication successful."
       failure: "Authentication failed."

From b9cf5995b81dd7f28dc327db21131276486520e5 Mon Sep 17 00:00:00 2001
From: Lukas Matt <lukas@zauberstuhl.de>
Date: Thu, 31 Mar 2016 13:18:35 +0200
Subject: [PATCH 2/2] Use provider name in translation

---
 app/helpers/publisher_helper.rb | 6 ++++--
 config/locales/diaspora/en.yml  | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/helpers/publisher_helper.rb b/app/helpers/publisher_helper.rb
index 490044a5f..1e7e326a9 100644
--- a/app/helpers/publisher_helper.rb
+++ b/app/helpers/publisher_helper.rb
@@ -12,10 +12,12 @@ module PublisherHelper
   end
 
   def service_button(service)
-    share_to = I18n.t "services.index.share_to"
+    provider_title = I18n.t(
+      "services.index.share_to",
+      provider: service.provider.titleize)
     content_tag :div,
                 class:   "btn btn-link service_icon dim",
-                title:   "#{share_to} #{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/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 4b2153adf..c8aced44a 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -1171,7 +1171,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"
+      share_to: "Share to %{provider}"
     create:
       success: "Authentication successful."
       failure: "Authentication failed."