Move lang to locale for feedback

app/views/admin/feedback/_feedback.html.erb

@@ -1,7 +1,8 @@
 <tr id='<%= "placeholder_#{comment.id}" %>' <%= "style='display: none'" unless comment.state.to_s.downcase == 'spam' %>>
   <td colspan='5' <%= "style='display: none'" if comment.state.to_s == 'spam' %>>
     <%= avatar_tag(:email => comment.email, :url => comment.url, :size => 25) %>
-    <%= _("This comment by <strong>%s</strong> was flagged as spam, %s?", comment.author, link_to_remote('Cancel', :url => {:action => 'change_state', :id => comment.id})) %> <%= toggle_element "feedback_#{comment.id}" %>
+    <%= t(".this_comment_by_was_flagged_as_spam", author: comment.author, cancel_link: link_to_remote(t('.cancel'), url: {action: 'change_state', id: comment.id})) %> 
+    <%= toggle_element "feedback_#{comment.id}" %>
   </td>
 </tr>
 
@@ -24,6 +25,6 @@
   </td>
 
   <% if controller.action_name == 'index' %>
-  <td><%= link_to comment.article.title, :controller => 'feedback', :action => 'article', :id => comment.article_id %></td>
+    <td><%= link_to comment.article.title, :controller => 'feedback', :action => 'article', :id => comment.article_id %></td>
   <% end %>
-</tr>
+</tr>

config/locales/da.yml

@@ -13,6 +13,9 @@ da:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "Anuller"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/de.yml

@@ -13,6 +13,9 @@ de:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "Abbrechen"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/en.yml

@@ -13,6 +13,9 @@ en:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "Cancel"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/es-MX.yml

@@ -13,6 +13,9 @@ es-MX:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "Cancelar"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/fr.yml

@@ -13,6 +13,9 @@ fr:
         mark_checked_items_as_spam: "Marquer ces commentaires comme du spam"
         mark_checked_items_as_ham: "Valider ces commentaires"
         submit: "Envoyer"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "Ce commentaire de %{author} a été marqué comme spam, %{cancel_link} ?"
+        cancel: "Annuler"
     dashboard:
       drafts:
         your_drafts: "Vos brouillons"

config/locales/he-IL.yml

@@ -13,6 +13,9 @@ he-IL:
         mark_checked_items_as_spam: "סווג פריטים שסומנו כספאם"
         mark_checked_items_as_ham: "סווג פריטים שסומנו כלא-ספאם"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "בטל"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/it.yml

@@ -13,6 +13,9 @@ it:
         mark_checked_items_as_spam: "Segna come spam"
         mark_checked_items_as_ham: "Segna come confermati"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "Annulla"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/ja.yml

@@ -13,6 +13,9 @@ ja:
         mark_checked_items_as_spam: "チェックした行をスパムにする"
         mark_checked_items_as_ham: "チェックした行を承認する"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "キャンセル"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/lt.yml

@@ -13,6 +13,9 @@ lt:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "Baigti"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/nb-NO.yml

@@ -13,6 +13,9 @@ nb-NO:
         mark_checked_items_as_spam: "Flagg markerte enheter som Spam"
         mark_checked_items_as_ham: "Flagg markerte enheter som Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "Denne kommentaren av %{author} er flagget som Spam, %{cancel_link}?"
+        cancel: "Annuller"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/nl.yml

@@ -13,6 +13,9 @@ nl:
         mark_checked_items_as_spam: "Markeer aangevinkte reacties als Spam"
         mark_checked_items_as_ham: "Markeer aangevinkte reacties als Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "Dit commentaar van %{author} was gemarkeerd als spam, %{cancel_link}?"
+        cancel: "Terug"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/pl.yml

@@ -13,6 +13,9 @@ pl:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "Anuluj"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/pt-BR.yml

@@ -13,6 +13,9 @@ pt-BR:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "Cancelar"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/ro.yml

@@ -13,6 +13,9 @@ ro:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "Anulare"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/ru.yml

@@ -13,6 +13,9 @@ ru:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "Отменить"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/zh-CN.yml

@@ -13,6 +13,9 @@ zh-CN:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "提交"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "取消"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

config/locales/zh-TW.yml

@@ -13,6 +13,9 @@ zh-TW:
         mark_checked_items_as_spam: "Mark Checked Items as Spam"
         mark_checked_items_as_ham: "Mark Checked Items as Ham"
         submit: "Submit"
+      feedback:
+        this_comment_by_was_flagged_as_spam: "This comment by %{author} was flagged as spam, %{cancel_link}?"
+        cancel: "取消"
     dashboard:
       drafts:
         your_drafts: "Your drafts"

lang/da_DK.rb

@@ -64,20 +64,6 @@
   # app/controllers/admin/users_controller.rb
   l.store "User was successfully created.", ""
 
-  # app/controllers/application_controller.rb
-  l.store "Localization.rtl", ""
-
-  # app/controllers/articles_controller.rb
-  l.store "No posts found...", ""
-  l.store "Archives for", ""
-  l.store "Archives for ", ""
-  l.store ", Articles for ", ""
-
-  # app/controllers/grouping_controller.rb
-  l.store "everything about", ""
-
-  l.store "Cancel", "Anuller"
-  l.store "Store", ""
   l.store "Delete", "Slet"
   l.store "delete", ""
   l.store "Delete content", ""
@@ -164,12 +150,6 @@
   l.store "Total comments : %d", "Total kommentarer : %d"
   l.store "Spam comments : %d", "Spam kommentarer : %d"
   l.store "Url", "Url"
-  l.store "This comment by <strong>%s</strong> was flagged as spam, %s?", ""
-
-  l.store "Comments for %s", ""
-  l.store "Comment Author", ""
-  l.store "Comment", ""
-
   l.store "Comments for", "Kommentarer for"
 
   l.store "Article", "Artikel"
@@ -481,47 +461,6 @@
   l.store "Comments are disabled", "Kommentarer er deaktiveret"
   l.store "Trackbacks are disabled", ""
 
-  # app/views/authors/show.html.erb
-  l.store "Web site:", ""
-  l.store "MSN:", ""
-  l.store "Yahoo:", ""
-  l.store "Jabber:", ""
-  l.store "AIM:", ""
-  l.store "Twitter:", ""
-  l.store "About %s", ""
-
-  # app/views/comments/show.html.erb
-  l.store "This comment has been flagged for moderator approval.", ""
-
-  # app/views/errors/404.html.erb
-  l.store "Page not found", ""
-  l.store "The page you are looking for has moved or does not exist.", ""
-
-  # app/views/setup/index.html.erb
-  l.store "Welcome", ""
-
-  # app/views/shared/_confirm.html.erb
-  l.store "Congratulations!", ""
-  l.store "You have successfully signed up", ""
-  l.store "<strong>Login:</strong> %s", ""
-  l.store "<strong>Password:</strong> %s", ""
-  l.store "Don't lose the mail sent at %s or you won't be able to login anymore", ""
-
-  # test/mocks/themes/typographic/layouts/default.html.erb
-  l.store "Designed by %s ", ""
-
-  # test/mocks/themes/typographic/views/articles/_article.html.erb
-  l.store "Continue reading...", ""
-  l.store "This entry was posted on %s", ""
-  l.store "and %s", ""
-  l.store "You can follow any response to this entry through the %s", ""
-  l.store "Atom feed", ""
-  l.store "You can leave a %s", ""
-  l.store "or a %s from your own site", ""
-  l.store "comment", ""
-  l.store "trackback", ""
-
-  # test/mocks/themes/typographic/views/articles/_comment.html.erb
   l.store "later", "senere"
 
   # test/mocks/themes/typographic/views/articles/_comment_form.html.erb

lang/de_DE.rb

@@ -70,12 +70,6 @@
   l.store "Archives for ", ""
   l.store ", Articles for ", ""
 
-  # app/controllers/grouping_controller.rb
-  l.store "everything about", ""
-
-  # app/helpers/admin/base_helper.rb
-  l.store "Cancel", "Abbrechen"
-  l.store "Store", ""
   l.store "Delete", "Löschen"
   l.store "delete", ""
   l.store "Delete content", ""
@@ -451,86 +445,6 @@
   l.store "Comments are disabled", "Kommentare sind deaktiviert"
   l.store "Trackbacks are disabled", ""
 
-  # app/views/authors/show.html.erb
-  l.store "Web site:", ""
-  l.store "MSN:", ""
-  l.store "Yahoo:", ""
-  l.store "Jabber:", ""
-  l.store "AIM:", ""
-  l.store "Twitter:", ""
-  l.store "About %s", ""
-
-  # app/views/comments/show.html.erb
-  l.store "This comment has been flagged for moderator approval.", ""
-
-  # app/views/errors/404.html.erb
-  l.store "Page not found", ""
-  l.store "The page you are looking for has moved or does not exist.", ""
-
-  # app/views/setup/index.html.erb
-  l.store "Welcome", ""
-
-  # app/views/shared/_confirm.html.erb
-  # l.store "Congratulations!", ""
-  l.store "You have successfully signed up", ""
-  l.store "<strong>Login:</strong> %s", ""
-  l.store "Don't lose the mail sent at %s or you won't be able to login anymore", ""
-
-  # test/mocks/themes/typographic/layouts/default.html.erb
-  l.store "Powered by %s", ""
-  l.store "Designed by %s ", ""
-
-  # test/mocks/themes/typographic/views/articles/_article.html.erb
-  l.store "Continue reading...", ""
-  l.store "This entry was posted on %s", ""
-  l.store "and %s", ""
-  l.store "You can follow any response to this entry through the %s", ""
-  l.store "Atom feed", ""
-  l.store "You can leave a %s", ""
-  l.store "or a %s from your own site", ""
-  l.store "comment", ""
-  l.store "trackback", ""
-
-  # test/mocks/themes/typographic/views/articles/_comment.html.erb
-  l.store "later", ""
-
-  # test/mocks/themes/typographic/views/articles/_comment_form.html.erb
-  l.store "Leave a comment", ""
-  l.store "Name %s", ""
-  l.store "enabled", ""
-  l.store "never displayed", ""
-  l.store "Website", ""
-  l.store "Textile enabled", ""
-  l.store "Markdown enabled", ""
-  l.store "required", ""
-
-  # test/mocks/themes/typographic/views/articles/_comment_list.html.erb
-  l.store "No comments", ""
-
-  # themes/dirtylicious/layouts/default.html.erb
-  l.store "About", ""
-  l.store "Designed by %s ported to publify by %s ", ""
-
-  # themes/scribbish/layouts/default.html.erb
-  l.store "styled with %s", ""
-
-  # themes/scribbish/views/articles/_article.html.erb
-  l.store "Meta", ""
-
-  # themes/true-blue-3/helpers/theme_helper.rb
-  l.store "You are here: ", ""
-  l.store "%d comment", ""
-
-  # themes/true-blue-3/views/articles/_article.html.erb
-  l.store "%%a, %%d %%b %%Y %%H:%%M", ""
-
-  # themes/true-blue-3/views/articles/_comment_form.html.erb
-  l.store "Email address", ""
-  l.store "Your website", ""
-
-  # themes/true-blue-3/views/articles/read.html.erb
-  l.store "If you liked this article you can %s", ""
-  l.store "add me to Twitter", ""
   l.store "Trackbacks for", "Trackback für"
 
   l.store "Read all articles in %s", ""