Clean dashboard, move lang to locales

app/views/admin/dashboard/_welcome.html.erb

@@ -1,27 +1,26 @@
-<h3><%= _("Today") -%></h3>
+<h3><%= t(".today") %></h3>
 <div>
   <div class='span12 well'>
-    <p><%= _("%d articles and %d comments were posted since your last connexion", @newposts_count, @newcomments_count) %></p>
-    <p><%= _("You're running Publify %s", PUBLIFY_VERSION) %> <%= @version_message %></p>
-
+    <p><%= t(".articles_and_comments_count_since", articles_count: @newposts_count, comments_count: @newcomments_count) %></p>
+    <p><%= t(".running_publify", version: PUBLIFY_VERSION) %> <%= @version_message %></p>
     <div>
       <div class='span6'>
-      <% if current_user.can_access_to_articles? %>
-        <h4 class='page-header'><%= _("Content") %></h4>
-        <p><%= link_to(sprintf("<strong>%d</strong> %s", @statposts, pluralize(@statposts, _("articles"), _("article"), _("articles"))).html_safe, :controller => 'admin/content').html_safe %></p>
-        <p><%= link_to(sprintf("<strong>%d</strong> %s", @statuserposts, _("articles writen by you")).html_safe, :controller => 'admin/content', "search[user_id]" => current_user.id).html_safe %></p>
-        <p><%= link_to(sprintf("<strong>%d</strong> %s", @statsdrafts, pluralize(@statsdrafts, _("drafts"), _("draft"), _("drafts"))).html_safe, :controller => 'admin/content', "search[state]" => "drafts").html_safe %></p>
-        <p><%= link_to(sprintf("<strong>%d</strong> %s", @statspages, pluralize(@statspages, _("pages"), _("page"), _("pages"))).html_safe, :controller => 'admin/pages').html_safe %></p>
-        <p><%= link_to(sprintf("<strong>%d</strong> %s", @statuses, pluralize(@statspages, _("notes"), _("note"), _("notes"))).html_safe, :controller => 'admin/notes').html_safe %></p>
-      <% end %>
+        <% if current_user.can_access_to_articles? %>
+          <h4 class='page-header'><%= t(".content") %></h4>
+          <p><%= link_to(t(".articles_count", count: @statposts), controller: 'admin/content') %></p>
+          <p><%= link_to(t(".your_articles_count", count: @statuserposts), controller: 'admin/content', "search[user_id]" => current_user.id) %></p>
+          <p><%= link_to(t(".drafts_count", count: @statsdrafts), controller: 'admin/content', "search[state]" => "drafts") %></p>
+          <p><%= link_to(t(".pages_count", count: @statspages), controller: 'admin/pages') %></p>
+          <p><%= link_to(t(".notes_count", count: @statuses), controller: 'admin/notes') %></p>
+        <% end %>
       </div>
       <div class='span6'>
         <%  if current_user.can_access_to_feedback? %>
-        <h4 class='page-header'><%= _("Feedback") %></h4>
-        <p><%= link_to(sprintf("<strong>%d</strong> %s", @statcomments, _("comments")).html_safe, :controller => 'admin/feedback').html_safe %></p>
-        <p><%= link_to(sprintf("<strong>%d</strong> %s", @confirmed, _("approved")).html_safe, :controller => 'admin/feedback', "ham" => "f").html_safe %></p>
-        <p><%= link_to(sprintf("<strong>%d</strong> %s", @unconfirmed, _("unconfirmed")).html_safe, :controller => 'admin/feedback', "presumed_ham" => "f").html_safe %></p>
-        <p><%= link_to(sprintf("<strong>%d</strong> %s", @statspam, _("spam")).html_safe, :controller => 'admin/feedback', "spam" => "f").html_safe %></p>
+          <h4 class='page-header'><%= t(".feedback") %></h4>
+          <p><%= link_to(t('.comments_count', count: @statcomments), controller: 'admin/feedback') %></p>
+          <p><%= link_to(t('.approved_count', count: @confirmed), controller: 'admin/feedback', "ham" => "f") %></p>
+          <p><%= link_to(t('.unconfirmed_count', count: @unconfirmed), controller: 'admin/feedback', "presumed_ham" => "f") %></p>
+          <p><%= link_to(t(".spam_count", count: @statspam), controller: 'admin/feedback', "spam" => "f") %></p>
         <% end %>
       </div>
     </div>

config/locales/da.yml

@@ -6,6 +6,45 @@ da:
       last: "Last"
   admin:
     dashboard:
+      welcome:
+        today: "Today"
+        articles_and_comments_count_since: "%{articles_count} articles and %{comments_count} comments were posted since your last connexion"
+        running_publify: "Du kører Publify version %{version}"
+        content: "Indhold"
+        articles_count:
+          zero: "ingen artikler"
+          one: "1 artikel"
+          other: "%{count} artikler"
+        your_articles_count:
+          zero: "no article writen by you"
+          one: "1 article writen by you"
+          other: "%{count} articles writen by you"
+        drafts_count:
+          zero: "no draft"
+          one: "1 draft"
+          other: "%{count} drafts"
+        pages_count:
+          zero: "no page"
+          one: "1 page"
+          other: "%{count} pages"
+        notes_count:
+          zero: "no note"
+          one: "1 note"
+          other: "%{count} notes"
+        feedback: "Diskussion"
+        comments_count:
+          zero: "ingen kommentarer"
+          one: "1 kommentar"
+          other: "%{count} kommentarer"
+        approved_count:
+          zero: "no approved"
+          other: "%{count} approved"
+        unconfirmed_count:
+          zero: "no unconfirmed"
+          other: "%{count} unconfirmed"
+        spam_count:
+          zero: "no spam"
+          other: "%{count} spam"
       overview:
         dashboard_explain: "Dette sted giver dig en hurtig oversigt over, hvad der sker på din Publify blog, og hvad du kan gøre. Måske du ønsker at %{available_actions}."
         write_a_post: "skrive en artikel"

config/locales/de.yml

@@ -6,6 +6,45 @@ de:
       last: "Last"
   admin:
     dashboard:
+      welcome:
+        today: "Today"
+        articles_and_comments_count_since: "%{articles_count} articles and %{comments_count} comments were posted since your last connexion"
+        running_publify: "You're running Publify %{version}"
+        content: "Content"
+        articles_count:
+          zero: "no article"
+          one: "1 article"
+          other: "%{count} articles"
+        your_articles_count:
+          zero: "no article writen by you"
+          one: "1 article writen by you"
+          other: "%{count} articles writen by you"
+        drafts_count:
+          zero: "no draft"
+          one: "1 draft"
+          other: "%{count} drafts"
+        pages_count:
+          zero: "no page"
+          one: "1 page"
+          other: "%{count} pages"
+        notes_count:
+          zero: "no note"
+          one: "1 note"
+          other: "%{count} notes"
+        feedback: "Diskussion"
+        comments_count:
+          zero: "keine Kommentare"
+          one: "1 comment"
+          other: "%{count} comments"
+        approved_count:
+          zero: "no approved"
+          other: "%{count} approved"
+        unconfirmed_count:
+          zero: "no unconfirmed"
+          other: "%{count} unconfirmed"
+        spam_count:
+          zero: "no spam"
+          other: "%{count} spam"
       overview:
         dashboard_explain: "This place gives you a quick overview of what happens on your Publify blog and what you can do. Maybe will you want to %{available_actions}"
         write_a_post: "write a post"

config/locales/en.yml

@@ -6,6 +6,45 @@ en:
       last: "Last"
   admin:
     dashboard:
+      welcome:
+        today: "Today"
+        articles_and_comments_count_since: "%{articles_count} articles and %{comments_count} comments were posted since your last connexion"
+        running_publify: "You're running Publify %{version}"
+        content: "Content"
+        articles_count:
+          zero: "no article"
+          one: "1 article"
+          other: "%{count} articles"
+        your_articles_count:
+          zero: "no article writen by you"
+          one: "1 article writen by you"
+          other: "%{count} articles writen by you"
+        drafts_count:
+          zero: "no draft"
+          one: "1 draft"
+          other: "%{count} drafts"
+        pages_count:
+          zero: "no page"
+          one: "1 page"
+          other: "%{count} pages"
+        notes_count:
+          zero: "no note"
+          one: "1 note"
+          other: "%{count} notes"
+        feedback: "Feedback"
+        comments_count:
+          zero: "no comment"
+          one: "1 comment"
+          other: "%{count} comments"
+        approved_count:
+          zero: "no approved"
+          other: "%{count} approved"
+        unconfirmed_count:
+          zero: "no unconfirmed"
+          other: "%{count} unconfirmed"
+        spam_count:
+          zero: "no spam"
+          other: "%{count} spam"
       overview:
         dashboard_explain: "This place gives you a quick overview of what happens on your Publify blog and what you can do. Maybe will you want to %{available_actions}"
         write_a_post: "write a post"

config/locales/es-MX.yml

@@ -6,6 +6,45 @@ es-MX:
       last: "Last"
   admin:
     dashboard:
+      welcome:
+        today: "Today"
+        articles_and_comments_count_since: "%{articles_count} articles and %{comments_count} comments were posted since your last connexion"
+        running_publify: "You're running Publify %{version}"
+        content: "Content"
+        articles_count:
+          zero: "no article"
+          one: "1 article"
+          other: "%{count} articles"
+        your_articles_count:
+          zero: "no article writen by you"
+          one: "1 article writen by you"
+          other: "%{count} articles writen by you"
+        drafts_count:
+          zero: "no draft"
+          one: "1 draft"
+          other: "%{count} drafts"
+        pages_count:
+          zero: "no Página"
+          one: "1 Página"
+          other: "%{count} Páginas"
+        notes_count:
+          zero: "no note"
+          one: "1 note"
+          other: "%{count} notes"
+        feedback: "Feedback"
+        comments_count:
+          zero: "no hay comentarios"
+          one: "1 comentario"
+          other: "%{count} comentarios"
+        approved_count:
+          zero: "no approved"
+          other: "%{count} approved"
+        unconfirmed_count:
+          zero: "no unconfirmed"
+          other: "%{count} unconfirmed"
+        spam_count:
+          zero: "no spam"
+          other: "%{count} spam"
       overview:
         dashboard_explain: "This place gives you a quick overview of what happens on your Publify blog and what you can do. Maybe will you want to %{available_actions}"
         write_a_post: "write a post"

config/locales/fr.yml

@@ -6,6 +6,48 @@ fr:
       last: "Last"
   admin:
     dashboard:
+      welcome:
+        today: "Aujourd'hui"
+        articles_and_comments_count_since: "Depuis votre dernière connexion, %{articles_count} articles et %{comments_count} commentaires ont été publiés"
+        running_publify: "Vous utilisez Publify %{version}"
+        content: "Contenu"
+        articles_count:
+          zero: "aucun article"
+          one: "1 article"
+          other: "%{count} articles"
+        your_articles_count:
+          zero: "vous n'avez écris aucun article"
+          one: "1 article que vous avez écris"
+          other: "%{count} articles que vous avez écris"
+        drafts_count:
+          zero: "aucune brouillon"
+          one: "1 brouillon"
+          other: "%{count} brouillons"
+        pages_count:
+          zero: "aucune page"
+          one: "1 page"
+          other: "%{count} pages"
+        notes_count:
+          zero: "aucune note"
+          one: "1 note"
+          other: "%{count} notes"
+        feedback: "Commentaires"
+        comments_count:
+          zero: "aucun commentaire"
+          one: "1 commentaire"
+          other: "%{count} commentaires"
+        approved_count:
+          zero: "aucun approuvés"
+          one: "1 approuvé"
+          other: "%{count} approuvés"
+        unconfirmed_count:
+          zero: "aucun non validés"
+          one: "1 validé"
+          other: "%{count} validés"
+        spam_count:
+          zero: "aucun spam"
+          one: "1 spam"
+          other: "%{count} spams"
       overview:
         dashboard_explain: "Voici un rapide aperçu de ce que peut faire votre blog Publify. Peux-être voulez vous %{available_actions}"
         write_a_post: "écrire un article"

config/locales/he-IL.yml

@@ -6,6 +6,45 @@ he-IL:
       last: "Last"
   admin:
     dashboard:
+      welcome:
+        today: "Today"
+        articles_and_comments_count_since: "%{articles_count} articles and %{comments_count} comments were posted since your last connexion"
+        running_publify: "אתה מריץ את Publify %{version}"
+        content: "תוכן"
+        articles_count:
+          zero: "אין כתבות"
+          one: "כתבה 1"
+          other: "%{count} כתבות"
+        your_articles_count:
+          zero: "no article writen by you"
+          one: "1 article writen by you"
+          other: "%{count} articles writen by you"
+        drafts_count:
+          zero: "no draft"
+          one: "1 draft"
+          other: "%{count} drafts"
+        pages_count:
+          zero: "no page"
+          one: "1 page"
+          other: "%{count} pages"
+        notes_count:
+          zero: "no note"
+          one: "1 note"
+          other: "%{count} notes"
+        feedback: "משוב"
+        comments_count:
+          zero: "אין תגובות"
+          one: "תגובה 1"
+          other: "%d תגובות"
+        approved_count:
+          zero: "no approved"
+          other: "%{count} approved"
+        unconfirmed_count:
+          zero: "no unconfirmed"
+          other: "%{count} unconfirmed"
+        spam_count:
+          zero: "no spam"
+          other: "%{count} spam"
       overview:
         dashboard_explain: "This place gives you a quick overview of what happens on your Publify blog and what you can do. Maybe will you want to %{available_actions}"
         write_a_post: "לכתוב כתבה"

config/locales/it.yml

@@ -6,6 +6,45 @@ it:
       last: "Last"
   admin:
     dashboard:
+      welcome:
+        today: "Today"
+        articles_and_comments_count_since: "%{articles_count} articles and %{comments_count} comments were posted since your last connexion"
+        running_publify: "You're running Publify %{version}"
+        content: "Content"
+        articles_count:
+          zero: "no article"
+          one: "1 article"
+          other: "%{count} articles"
+        your_articles_count:
+          zero: "no article writen by you"
+          one: "1 article writen by you"
+          other: "%{count} articles writen by you"
+        drafts_count:
+          zero: "no draft"
+          one: "1 draft"
+          other: "%{count} drafts"
+        pages_count:
+          zero: "no page"
+          one: "1 page"
+          other: "%{count} pages"
+        notes_count:
+          zero: "no note"
+          one: "1 note"
+          other: "%{count} notes"
+        feedback: "Commenti"
+        comments_count:
+          zero: "nessun commento"
+          one: "1 commento"
+          other: "%{count} commento"
+        approved_count:
+          zero: "no approved"
+          other: "%{count} approved"
+        unconfirmed_count:
+          zero: "no unconfirmed"
+          other: "%{count} unconfirmed"
+        spam_count:
+          zero: "no spam"
+          other: "%{count} spam"
       overview:
         dashboard_explain: "This place gives you a quick overview of what happens on your Publify blog and what you can do. Maybe will you want to %{available_actions}"
         write_a_post: "write a post"