commontator 4.11.1 → 5.0.0

data/config/initializers/commontator.rb

@@ -2,7 +2,6 @@
 # All settings are initially set to their default values
 
 # Note: Do not "return" from a Proc, use "next" instead if necessary
-#       "return" in a lambda is OK
 Commontator.configure do |config|
   # Engine Configuration
 
@@ -11,8 +10,8 @@ Commontator.configure do |config|
   # Arguments: the current controller (ActionController::Base)
   # Returns: the current user (acts_as_commontator)
   # The default works for Devise and similar authentication plugins
-  # Default: lambda { |controller| controller.current_user }
-  config.current_user_proc = lambda { |controller| controller.current_user }
+  # Default: ->(controller) { controller.current_user }
+  config.current_user_proc = ->(controller) { controller.current_user }
 
   # javascript_proc
   # Type: Proc
@@ -23,8 +22,8 @@ Commontator.configure do |config|
   # Objects visible in view templates can be accessed
   # through the view object (for example, view.flash)
   # However, the view does not include the main application's helpers
-  # Default: lambda { |view| '$("#error_explanation").remove();' }
-  config.javascript_proc = lambda { |view| '$("#error_explanation").remove();' }
+  # Default: ->(view) { '$("#error_explanation").remove();' }
+  config.javascript_proc = ->(view) { '$("#error_explanation").remove();' }
 
 
 
@@ -34,8 +33,8 @@ Commontator.configure do |config|
   # Type: Proc
   # Arguments: a user (acts_as_commontator)
   # Returns: the user's name (String)
-  # Default: lambda { |user| I18n.t('commontator.anonymous') } (all users are anonymous)
-  config.user_name_proc = lambda { |user| I18n.t('commontator.anonymous') }
+  # Default: ->(user) { I18n.t('commontator.anonymous') } (all users are anonymous)
+  config.user_name_proc = ->(user) { I18n.t('commontator.anonymous') }
 
   # user_link_proc
   # Type: Proc
@@ -45,8 +44,8 @@ Commontator.configure do |config|
   # If anything non-blank is returned, the user's name in comments
   # comments will become a hyperlink pointing to this path
   # The main application's routes can be accessed through the app_routes object
-  # Default: lambda { |user, app_routes| '' } (no link)
-  config.user_link_proc = lambda { |user, app_routes| '' }
+  # Default: ->(user, app_routes) { '' } (no link)
+  config.user_link_proc = ->(user, app_routes) { '' }
 
   # user_avatar_proc
   # Type: Proc
@@ -60,12 +59,12 @@ Commontator.configure do |config|
   #       allows de-anonymization attacks against their email addresses
   #       If you absolutely want to keep users' email addresses or identities secret,
   #       do not use Gravatar or similar services
-  # Default: lambda { |user, view|
-  #            view.commontator_gravatar_image_tag(
-  #              user, 1, :s => 60, :d => 'mm') }
-  config.user_avatar_proc = lambda { |user, view|
-                                     view.commontator_gravatar_image_tag(
-                                       user, 1, :s => 60, :d => 'mm') }
+  # Default: ->(user, view) {
+  #   view.commontator_gravatar_image_tag(user, 1, s: 60, d: 'mm')
+  # }
+  config.user_avatar_proc = ->(user, view) {
+    view.commontator_gravatar_image_tag(user, 1, s: 60, d: 'mm')
+  }
 
   # user_email_proc
   # Type: Proc
@@ -76,8 +75,8 @@ Commontator.configure do |config|
   # to Gravatar, so you should always return the user's email address (if using Gravatar)
   # If the mailer argument is not nil, then Commontator intends to send an email to
   # the address returned; you can prevent it from being sent by returning a blank String
-  # Default: lambda { |user, mailer| user.try(:email) || '' }
-  config.user_email_proc = lambda { |user, mailer| user.try(:email) || '' }
+  # Default: ->(user, mailer) { user.try(:email) || '' }
+  config.user_email_proc = ->(user, mailer) { user.try(:email) || '' }
 
 
 
@@ -100,16 +99,16 @@ Commontator.configure do |config|
   # Arguments: a thread (Commontator::Thread), a user (acts_as_commontator)
   # Returns: a Boolean, true if and only if the user should be allowed to read that thread
   # Note: can be called with a user object that is nil (if they are not logged in)
-  # Default: lambda { |thread, user| true } (anyone can read any thread)
-  config.thread_read_proc = lambda { |thread, user| true }
+  # Default: ->(thread, user) { true } (anyone can read any thread)
+  config.thread_read_proc = ->(thread, user) { true }
 
   # thread_moderator_proc
   # Type: Proc
   # Arguments: a thread (Commontator::Thread), a user (acts_as_commontator)
   # Returns: a Boolean, true if and only if the user is a moderator for that thread
   # If you want global moderators, make this proc true for them regardless of thread
-  # Default: lambda { |thread, user| false } (no moderators)
-  config.thread_moderator_proc = lambda { |thread, user| false }
+  # Default: ->(thread, user) { false } (no moderators)
+  config.thread_moderator_proc = ->(thread, user) { false }
 
   # comment_editing
   # Type: Symbol
@@ -161,8 +160,8 @@ Commontator.configure do |config|
   # Returns: vote count to be displayed (String)
   # pos is the number of likes, or the rating, or the reputation
   # neg is the number of dislikes, if applicable, or 0 otherwise
-  # Default: lambda { |thread, pos, neg| "%+d" % (pos - neg) }
-  config.vote_count_proc = lambda { |thread, pos, neg| "%+d" % (pos - neg) }
+  # Default: ->(thread, pos, neg) { "%+d" % (pos - neg) }
+  config.vote_count_proc = ->(thread, pos, neg) { "%+d" % (pos - neg) }
 
   # comment_order
   # Type: Symbol
@@ -217,10 +216,12 @@ Commontator.configure do |config|
   # Arguments: a thread (Commontator::Thread)
   # Returns: the address emails are sent "from" (String)
   # Important: If using subscriptions, change this to at least match your domain name
-  # Default: lambda { |thread|
-  #                   "no-reply@#{Rails.application.class.parent.to_s.downcase}.com" }
-  config.email_from_proc = lambda { |thread|
-    "no-reply@#{Rails.application.class.parent.to_s.downcase}.com" }
+  # Default: ->(thread) {
+  #   "no-reply@#{Rails.application.class.parent.to_s.downcase}.com"
+  # }
+  config.email_from_proc = ->(thread) {
+    "no-reply@#{Rails.application.class.parent.to_s.downcase}.com"
+  }
 
   # commontable_name_proc
   # Type: Proc
@@ -228,9 +229,9 @@ Commontator.configure do |config|
   # Returns: a name that refers to the commontable object (String)
   # If you have multiple commontable models, you can also pass this
   # configuration value as an argument to acts_as_commontable for each one
-  # Default: lambda { |thread|
+  # Default: ->(thread) {
   #                   "#{thread.commontable.class.name} ##{thread.commontable.id}" }
-  config.commontable_name_proc = lambda { |thread|
+  config.commontable_name_proc = ->(thread) {
     "#{thread.commontable.class.name} ##{thread.commontable.id}" }
 
   # comment_url_proc
@@ -240,12 +241,13 @@ Commontator.configure do |config|
   # Returns: a String containing the url of the view that displays the given comment
   # This usually is the commontable's "show" page
   # The main application's routes can be accessed through the app_routes object
-  # Default: lambda { |comment, app_routes|
-  #                   app_routes.polymorphic_url(comment.thread.commontable,
-  #                                              anchor: "comment_#{comment.id}_div") }
+  # Default: ->(comment, app_routes) {
+  #   app_routes.polymorphic_url(comment.thread.commontable, anchor: "comment_#{comment.id}_div")
+  # }
   # (defaults to the commontable's show url with an anchor pointing to the comment's div)
-  config.comment_url_proc = lambda { |comment, app_routes|
-    app_routes.polymorphic_url(comment.thread.commontable, anchor: "comment_#{comment.id}_div") }
+  config.comment_url_proc = ->(comment, app_routes) {
+    app_routes.polymorphic_url(comment.thread.commontable, anchor: "comment_#{comment.id}_div")
+  }
 
   # mentions_enabled
   # Type: Boolean
@@ -260,6 +262,7 @@ Commontator.configure do |config|
   # Type: Proc
   # Arguments:
   #   the current user (acts_as_commontator)
+  #   the current thread (Commontator::Thread)
   #   the search query inputted by user (String)
   # Returns: an ActiveRecord Relation object
   # Important notes:
@@ -272,8 +275,10 @@ Commontator.configure do |config|
   #    Make sure to handle SQL escaping properly and that the
   #    attribute being searched does not contain sensitive information.
   #
-  # Default: lambda { |current_user, query|
-  #                   current_user.class.where('username LIKE ?', "#{query}%") }
-  config.user_mentions_proc = lambda { |current_user, query|
-    current_user.class.where('username LIKE ?', "#{query}%") }
+  # Default: ->(current_user, query) {
+  #   current_user.class.where('username LIKE ?', "#{query}%")
+  # }
+  config.user_mentions_proc = ->(current_user, thread, query) {
+    current_user.class.where('username LIKE ?', "#{query}%")
+  }
 end

data/config/locales/de.yml

@@ -0,0 +1,100 @@
+# Files in the config/locales directory are used for internationalization
+# and are automatically loaded by Rails. If you want to use locales other
+# than English, add the necessary files in this directory.
+#
+# To use the locales, use `I18n.t`:
+#
+#     I18n.t 'hello'
+#
+# In views, this is aliased to just `t`:
+#
+#     <%= t('hello') %>
+#
+# To use a different locale, set it with `I18n.locale`:
+#
+#     I18n.locale = :es
+#
+# This would use the information in config/locales/es.yml.
+#
+# To learn more, please read the Rails Internationalization guide
+# available at http://guides.rubyonrails.org/i18n.html.
+
+---
+de:
+  activerecord:
+    attributes:
+      commontator/comment:
+        body: Kommentar
+        creator: Ersteller
+        editor: Bearbeiter
+        thread: Diskussion
+      commontator/subscription:
+        subscriber: Subscriber
+        thread: Diskussion
+      commontator/thread:
+        commontable: Commontable
+    models:
+      commontator/comment:
+        one: Kommentar
+        other: Kommentare
+      commontator/subscription:
+        one: Subscription
+        other: Subscriptions
+      commontator/thread:
+        one: Diskussion
+        other: Diskussionen
+  commontator:
+    anonymous: Anonymous
+    comment:
+      actions:
+        cancel: Abbrechen
+        confirm_delete: "Sind Sie sicher, dass sie diesen Kommentar löschen wollen?"
+        create: "Kommentar speichern"
+        delete: Löschen
+        edit: Bearbeiten
+        new: "Neuer Kommentar"
+        undelete: Löschen rückgängig
+        update: "Kommentar bearbeiten"
+      errors:
+        already_deleted: "Dieser Kommentar wurde bereits gelöscht."
+        create: "Kommentar kann nicht veröffentlicht werden:"
+        double_posted: "Kommentar ist ein Duplikat."
+        not_deleted: "Dieser Kommentar wurde nicht gelöscht.."
+        update: "Kommentar kann nicht bearbeitet werden:"
+      status:
+        created_at: "Veröffentlich am %{created_at}."
+        deleted_by: "Kommentar gelöscht von %{deleter_name}."
+        updated_at: "Bearbeitet von %{editor_name} am %{updated_at}."
+    email:
+      comment_created:
+        body: "%{creator_name} kommentierte zu %{commontable_name}:"
+        subject: "%{creator_name} veröffentlichte einen Kommentar zu %{commontable_name}"
+      thread_link_html: "<a href=\"%{comment_url}\">Hier klicken</a> um alle Kommentare zu %{commontable_name} zu sehen."
+    require_login: "Sie müssen sich anmelden bevor sie einen Kommentar veröffentlichen können."
+    subscription:
+      actions:
+        confirm_unsubscribe: "Sind Sie sicher, dass sie keine Nachrichten mehr zur Diskussion erhalten möchten?"
+        subscribe: Subscribe
+        unsubscribe: Unsubscribe
+      errors:
+        already_subscribed: "Sie erhalten zu der Diskussion bereits Aktualisierungen"
+        not_subscribed: "Sie erhalten zu der Diskussion keine Nachrichten."
+    thread:
+      actions:
+        show_all: "Alle Kommentare anzeigen"
+        filter: "Kommentare filtern"
+        close: "Diskussion beenden"
+        confirm_close: "Sind Sie sicher, dass sie die Diskussion schliessen wollen?"
+        reopen: "Diskussion wieder eröffnen"
+        show: "Kommentare anzeigen"
+        hide: "Kommentare ausblenden"
+      errors:
+        already_closed: "Diese Diskussion ist bereits geschlossen."
+        not_closed: "Diese Diskussion ist nicht geschlossen."
+      status:
+        cannot_post: "Zurzeit können keine neuen Kommentare verfasst werden."
+        closed: "Kommentare (geschlossen von %{closer_name})"
+        open: Kommentare
+  time:
+    formats:
+      commontator: "%d. %B %Y um %H:%m %Z"

data/config/locales/en.yml

@@ -19,34 +19,34 @@
 # To learn more, please read the Rails Internationalization guide
 # available at http://guides.rubyonrails.org/i18n.html.
 
---- 
-en: 
-  activerecord: 
-    attributes: 
-      commontator/comment: 
+---
+en:
+  activerecord:
+    attributes:
+      commontator/comment:
         body: Comment
         creator: Creator
         editor: Editor
         thread: Discussion
-      commontator/subscription: 
+      commontator/subscription:
         subscriber: Subscriber
         thread: Discussion
-      commontator/thread: 
+      commontator/thread:
         commontable: Commontable
-    models: 
-      commontator/comment: 
+    models:
+      commontator/comment:
         one: comment
         other: comments
-      commontator/subscription: 
+      commontator/subscription:
         one: subscription
         other: subscriptions
-      commontator/thread: 
+      commontator/thread:
         one: thread
         other: threads
-  commontator: 
+  commontator:
     anonymous: Anonymous
-    comment: 
-      actions: 
+    comment:
+      actions:
         cancel: Cancel
         confirm_delete: "Are you sure you want to delete this comment?"
         create: "Post Comment"
@@ -55,33 +55,32 @@ en:
         new: "New Comment"
         undelete: Undelete
         update: "Modify Comment"
-      errors: 
+      errors:
         already_deleted: "This comment has already been deleted."
         create: "This comment could not be posted because:"
         double_posted: "is a duplicate of another comment."
         not_deleted: "This comment is not deleted."
         update: "This comment could not be modified because:"
-      status: 
+      status:
         created_at: "Posted on %{created_at}."
         deleted_by: "Comment deleted by %{deleter_name}."
         updated_at: "Last modified by %{editor_name} on %{updated_at}."
-    email: 
-      comment_created: 
+    email:
+      comment_created:
         body: "%{creator_name} commented on %{commontable_name}:"
         subject: "%{creator_name} posted a comment on %{commontable_name}"
       thread_link_html: "<a href=\"%{comment_url}\">Click here</a> to view all comments on %{commontable_name}."
-      undisclosed_recipients: "Undisclosed Recipients"
     require_login: "You must login before you can post a comment."
-    subscription: 
-      actions: 
+    subscription:
+      actions:
         confirm_unsubscribe: "Are you sure you want to unsubscribe from this discussion?"
         subscribe: Subscribe
         unsubscribe: Unsubscribe
-      errors: 
+      errors:
         already_subscribed: "You are already subscribed to this discussion."
         not_subscribed: "You are not subscribed to this discussion."
-    thread: 
-      actions: 
+    thread:
+      actions:
         show_all: "Show All Comments"
         filter: "Filter Comments"
         close: "Close Discussion"
@@ -92,10 +91,10 @@ en:
       errors:
         already_closed: "This discussion has already been closed."
         not_closed: "This discussion is not closed."
-      status: 
+      status:
         cannot_post: "New comments cannot be posted at this time."
         closed: "Comments (Closed by %{closer_name})"
         open: Comments
-  time: 
-    formats: 
+  time:
+    formats:
       commontator: "%b %d %Y at %I:%M%p %Z"

data/config/locales/pt-BR.yml

@@ -0,0 +1,78 @@
+pt-BR:
+  activerecord:
+    attributes:
+      commontator/comment:
+        body: Comentário
+        creator: Criador
+        editor: Editor
+        thread: Discussão
+      commontator/subscription:
+        subscriber: Assinante
+        thread: Discussão
+      commontator/thread:
+        commontable: Comentável
+    models:
+      commontator/comment:
+        one: comentário
+        other: comentários
+      commontator/subscription:
+        one: inscrição
+        other: incrições
+      commontator/thread:
+        one: tópico
+        other: tópicos
+  commontator:
+    anonymous: Anônimo
+    comment:
+      actions:
+        cancel: Cancelar
+        confirm_delete: "Tem certeza que deseja remover esse comentário?"
+        create: "Postar comentário"
+        delete: Deletar
+        edit: Editar
+        new: "Novo comentário"
+        undelete: Desfazer
+        update: "Editar comentário"
+      errors:
+        already_deleted: "esse comentário já foi removido."
+        create: "Esse comentário não pôde ser postado porque:"
+        double_posted: "é um comentário duplicado."
+        not_deleted: "Esse comentário não foi removido."
+        update: "Esse comentário não pôde ser editado porque:"
+      status:
+        created_at: "Postado em %{created_at}."
+        deleted_by: "Comentário removido por %{deleter_name}."
+        updated_at: "Última edição por %{editor_name} em %{updated_at}."
+    email:
+      comment_created:
+        body: "%{creator_name} comentou em %{commontable_name}:"
+        subject: "%{creator_name} postou um comentário em %{commontable_name}"
+      thread_link_html: "<a href=\"%{comment_url}\">Clique aqui</a> para ver todos os comentários em %{commontable_name}."
+    require_login: "Você deve fazer login para postar um comentário."
+    subscription:
+      actions:
+        confirm_unsubscribe: "Tem certeza que deseja cancelar sua inscrição nessa discussão?"
+        subscribe: Inscrever-se
+        unsubscribe: Cancelar inscrição
+      errors:
+        already_subscribed: "Você já está inscrito nessa discussão."
+        not_subscribed: "Você não está inscrito nessa discussão."
+    thread:
+      actions:
+        show_all: "Mostrar todos os comentários"
+        filter: "Filtrar comentários"
+        close: "Fechar discussão"
+        confirm_close: "Tem certeza que deseja fechar a discussão?"
+        reopen: "Reabrir discussão"
+        show: "Mostrar comentários"
+        hide: "Esconder comentários"
+      errors:
+        already_closed: "Essa discussão já foi fechada."
+        not_closed: "Essa discussão não está fechada."
+      status:
+        cannot_post: "Não é possível postar novos comentários."
+        closed: "Comentários (Fechado por %{closer_name})"
+        open: Comentários
+  time:
+    formats:
+      commontator: "%b %d %Y às %I:%M%p %Z"