bookmarks and links in news: replace flags with language description in French

Author: Trim

app/assets/stylesheets/common/langs.scss

@@ -12,7 +12,6 @@
     display: inline-block;
   }
   .content {
-    padding: 0;
     min-height: auto;
     line-height: 1.3em;
   }
@@ -36,7 +35,4 @@
       color: #888;
     }
   }
-  .links {
-    display: block; /* cancel display:grid for bookmark entries */
-  }
 }

app/assets/stylesheets/parts/bookmark.scss

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+module BookmarkHelper
+  def lang(bookmark)
+    detail = ""
+    if bookmark.lang != 'fr'
+      detail = "(en #{Lang[bookmark.lang].downcase})"
+    end
+    detail
+  end
+end

app/helpers/bookmark_helper.rb

@@ -0,0 +1,10 @@
+# encoding: UTF-8
+module LinkHelper
+  def lang_and_hit(link)
+    detail = "("
+    if link.lang != 'fr'
+      detail += "en #{Lang[link.lang].downcase}, "
+    end
+    detail += "#{pluralize link.nb_clicks, 'clic'})"
+  end
+end

app/helpers/link_helper.rb

@@ -12,4 +12,8 @@ def self.[]=(key, value)
     $redis.set("lang/#{key}", value)
     $redis.rpush("lang", key)
   end
+
+  def self.[](key)
+    return $redis.get("lang/#{key}")
+  end
 end

app/models/lang.rb

@@ -2,7 +2,8 @@
   - c.title = "#{link_to "Lien", "/liens", class: "topic"} #{link_to bookmark.title, [bookmark.owner, bookmark]}".html_safe
   - c.image = mini_avatar_img(bookmark.owner)
   - c.body = capture do
-    %ul.links
-      %li.link{lang: bookmark.lang}= "#{link_to bookmark.link, bookmark.link, hreflang: bookmark.lang}".html_safe
+    %p
+      = link_to bookmark.link, bookmark.link,  hreflang: bookmark.lang
+      #{lang(bookmark)}
   - if current_account && current_account.can_update?(bookmark)
     - c.actions = link_to("Modifier", edit_user_bookmark_path(user_id: bookmark.owner, id: bookmark), class: 'action')

app/views/bookmarks/_bookmark.html.haml

@@ -2,5 +2,6 @@
   - c.title = "#{link_to "Lien", "/liens", class: "topic"} #{link_to spellcheck(preview.title), "#"}".html_safe
   - c.image = mini_avatar_img(preview.node.user)
   - c.body = capture do
-    %ul
-      %li.link{lang: preview.lang}= "#{link_to preview.link, preview.link, hreflang: preview.lang}".html_safe
+    %p
+      = link_to preview.link, preview.link, hreflang: preview.lang
+      #{lang(preview)}

app/views/bookmarks/_preview.html.haml

@@ -1,3 +1,3 @@
 %li[link]{link_attr(link)}
   = link_to link.title, link.url, 'data-hit' => link.id, title: link.url, hreflang: link.lang, class: 'hit_counter'
-  (#{pluralize link.nb_clicks, 'clic'})
+  #{lang_and_hit(link)}

app/views/links/_link.html.haml

@@ -1,5 +1,5 @@
-%li[link]{ lang: link.lang, "data-url" => edit_redaction_link_path(link) }
+%li[link]{ "lang" => link.lang, "data-url" => edit_redaction_link_path(link) }
   = link_to link.title, link.url, 'data-hit' => link.id, title: link.url, hreflang: link.lang, class: 'hit_counter'
-  (#{pluralize link.nb_clicks, 'clic'})
+  #{lang_and_hit(link)}
   .actions
     %button.edit Modifier