thredded 0.13.2 → 0.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7416385c145b5e7eeba5d467af646575c446bb36
-  data.tar.gz: d38d5a6a62ac0a7c6c55bd447d3017212bd56497
+  metadata.gz: 446cac9b09b4d4bf92db6feaa8fdf3ed2b3708fc
+  data.tar.gz: f2c7b6e776222e744532f53dc5ae04ed475353a7
 SHA512:
-  metadata.gz: f01171d77c219e0b99d9fbbfcbe3952d4608538dba57e0ae24fed859592be1393f80d22bda591dc4ab08c9b59e588589599029d11318a407dc3fe65130e8f9bd
-  data.tar.gz: 1553e44d9c615400ff486999cca6dfade9532531f66b268995bb1537d0c5d4faf54a1ba432852a8ee1b2ec52ff11fff933d202317987b18f5c4e58d15a6b5fe1
+  metadata.gz: 9872e5d357a029ea8ca930b1c600ebd6687d26d7b2d6c8c710734cba6c5ec3e84795811b9ed905f3754d2baad27fa66bad7ab182674024695a3cf7be06495861
+  data.tar.gz: b90d6d78537a2f1060aaf78f121fd15862bbab0d6c71e23403f22fee080fe1d9fdf54fd13073b121e1a465d200e1ff941bbb46ef3bb0ec8a5ffd128b9d278b3f

data/README.md

@@ -98,7 +98,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.13.2'
+gem 'thredded', '~> 0.13.3'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -229,7 +229,9 @@ Include thredded JavaScripts in your `application.js`:
 
 Thredded is fully compatible with deferred and async script loading.
 
-##### Rails UJS version
+##### Alternative JavaScript dependencies
+
+<details><summary><b>Rails UJS version</b></summary>
 
 By default, thredded loads `rails-ujs`. If you're using Rails before v5.1, you need to add `rails-ujs` to
 your Gemfile.
@@ -240,8 +242,9 @@ If you'd like it to use `jquery_ujs` instead, run this command from your app dir
 mkdir -p app/assets/javascripts/thredded/dependencies/
 printf '//= require jquery3\n//= require jquery_ujs\n' > app/assets/javascripts/thredded/dependencies/ujs.js
 ```
+</details>
 
-##### Timeago version
+<details><summary><b>Timeago version</b></summary>
 
 By default, thredded loads `timeago.js`.
 
@@ -261,6 +264,7 @@ E.g. for Brazilian Portuguese with jquery.timeago:
  //= require locales/jquery.timeago.pt-br
  //= require thredded/thredded
  ```
+</details>
 
 #### Thredded page title and ID
 
@@ -377,7 +381,7 @@ change_column_default :thredded_user_preferences, :auto_follow_topics, 1
 ## I18n
 
 Thredded is mostly internationalized. It is currently available in English, Brazilian Portuguese, Polish, Russian,
-and Spanish.
+French, and Spanish.
 We welcome PRs adding support for new languages.
 
 Here are the steps to ensure the best support for your language if it isn't English:
@@ -387,9 +391,13 @@ Here are the steps to ensure the best support for your language if it isn't Engl
 2. Require the translations for timeago.js in your JavaScript. E.g. for Brazilian Portuguese:
 
    ```js
+   //= require thredded/dependencies/timeago
    //= require timeago/locales/pt_BR
+   //= require thredded
    ```
 
+   Note that it is important that timeago and its locales are required *before* `//= require thredded`.
+
 3. To generate URL slugs for messageboards, categories, and topics with support for more language than English,
    you can use a gem like [babosa](https://github.com/norman/babosa).
    Add babosa to your Gemfile and uncomment the `Thredded.slugifier` proc for babosa in the initializer.
@@ -603,9 +611,20 @@ run tasks that maintain the test database.
 By default, SQLite is used in development and test. On Travis, the tests will run using SQLite, PostgreSQL, MySQL,
 and all the supported Rails versions.
 
-The test suite requires [PhantomJS](http://phantomjs.org) to be present in the path.
-To install it, run `sudo apt-get install phantomjs` on Ubuntu or Debian, or `brew install phantomjs` on Mac.
-For other operating systems, refer to the [PhantomJS documentation](http://phantomjs.org/download.html).
+The test suite requires Chromium v59+ and its WebDriver installed:
+
+On Ubuntu, run:
+
+```bash
+sudo apt-get install chromium-chromedriver
+```
+
+On Mac, run:
+
+```bash
+brew cask install chromium
+brew install chromedriver
+```
 
 ### Ruby
 

data/app/assets/stylesheets/thredded/components/_post.scss

@@ -49,13 +49,19 @@
   vertical-align: baseline;
   width: 1.75rem; // 28px
 
-  @include thredded-media-content-breakout {
+  @media (min-width: $thredded-grid-container-max-width + $thredded-content-breakout-min-width + 0.00001rem) {
     height: 2.25rem; // 36px
     left: -3rem;
     position: absolute;
     top: -0.5rem;
     width: 2.25rem; // 36px
   }
+
+  @media (min-width: $thredded-grid-container-max-width + $thredded-content-breakout-min-width + 9.5rem + 0.00001rem) {
+    height: 3.25rem;
+    left: -4.125rem;
+    width: 3.25rem;
+  }
 }
 
 .thredded--post--topic {

data/app/mailer_previews/thredded/private_topic_mailer_preview.rb

@@ -4,12 +4,8 @@ module Thredded
   # Previews for the PrivateTopicMailer
   class PrivateTopicMailerPreview < BaseMailerPreview
     def message_notification
-      post = mock_private_post(content: mock_content(mention_users: ['glebm']))
       PrivateTopicMailer.message_notification(
-        mock_private_topic(posts: [
-                             post
-                           ]),
-        post,
+        mock_private_post(content: mock_content(mention_users: ['glebm'])),
         %w[glebm@test.com joel@test.com]
       )
     end

data/app/mailers/thredded/post_mailer.rb

@@ -3,14 +3,19 @@
 module Thredded
   class PostMailer < Thredded::BaseMailer
     def post_notification(post_id, emails)
-      @post                = find_record Thredded::Post, post_id
-      email_details        = Thredded::TopicEmailView.new(@post.postable)
+      @post = find_record Thredded::Post, post_id
+      email_details = Thredded::TopicEmailView.new(@post.postable)
       headers['X-SMTPAPI'] = email_details.smtp_api_tag('post_notification')
 
-      mail from:     email_details.no_reply,
-           to:       email_details.no_reply,
-           bcc:      emails,
-           subject:  email_details.subject
+      mail from: email_details.no_reply,
+           to: email_details.no_reply,
+           bcc: emails,
+           subject: [
+             Thredded.email_outgoing_prefix,
+             t('thredded.emails.post_notification.subject',
+               user: @post.user.thredded_display_name,
+               topic_title: @post.postable.title)
+           ].compact.join
     end
   end
 end

data/app/mailers/thredded/private_topic_mailer.rb

@@ -2,16 +2,20 @@
 
 module Thredded
   class PrivateTopicMailer < Thredded::BaseMailer
-    def message_notification(private_topic_id, post_id, emails)
-      @topic               = find_record Thredded::PrivateTopic, private_topic_id
-      @post                = find_record Thredded::PrivatePost, post_id
-      email_details        = Thredded::TopicEmailView.new(@topic)
+    def message_notification(post_id, emails)
+      @post = find_record Thredded::PrivatePost, post_id
+      email_details = Thredded::TopicEmailView.new(@post.postable)
       headers['X-SMTPAPI'] = email_details.smtp_api_tag('private_topic_mailer')
 
-      mail from:     email_details.no_reply,
-           to:       email_details.no_reply,
-           bcc:      emails,
-           subject:  email_details.subject
+      mail from: email_details.no_reply,
+           to: email_details.no_reply,
+           bcc: emails,
+           subject: [
+             Thredded.email_outgoing_prefix,
+             t('thredded.emails.message_notification.subject',
+               user: @post.user.thredded_display_name,
+               topic_title: @post.postable.title)
+           ].compact.join
     end
   end
 end

data/app/models/thredded/user_topic_follow.rb

@@ -21,8 +21,10 @@ module Thredded
     #
     # @return [Thredded::UserTopicFollow]
     def self.create_unless_exists(user_id, topic_id, reason = :manual)
-      transaction(requires_new: true) do
-        create_with(reason: reason).find_or_create_by(user_id: user_id, topic_id: topic_id)
+      uncached do
+        transaction(requires_new: true) do
+          create_with(reason: reason).find_or_create_by(user_id: user_id, topic_id: topic_id)
+        end
       end
     rescue ActiveRecord::RecordNotUnique
       # The record has been created from another connection, retry to find it.

data/app/notifiers/thredded/email_notifier.rb

@@ -15,7 +15,7 @@ module Thredded
     end
 
     def new_private_post(post, users)
-      PrivateTopicMailer.message_notification(post.postable.id, post.id, users.map(&:email)).deliver_now
+      PrivateTopicMailer.message_notification(post.id, users.map(&:email)).deliver_now
     end
   end
 end

data/app/view_models/thredded/topic_email_view.rb

@@ -11,10 +11,6 @@ module Thredded
       %({"category": ["thredded_#{@topic.private? ? 'private_topic' : @topic.messageboard.name}","#{tag}"]})
     end
 
-    def subject
-      "#{Thredded.email_outgoing_prefix} #{@topic.title}"
-    end
-
     def no_reply
       Thredded.email_from
     end

data/app/views/thredded/post_mailer/post_notification.html.erb

@@ -1,7 +1,10 @@
 <div class="thredded--email">
   <figure class="thredded--email-post">
     <figcaption class="thredded--email-post--author">
-      <%= @post.user.thredded_display_name %> <%= link_to 'said', post_permalink_url(@post) %>:
+      <%= t 'thredded.emails.post_notification.html.post_lead_html',
+            user: @post.user.thredded_display_name,
+            post_url: post_permalink_url(@post.id),
+            topic_title: @post.postable.title %>
     </figcaption>
     <% cache [@post, 'content-onebox-placeholders'] do %>
       <%= render partial: 'thredded/posts/content',
@@ -11,13 +14,13 @@
   <hr/>
 
   <p>
-    This email was sent to you because you are following this topic
-    "<%= link_to @post.postable.title, post_permalink_url(@post.id) %>".
-    <%= link_to 'View the conversation here', topic_url(@post.postable) %>.
+    <%= t 'thredded.emails.post_notification.html.email_sent_reason_html',
+          post_url: post_permalink_url(@post.id),
+          topic_title: @post.postable.title %>
   </p>
 
   <p>
-    To unsubscribe from these emails, update your
-    <%= link_to 'preferences', edit_messageboard_preferences_url(@post.messageboard) %>.
+    <%= t 'thredded.emails.post_notification.html.unsubscribe_instructions_html',
+          preferences_url: edit_messageboard_preferences_url(@post.messageboard) %>
   </p>
 </div>

data/app/views/thredded/post_mailer/post_notification.text.erb

@@ -1,10 +1,14 @@
+<%= t 'thredded.emails.post_notification.text.post_lead',
+      user: @post.user.thredded_display_name,
+      topic_title: @post.postable.title %>
+
 <%= @post.content %>
 
 ---
 
-This email was sent to you because you are following this topic
-"<%= @post.postable.title %>". Go here to view the conversation:
-<%= post_permalink_url @post %>
+<%= t 'thredded.emails.post_notification.text.email_sent_reason',
+      topic_title: @post.postable.title,
+      post_url: post_permalink_url(@post.id) %>
 
-To unsubscribe from these emails, update your preferences here:
-  <%= edit_messageboard_preferences_url @post.messageboard %>
+<%= t 'thredded.emails.post_notification.text.unsubscribe_instructions',
+      unsubscribe_url: edit_messageboard_preferences_url(@post.messageboard) %>

data/app/views/thredded/private_topic_mailer/message_notification.html.erb

@@ -1,7 +1,10 @@
 <div class="thredded--email">
   <figure class="thredded--email-post">
     <figcaption class="thredded--email-post--author">
-      <%= @post.user.thredded_display_name %> <%= link_to 'said', private_post_permalink_url(@post) %>:
+      <%= t 'thredded.emails.message_notification.html.post_lead_html',
+            user: @post.user.thredded_display_name,
+            post_url: private_post_permalink_url(@post.id),
+            topic_title: @post.postable.title %>
     </figcaption>
     <% cache [@post, 'content-onebox-placeholders'] do %>
       <%= render partial: 'thredded/private_posts/content',
@@ -10,11 +13,14 @@
   </figure>
   <hr/>
   <p>
-    This email was sent to you because <%= @topic.user.thredded_display_name %> included you in a
-    private topic, "<%= link_to @topic.title, private_topic_url(@topic) %>".
+    <%= t 'thredded.emails.message_notification.html.email_sent_reason_html',
+          user: @post.postable.user.thredded_display_name,
+          post_url: private_post_permalink_url(@post.id),
+          topic_title: @post.postable.title %>
   </p>
 
   <p>
-    To unsubscribe from these emails, update your <%= link_to 'preferences', edit_preferences_url %>.
+    <%= t 'thredded.emails.message_notification.html.unsubscribe_instructions_html',
+          preferences_url: edit_preferences_url %>
   </p>
 </div>

data/app/views/thredded/private_topic_mailer/message_notification.text.erb

@@ -1,12 +1,15 @@
-<%= @post.user.thredded_display_name %> said:
+<%= t 'thredded.emails.message_notification.text.post_lead',
+      user: @post.user.thredded_display_name,
+      topic_title: @post.postable.title %>
+
 <%= @post.content %>
----
 
-This email was sent to you because <%= @topic.user.thredded_display_name %>
-included you in the private topic "<%= @topic.title %>".
+---
 
-Go here to view the conversation:
-  <%= private_post_permalink_url(@post) %>
+<%= t 'thredded.emails.message_notification.text.email_sent_reason',
+      user: @post.postable.user.thredded_display_name,
+      topic_title: @post.postable.title,
+      post_url: private_post_permalink_url(@post.id) %>
 
-To unsubscribe from these emails, update your preferences here:
-  <%= edit_preferences_url %>
+<%= t 'thredded.emails.message_notification.text.unsubscribe_instructions',
+      unsubscribe_url: edit_preferences_url %>

data/config/locales/en.yml

@@ -6,6 +6,40 @@ en:
       content_blocked_notice_with_record_html: Blocked by %{moderator} %{time_ago}
     email_notifier:
       by_email: by email
+    emails:
+      message_notification:
+        html:
+          email_sent_reason_html: >-
+            This email was sent to you because %{user} included you in a private topic, “<a href="%{post_url}">%{topic_title}</a>”.
+          post_lead_html: 'A new message from %{user} in <a href="%{post_url}">“%{topic_title}”</a>:'
+          unsubscribe_instructions_html: :thredded.emails.post_notification.html.unsubscribe_instructions_html
+        subject: A new message from %{user} in “%{topic_title}”
+        text:
+          email_sent_reason: |-
+            This email was sent to you because %{user} included you in
+            the private topic “%{topic_title}”.
+
+            Go here to view the conversation:
+            %{post_url}
+          post_lead: 'A new message from %{user} in “%{topic_title}”:'
+          unsubscribe_instructions: :thredded.emails.post_notification.text.unsubscribe_instructions
+      post_notification:
+        html:
+          email_sent_reason_html: 'This email was sent to you because you are following this topic: “<a href="%{post_url}">%{topic_title}</a>”.'
+          post_lead_html: '%{user} <a href="%{post_url}">said in “%{topic_title}”</a>:'
+          unsubscribe_instructions_html: To unsubscribe from these emails, update your <a href="%{preferences_url}">preferences</a>.
+        subject: A new post in “%{topic_title}” by %{user}
+        text:
+          email_sent_reason: |-
+            This email was sent to you because you are following
+            the topic “%{topic_title}”.
+
+            Go here to view the conversation:
+            %{post_url}
+          post_lead: "%{user} said in “%{topic_title}”:"
+          unsubscribe_instructions: |-
+            To unsubscribe from these emails, update your preferences here:
+            %{unsubscribe_url}
     errors:
       login_required: Please sign in first.
       not_authorized: You are not authorized to access this page.

data/config/locales/es.yml

@@ -6,6 +6,42 @@ es:
       content_blocked_notice_with_record_html: Censurado por %{moderator} hace %{time_ago}
     email_notifier:
       by_email: vía email
+    emails:
+      message_notification:
+        html:
+          email_sent_reason_html: >-
+            Este correo electrónico se te envió porque %{user} te incluyó en un tema privado, "<a href="%{post_url}">%{topic_title}</a>".
+          post_lead_html: 'Un nuevo mensaje de %{user} en <a href="%{post_url}">"%{topic_title}"</a>:'
+          unsubscribe_instructions_html: :thredded.emails.post_notification.html.unsubscribe_instructions_html
+        subject: Un nuevo mensaje de %{user} en "%{topic_title}"
+        text:
+          email_sent_reason: |-
+            Este correo electrónico se te envió porque %{user} te incluyó en
+            el tema privado "%{topic_title}".
+
+            Ve aquí para ver la conversación:
+            %{post_url}
+          post_lead: 'Un nuevo mensaje de %{user} en "%{topic_title}":'
+          unsubscribe_instructions: :thredded.emails.post_notification.text.unsubscribe_instructions
+      post_notification:
+        html:
+          email_sent_reason_html: >-
+            Este correo electrónico se le envió porque está siguiendo este tema: "<a href="%{post_url}">%{topic_title}</a>".
+          post_lead_html: '%{user} <a href="%{post_url}">dijo en "%{topic_title}"</a>:'
+          unsubscribe_instructions_html: >-
+            Para cancelar la suscripción a estos correos electrónicos, actualice sus <a href="%{preferences_url}">preferencias</a>.
+        subject: Un nuevo mensaje en "%{topic_title}" de %{user}
+        text:
+          email_sent_reason: |-
+            Este correo electrónico se te envió porque estás siguiendo
+            el tema "%{topic_title}".
+
+            Ve aquí para ver la conversación:
+            %{post_url}
+          post_lead: '%{user} dijo en "%{topic_title}":'
+          unsubscribe_instructions: |-
+            Para anular la suscripción de estos correos electrónicos, actualice sus preferencias aquí:
+            %{unsubscribe_url}
     errors:
       login_required: Por favor, inicia sesión.
       not_authorized: No estás autorizado para ver esta página.

data/config/locales/fr.yml

@@ -0,0 +1,238 @@
+---
+fr:
+  thredded:
+    content_moderation_states:
+      content_blocked_notice: Bloqué
+      content_blocked_notice_with_record_html: Bloqué par %{moderator} %{time_ago}
+    email_notifier:
+      by_email: via email
+    emails:
+      message_notification:
+        html:
+          email_sent_reason_html: >-
+            Ce courriel vous a été envoyé parce que %{user} vous a inclus dans un sujet privé, "<a href="%{post_url}">%{topic_title}</a>".
+          post_lead_html: 'Un nouveau message de %{user} dans <a href="%{post_url}">"%{topic_title}"</a>:'
+          unsubscribe_instructions_html: :thredded.emails.post_notification.html.unsubscribe_instructions_html
+        subject: Un nouveau message de %{user} dans "%{topic_title}"
+        text:
+          email_sent_reason: |-
+            Ce courriel vous a été envoyé parce que %{user} vous a inclus
+            le sujet privé "%{topic_title}".
+
+            Allez ici pour voir la conversation:
+            %{post_url}
+          post_lead: 'Un nouveau message de %{user} dans "%{topic_title}":'
+          unsubscribe_instructions: :thredded.emails.post_notification.text.unsubscribe_instructions
+      post_notification:
+        html:
+          email_sent_reason_html: 'Ce courriel vous a été envoyé car vous suivez ce sujet: "<a href="%{post_url}">%{topic_title}</a>".'
+          post_lead_html: '%{user} a <a href="%{post_url}">déclaré dans "%{topic_title}"</a>:'
+          unsubscribe_instructions_html: Pour vous désabonner de ces courriels, mettez à jour vos <a href="%{preferences_url}">préférences</a>.
+        subject: Une nouvelle publication dans "%{topic_title}" par %{user}
+        text:
+          email_sent_reason: |-
+            Ce courriel vous a été envoyé parce que vous suivez
+            le sujet "%{topic_title}".
+
+            Allez ici pour voir la conversation:
+            %{post_url}
+          post_lead: '%{user} a déclaré dans "%{topic_title}":'
+          unsubscribe_instructions: |-
+            Pour vous désabonner de ces courriels, mettez à jour vos préférences ici:
+            %{unsubscribe_url}
+    errors:
+      login_required: Connectez vous s'il vous plait
+      not_authorized: Vous n'êtes pas authorisé à accéder à cette page.
+      private_topic_create_denied: Vous n'êtes pas authorisé à créer des sujets.
+      private_topic_not_found: Ce sujet privé n'existe pas.
+    form:
+      create_btn_submitting: Création en cours...
+      preview: Aperçu
+      update: Mise à jour
+      update_btn_submitting: Mise à jour en cours...
+    messageboard:
+      create: Créer une Nouvelle Catégorie
+      form:
+        create_btn_submitting: :thredded.form.create_btn_submitting
+        description_label: Description
+        messageboard_group_id_label: Groupe de la catégorie
+        no_group: Pas de groupe
+        title_label: Nom
+        update_btn_submitting: :thredded.form.update_btn_submitting
+      index:
+        page_title: Catégories
+      last_updated_by_html: Mise à jour %{time_ago} <cite>par %{user}</cite>
+      topics_and_posts_counts: "%{topics_count} sujets / %{posts_count} commentaires"
+      update: :thredded.form.update
+      updated_notice: La catégorie a été mise à jour
+    messageboard_group:
+      create: Créer un nouveau groupe de catégorie
+      form:
+        create_btn_submitting: :thredded.form.create_btn_submitting
+      saved: Le Groupe %{name} a été créé
+    moderation:
+      approve_btn: Approuver
+      block_btn: Bloqué
+      pending:
+        empty:
+          content: Tous les commentaires ont été modérés.
+          title: Bien joué!
+      post_approved_html: Commentaire approuvé par %{moderator} %{time_ago}.
+      post_blocked_html: Commentaire bloqué par %{moderator} %{time_ago}.
+      post_deleted_notice: Ce commentaire a été effacé.
+      posts_content_changed_since_moderation_html: >-
+        Le <a href="%{post_url}">commentaire</a> a changé depuis qu'il a été modéré. La date de modération est affiché
+        en dessous.
+      search_users:
+        form_label: Rechercher des utilisateurs
+        form_placeholder: :thredded.moderation.search_users.form_label
+        no_results_message: Aucun utilisateur avec un nom commençant par %{query}
+        results_message: Utilisateurs avec le nom commençant par %{query}
+    nav:
+      all_messageboards: Toutes les catégories
+      edit_messageboard: Éditer la catégorie
+      edit_post: Éditer le commentaire
+      edit_private_topic: :thredded.nav.edit_topic
+      edit_topic: Éditer
+      mark_all_read: Marquer comme lu
+      moderation: Modération
+      moderation_activity: Activité
+      moderation_history: Historique
+      moderation_pending: En attente
+      moderation_users: Utilisateurs
+      private_topics: Messages Privés
+      settings: Paramètres de Notifications
+    null_user_name: Utilisateur effacé
+    posts:
+      delete: Supprimer le commentaire
+      delete_confirm: Êtes-vous sure de vouloir effacé ce commentaire ?
+      deleted_notice: Votre commentaire a été effacé.
+      edit: :thredded.nav.edit_post
+      form:
+        content_label: Contenu
+        create_btn: Soumettre la réponse
+        create_btn_submitting: Soumission en cours...
+        title_label: Écrire un commentaire
+        update_btn: Mettre à jour le commentaire
+        update_btn_submitting: :thredded.form.update_btn_submitting
+      pending_moderation_notice: Votre commentaire sera publié dès lors qu'il aura été validé par un modérateur.
+      quote_btn: Citer
+    preferences:
+      edit:
+        page_title: :thredded.nav.settings
+      form:
+        auto_follow_topics:
+          hint: Suivre automatiquement les nouveaux sujets. Changer ce paramètre affectera aussi toutes les catégories.
+          label: Suivre tout les nouveaux sujets
+        follow_topics_on_mention:
+          hint: 'Suivre un sujet lorsqu''on est mentionné par son nom (exemple: @marc)'
+          label: Suivre un sujet dans lequel vous êtes mentionné
+        messageboard_auto_follow_topics:
+          hint: >-
+            Suivre automatiquement tout les nouveaux sujets dans cette catégorie. Ce paramètre outrepasse le paramètre
+            relatif au dessus.
+          label: Suivre tout les nouveaux sujets
+        messageboard_follow_topics_on_mention:
+          hint: 'Quand quelqu''un mentionnera votre nom (exemple: @marc) dans cette catégorie, vous serez abonné
+            au sujet.'
+          label: :thredded.preferences.form.follow_topics_on_mention.label
+        messageboard_notifications_for_followed_topics:
+          label: :thredded.preferences.form.notifications_for_followed_topics.label
+        notifications_for_followed_topics:
+          label: Notifications pour les sujets suivis
+        notifications_for_private_topics:
+          label: Notifications pour les messages privés
+        submit_btn: Mettre à jour les paramètres
+        update_btn_submitting: :thredded.form.update_btn_submitting
+      global_preferences_title: Paramètres Globaux
+      messageboard_preferences_nav_title: Paramètre de la Catégorie
+      messageboard_preferences_title_html: Paramètre pour <em>%{messageboard}</em>
+      updated_notice: Vos paramètres ont été mise à jour.
+    private_posts:
+      form:
+        content_label: Message
+        create_btn: Envoyer le Message
+        create_btn_submitting: Message en cours d'envoi...
+        update_btn_submitting: :thredded.form.update_btn_submitting
+    private_topics:
+      edit: Éditer
+      errors:
+        user_ids_length: Spécifier au moins un autre utilisateur.
+      form:
+        content_label: :thredded.private_posts.form.content_label
+        create_btn: :thredded.private_posts.form.create_btn
+        create_btn_submitting: :thredded.private_posts.form.create_btn_submitting
+        title_label: :thredded.topics.form.title_label
+        title_placeholder_new: Écrire le sujet de cette conversation
+        title_placeholder_start: Commencer une nouvelle conversation
+        update_btn: Mettre à jour
+        update_btn_submitting: :thredded.private_posts.form.update_btn_submitting
+        users_label: Participants
+        users_placeholder: Sélectionner les utilisateurs qui participeront à cette conversation
+      no_private_topics:
+        create_btn: Commencer votre première conversation
+        title: Vous n'avez pas de messages privés.
+      updated_notice: Titre mise à jour
+    recent_activity: Activité récente
+    search:
+      form:
+        btn_submit: :thredded.search.form.label
+        label: Recherche
+        placeholder: Rechercher un Sujet ou un Commentaire
+    time_ago: il y a %{time}
+    topics:
+      delete_confirm: Êtes-vous sur de vouloir supprimer ce sujet ? Cette action est irréversible.
+      delete_topic: Supprimer le Sujet
+      deleted_notice: Sujet supprimé
+      edit: Éditer le Sujet
+      follow: Suivre le sujet
+      followed_by: 'Suivi par :'
+      followed_by_noone: Personne ne suit ce sujet
+      followed_notice: Vous suivez ce sujet
+      following:
+        auto: vous suivez ce sujet car la fonction de suivi automatique est activée.
+        manual: Vous suivez ce sujet.
+        mentioned: Vous suivez ce sujet car vous y avait été mentionné.
+        posted: Vous suivez ce sujet car vous y avait écris un commentaire.
+      form:
+        categories_placeholder: Catégories
+        content_label: :thredded.posts.form.content_label
+        create_btn: Créer un Nouveau Sujet
+        messageboard_label: Catégorie
+        title_label: Titre
+        title_placeholder: :thredded.topics.form.title_label
+        title_placeholder_start: Commencer un Nouveau Sujet
+        update_btn: Mettre à jour le Sujet
+      locked:
+        label: Verrouillé
+      mark_as_unread: Marquer comme non lu à partir d'ici
+      not_following: Vous ne suivez pas ce sujet.
+      search:
+        no_results_in_messageboard_message_html: Il n'y a aucun résultat pour votre recherche <q>%{query}</q> dans
+          %{messageboard}
+        no_results_message_html: Il n'y a aucun résultat pour votre recherche <q>%{query}</q>
+        page_title: Résultat de la Recherche de Sujet
+        results_in_messageboard_message_html: Recherche pour <q>%{query}</q> dans %{messageboard}
+        results_message_html: Recherche pour <q>%{query}</q>
+        search_in_all_messageboards_btn: Chercher partout
+      started_by_html: Démarré %{time_ago} par %{user}
+      sticky:
+        label: Collant
+      unfollow: Arrêter de Suivre
+      unfollowed_notice: Vous ne suivez dorénavant plus ce sujet
+      updated_notice: Sujet mis à jour
+    users:
+      currently_online: En ce moment connecté
+      last_active_html: 'Actif pour la dernière fois : %{time_ago}'
+      posted_in_topic_html: Commenté dans %{topic_link}
+      posts_count:
+        one: Commenté une seule fois
+        other: Commenté %{count} fois
+      recent_activity: :thredded.recent_activity
+      started_topic_html: Démarré %{topic_link}
+      started_topics_count:
+        one: Démarré un sujet
+        other: Démarré %{count} sujets
+      user_posted_in_topic_html: "%{user_link} a commenté dans %{topic_link}"
+      user_since_html: Utilisateur depuis %{time_ago}
+      user_started_topic_html: "%{user_link} démarré %{topic_link}"

data/config/locales/pl.yml

@@ -6,6 +6,41 @@ pl:
       content_blocked_notice_with_record_html: Zablokowany przez %{moderator} %{time_ago}
     email_notifier:
       by_email: przez e-mail
+    emails:
+      message_notification:
+        html:
+          email_sent_reason_html: >-
+            Ten e-mail został wysłany do Ciebie, ponieważ %{user} włącza Cię do prywatnego tematu "<a href="%{post_url}">%{topic_title}</a>".
+          post_lead_html: 'Nowa wiadomość z %{user} w <a href="%{post_url}">"%{topic_title}"</a>:'
+          unsubscribe_instructions_html: :thredded.emails.post_notification.html.unsubscribe_instructions_html
+        subject: Nowa wiadomość z %{user} w "%{topic_title}"
+        text:
+          email_sent_reason: |-
+            Ten e-mail został wysłany do Ciebie, ponieważ %{user} Cię włączyło
+            Prywatny temat "%{topic_title}".
+
+            Przejdź tutaj, aby wyświetlić rozmowę:
+            %{post_url}
+          post_lead: 'Nowa wiadomość z %{user} w "%{topic_title}":'
+          unsubscribe_instructions: :thredded.emails.post_notification.text.unsubscribe_instructions
+      post_notification:
+        html:
+          email_sent_reason_html: >-
+            Ten e-mail został wysłany do Ciebie, ponieważ śledzisz ten temat: "<a href="%{post_url}">%{topic_title}</a>".
+          post_lead_html: '%{user} <a href="%{post_url}">powiedział w "%{topic_title}"</a>:'
+          unsubscribe_instructions_html: Aby wypisać się z tych e-maili, zaktualizuj swoje <a href="%{preferences_url}">preferencje</a>.
+        subject: Nowy post w "%{topic_title}" przez %{user}
+        text:
+          email_sent_reason: |-
+            Ten e-mail został wysłany do Ciebie, ponieważ śledzisz
+            Temat "%{topic_title}".
+
+            Przejdź tutaj, aby wyświetlić rozmowę:
+            %{post_url}
+          post_lead: '%{user} powiedział w "%{topic_title}":'
+          unsubscribe_instructions: |-
+            Aby wypisać się z tych e-maili, zaktualizuj swoje preferencje:
+            %{unsubscribe_url}
     errors:
       login_required: Proszę się najpierw zalogować.
       not_authorized: Nie masz uprawnień aby zobaczyć tę stronę.

data/config/locales/pt-BR.yml

@@ -6,6 +6,41 @@ pt-BR:
       content_blocked_notice_with_record_html: Bloqueados por %{moderator} %{time_ago}
     email_notifier:
       by_email: de e-mail
+    emails:
+      message_notification:
+        html:
+          email_sent_reason_html: >-
+            Este e-mail foi enviado para você porque %{user} incluiu você em um tópico privado, "<a href="%{post_url}">%{topic_title}</a>".
+          post_lead_html: 'Uma nova mensagem de %{user} em <a href="%{post_url}">"%{topic_title}"</a>:'
+          unsubscribe_instructions_html: :thredded.emails.post_notification.html.unsubscribe_instructions_html
+        subject: Uma nova mensagem de %{user} em "%{topic_title}"
+        text:
+          email_sent_reason: |-
+            Este e-mail foi enviado para você porque %{user} incluiu você em
+            o tópico privado "%{topic_title}".
+
+            Vá aqui para ver a conversa:
+            %{post_url}
+          post_lead: 'Uma nova mensagem de %{user} em "%{topic_title}":'
+          unsubscribe_instructions: :thredded.emails.post_notification.text.unsubscribe_instructions
+      post_notification:
+        html:
+          email_sent_reason_html: >-
+            Este e-mail foi enviado para você porque você está seguindo este tópico: "<a href="%{post_url}">%{topic_title}</a>".
+          post_lead_html: '%{user} <a href="%{post_url}">disse em "%{topic_title}"</a>:'
+          unsubscribe_instructions_html: Para cancelar a inscrição desses e-mails, atualize suas <a href="%{preferences_url}">preferências</a>.
+        subject: Uma nova postagem em "%{topic_title}" por %{user}
+        text:
+          email_sent_reason: |-
+            Este e-mail foi enviado para você porque você está seguindo
+            o tópico "%{topic_title}".
+
+            Vá aqui para ver a conversa:
+            %{post_url}
+          post_lead: '%{user} disse em "%{topic_title}":'
+          unsubscribe_instructions: |-
+            Para cancelar a inscrição desses e-mails, atualize suas preferências aqui:
+            %{unsubscribe_url}
     errors:
       login_required: Por favor, autentique-se primeiro.
       not_authorized: Você não está autorizado a acessar esta página.

data/config/locales/ru.yml

@@ -6,6 +6,40 @@ ru:
       content_blocked_notice_with_record_html: Блокировано %{moderator} %{time_ago}
     email_notifier:
       by_email: email
+    emails:
+      message_notification:
+        html:
+          email_sent_reason_html: >-
+            Это письмо было отправлено вам, потому что %{user} добавил вас в приватную тему «<a href="%{post_url}">%{topic_title}</a>».
+          post_lead_html: 'Новое сообщение от %{user} в <a href="%{post_url}">«%{topic_title}»</a>:'
+          unsubscribe_instructions_html: :thredded.emails.post_notification.html.unsubscribe_instructions_html
+        subject: Новое сообщение от %{user} в «%{topic_title}»
+        text:
+          email_sent_reason: |-
+            Это письмо было отправлено вам, потому что %{user} добавил вас в
+            приватную тему «%{topic_title}».
+
+            Перейдите сюда, чтобы просмотреть разговор:
+            %{post_url}
+          post_lead: 'Новое сообщение от %{user} в «%{topic_title}»:'
+          unsubscribe_instructions: :thredded.emails.post_notification.text.unsubscribe_instructions
+      post_notification:
+        html:
+          email_sent_reason_html: >-
+            Это письмо было отправлено вам, потому что вы подписаны на тему: «<a href="%{post_url}">%{topic_title}</a>».
+          post_lead_html: '%{user} в <a href="%{post_url}">«%{topic_title}»</a>:'
+          unsubscribe_instructions_html: Чтобы отписаться от этих писем, обновите свои <a href="%{preferences_url}">настройки</a>.
+        subject: Новое сообщение в «%{topic_title}» от %{user}
+        text:
+          email_sent_reason: |-
+            Это письмо было отправлено вам, потому что вы подписаны на тему «%{topic_title}».
+
+            Перейдите сюда, чтобы просмотреть разговор:
+            %{post_url}
+          post_lead: "%{user} указан в «%{topic_title}»:"
+          unsubscribe_instructions: |-
+            Чтобы отписаться от этих писем, обновите свои настройки здесь:
+            %{unsubscribe_url}
     errors:
       login_required: Необходимо зайти на форум.
       not_authorized: Вы не авторизованы.

data/lib/generators/thredded/install/templates/initializer.rb

@@ -28,7 +28,7 @@ end
 Thredded.current_user_method = :"current_#{Thredded.user_class_name.underscore}"
 
 # User avatar URL. rb-gravatar gem is used by default:
-Thredded.avatar_url = ->(user) { Gravatar.src(user.email, 128, 'mm') }
+Thredded.avatar_url = ->(user) { Gravatar.src(user.email, 156, 'mm') }
 
 # ==> Database Configuration
 # By default, thredded uses integers for record ID route constraints.

data/lib/thredded.rb

@@ -96,7 +96,7 @@ module Thredded
 
   self.active_user_threshold = 5.minutes
   self.admin_column = :admin
-  self.avatar_url = ->(user) { Gravatar.src(user.email, 128, 'mm') }
+  self.avatar_url = ->(user) { Gravatar.src(user.email, 156, 'mm') }
   self.layout = 'thredded/application'
   self.moderator_column = :admin
   self.user_name_column = :name

data/lib/thredded/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Thredded
-  VERSION = '0.13.2'
+  VERSION = '0.13.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.13.3
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -312,19 +312,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -974,6 +974,7 @@ files:
 - config/i18n-tasks.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/fr.yml
 - config/locales/pl.yml
 - config/locales/pt-BR.yml
 - config/locales/ru.yml