Merge remote-tracking branch 'upstream/pull/5051'

[rails.git] / app / helpers / open_graph_helper.rb

diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb
index a41831ca69d98bc6e287c495ec94653817245b2b..ad24c73b2fb3c2115d3b0a19b4c3809f18cd0638 100644 (file)
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -1,15 +1,16 @@
 module OpenGraphHelper
   require "addressable/uri"
 
 module OpenGraphHelper
   require "addressable/uri"
 

-  def opengraph_tags(title = nil, og_image = nil)
+  def opengraph_tags(title = nil, og_image = nil, og_image_alt = nil)

     tags = {
       "og:site_name" => t("layouts.project_name.title"),
       "og:title" => title || t("layouts.project_name.title"),
       "og:type" => "website",
     tags = {
       "og:site_name" => t("layouts.project_name.title"),
       "og:title" => title || t("layouts.project_name.title"),
       "og:type" => "website",

-      "og:image" => og_image_url(og_image),

       "og:url" => url_for(:only_path => false),
       "og:description" => t("layouts.intro_text")
       "og:url" => url_for(:only_path => false),
       "og:description" => t("layouts.intro_text")

-    }
+    }.merge(
+      opengraph_image_properties(og_image, og_image_alt)
+    )

 
     safe_join(tags.map do |property, content|
       tag.meta(:property => property, :content => content)
 
     safe_join(tags.map do |property, content|
       tag.meta(:property => property, :content => content)


@@ -18,12 +19,20 @@ module OpenGraphHelper
 
   private
 
 
   private
 

-  def og_image_url(og_image)
+  def opengraph_image_properties(og_image, og_image_alt)

     begin
     begin

-      return Addressable::URI.join(root_url, og_image).normalize if og_image
+      if og_image
+        properties = {}
+        properties["og:image"] = Addressable::URI.join(root_url, og_image).normalize
+        properties["og:image:alt"] = og_image_alt if og_image_alt
+        return properties
+      end

     rescue Addressable::URI::InvalidURIError
       # return default image
     end
     rescue Addressable::URI::InvalidURIError
       # return default image
     end

-    image_url("osm_logo_256.png")
+    {
+      "og:image" => image_url("osm_logo_256.png"),
+      "og:image:alt" => t("layouts.logo.alt_text")
+    }

   end
 end
   end
 end