Rename "Best Of" to "Summary"

Author: eviltrout

app/assets/javascripts/discourse/components/toggle_best_of_component.js app/assets/javascripts/discourse/components/toggle_summary_component.js

@@ -1,20 +1,20 @@
 /**
   The controls for toggling the summarized view on/off
 
-  @class DiscourseToggleBestOfComponent
+  @class DiscourseToggleSummaryComponent
   @extends Ember.Component
   @namespace Discourse
   @module Discourse
 **/
-Discourse.DiscourseToggleBestOfComponent = Ember.Component.extend({
-  templateName: 'components/discourse-toggle-best-of',
+Discourse.DiscourseToggleSummaryComponent = Ember.Component.extend({
+  templateName: 'components/discourse-toggle-summary',
   tagName: 'section',
   classNames: ['information'],
   postStream: Em.computed.alias('topic.postStream'),
 
   actions: {
-    toggleBestOf: function() {
-      this.get('postStream').toggleBestOf();
+    toggleSummary: function() {
+      this.get('postStream').toggleSummary();
     }
   }
 });

app/assets/javascripts/discourse/models/post_stream.js

@@ -97,7 +97,7 @@ Discourse.PostStream = Em.Object.extend({
   **/
   streamFilters: function() {
     var result = {};
-    if (this.get('bestOf')) { result.filter = "best_of"; }
+    if (this.get('summary')) { result.filter = "summary"; }
 
     var userFilters = this.get('userFilters');
     if (userFilters) {
@@ -106,7 +106,7 @@ Discourse.PostStream = Em.Object.extend({
     }
 
     return result;
-  }.property('userFilters.[]', 'bestOf'),
+  }.property('userFilters.[]', 'summary'),
 
   /**
     The text describing the current filters. For display in the pop up at the bottom of the
@@ -117,9 +117,9 @@ Discourse.PostStream = Em.Object.extend({
   filterDesc: function() {
     var streamFilters = this.get('streamFilters');
 
-    if (streamFilters.filter && streamFilters.filter === "best_of") {
-      return I18n.t("topic.filters.best_of", {
-        n_best_posts: I18n.t("topic.filters.n_best_posts", { count: this.get('filteredPostsCount') }),
+    if (streamFilters.filter && streamFilters.filter === "summary") {
+      return I18n.t("topic.filters.summary", {
+        n_summarized_posts: I18n.t("topic.filters.n_summarized_posts", { count: this.get('filteredPostsCount') }),
         of_n_posts: I18n.t("topic.filters.of_n_posts", { count: this.get('topic.posts_count') })
       });
     } else if (streamFilters.username_filters) {
@@ -184,19 +184,19 @@ Discourse.PostStream = Em.Object.extend({
     @returns {Ember.Deferred} a promise that resolves when the filter has been cancelled.
   **/
   cancelFilter: function() {
-    this.set('bestOf', false);
+    this.set('summary', false);
     this.get('userFilters').clear();
     return this.refresh();
   },
 
   /**
-    Toggle best of mode on the stream.
+    Toggle summary mode for the stream.
 
-    @method toggleBestOf
-    @returns {Ember.Deferred} a promise that resolves when the best of stream has loaded.
+    @method toggleSummary
+    @returns {Ember.Deferred} a promise that resolves when the summary stream has loaded.
   **/
-  toggleBestOf: function() {
-    this.toggleProperty('bestOf');
+  toggleSummary: function() {
+    this.toggleProperty('summary');
     this.refresh();
   },
 
@@ -691,7 +691,7 @@ Discourse.PostStream.reopenClass({
       stream: Em.A(),
       userFilters: Em.Set.create(),
       postIdentityMap: Em.Map.create(),
-      bestOf: false,
+      summary: false,
       loaded: false,
       loadingAbove: false,
       loadingBelow: false,

app/assets/javascripts/discourse/models/topic.js

@@ -340,9 +340,9 @@ Discourse.Topic.reopenClass({
       });
     }
 
-    // Add the best of filter if we have it
-    if (opts.bestOf === true) {
-      data.best_of = true;
+    // Add the summary of filter if we have it
+    if (opts.summary === true) {
+      data.summary = true;
     }
 
     // Check the preload store. If not, load it via JSON

app/assets/javascripts/discourse/routes/topic_from_params_route.js

@@ -18,8 +18,8 @@ Discourse.TopicFromParamsRoute = Discourse.Route.extend({
 
     var queryParams = Discourse.URL.get('queryParams');
     if (queryParams) {
-      // Set bestOf on the postStream if present
-      postStream.set('bestOf', Em.get(queryParams, 'filter') === 'best_of');
+      // Set summary on the postStream if present
+      postStream.set('summary', Em.get(queryParams, 'filter') === 'summary');
 
       // Set any username filters on the postStream
       var userFilters = Em.get(queryParams, 'username_filters') || Em.get(queryParams, 'username_filters[]');

app/assets/javascripts/discourse/templates/components/discourse-basic-topic-list.js.handlebars

@@ -44,7 +44,7 @@
 
           <td class='num likes'>
             {{#if topic.like_count}}
-              <a href='{{unbound topic.url}}{{#if topic.has_best_of}}?filter=best_of{{/if}}'>{{unbound topic.like_count}} <i class='icon-heart'></i></a>
+              <a href='{{unbound topic.url}}{{#if topic.has_summary}}?filter=summary{{/if}}'>{{unbound topic.like_count}} <i class='icon-heart'></i></a>
             {{/if}}
           </td>
 

app/assets/javascripts/discourse/templates/components/discourse-toggle-best-of.js.handlebars

@@ -0,0 +1,7 @@
+{{#if postStream.summary}}
+  <p>{{{i18n summary.enabled_description}}}</p>
+  <button class='btn' {{action toggleSummary}}>{{i18n summary.disable}}</button>
+{{else}}
+  <p>{{{i18n summary.description count="topic.posts_count"}}}</p>
+  <button class='btn' {{action toggleSummary}}>{{i18n summary.enable}}</button>
+{{/if}}

app/assets/javascripts/discourse/templates/components/discourse-toggle-summary.js.handlebars

@@ -57,7 +57,7 @@
 
 <td class='num likes'>
   {{#if like_count}}
-    <a href='{{url}}{{#if has_best_of}}?filter=best_of{{/if}}' title='{{i18n topic.likes count="like_count"}}'>{{number like_count numberKey="likes_long"}} <i class='icon-heart'></i></a>
+    <a href='{{url}}{{#if has_summary}}?filter=summary{{/if}}' title='{{i18n topic.likes count="like_count"}}'>{{number like_count numberKey="likes_long"}} <i class='icon-heart'></i></a>
   {{/if}}
 </td>
 

app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars

@@ -45,7 +45,7 @@
     <div class='num posts'><a href="{{lastUnreadUrl}}">{{number posts_count numberKey="posts_long"}}</a></div>
 
     {{#if like_count}}
-      <div class='num likes'><a href='{{url}}{{#if has_best_of}}?filter=best_of{{/if}}' title='{{i18n topic.likes count="like_count"}}'><i class='icon-heart'></i> {{number like_count numberKey="likes_long"}}</a></div>
+      <div class='num likes'><a href='{{url}}{{#if has_summary}}?filter=summary{{/if}}' title='{{i18n topic.likes count="like_count"}}'><i class='icon-heart'></i> {{number like_count numberKey="likes_long"}}</a></div>
     {{/if}}
 
     <div class='last-poster'>

app/assets/javascripts/discourse/templates/mobile/list/topic_list_item.js.handlebars

@@ -30,9 +30,9 @@ Discourse.TopicMapView = Discourse.ContainerView.extend({
   appendMapInformation: function(container) {
     var topic = this.get('topic');
 
-    // If we have a best of capability
-    if (topic.get('has_best_of')) {
-      container.attachViewWithArgs({ topic: topic }, Discourse.DiscourseToggleBestOfComponent);
+    // If we have a summary capability
+    if (topic.get('has_summary')) {
+      container.attachViewWithArgs({ topic: topic }, Discourse.DiscourseToggleSummaryComponent);
     }
 
     // If we have a private message

app/assets/javascripts/discourse/views/topic_map/topic_map_view.js

@@ -175,8 +175,8 @@ def self.reverse_order
     order('sort_order desc, post_number desc')
   end
 
-  def self.best_of
-    where(["(post_number = 1) or (percent_rank <= ?)", SiteSetting.best_of_percent_filter.to_f / 100.0])
+  def self.summary
+    where(["(post_number = 1) or (percent_rank <= ?)", SiteSetting.summary_percent_filter.to_f / 100.0])
   end
 
   def update_flagged_posts_count

app/models/post.rb

@@ -692,7 +692,7 @@ def apply_per_day_rate_limit_for(key, method_name)
 #  closed                  :boolean          default(FALSE), not null
 #  archived                :boolean          default(FALSE), not null
 #  bumped_at               :datetime         not null
-#  has_best_of             :boolean          default(FALSE), not null
+#  has_summary             :boolean          default(FALSE), not null
 #  meta_data               :hstore
 #  vote_count              :integer          default(0), not null
 #  archetype               :string(255)      default("regular"), not null

app/models/topic.rb

@@ -3,7 +3,7 @@ class TopicListItemSerializer < ListableTopicSerializer
   attributes :views,
              :like_count,
              :starred,
-             :has_best_of,
+             :has_summary,
              :archetype,
              :rank_details,
              :last_poster_username,

app/serializers/topic_list_item_serializer.rb

@@ -16,7 +16,7 @@ def self.topic_attributes
      :visible,
      :closed,
      :archived,
-     :has_best_of,
+     :has_summary,
      :archetype,
      :slug,
      :category_id,

app/serializers/topic_view_serializer.rb

@@ -355,8 +355,7 @@ cs:
     unmute: Zrušit ignorování
     last_post: Poslední příspěvek
 
-    best_of:
-      title: "Nejlepší příspěvky"
+    summary:
       enabled_description: Právě máte zobrazeny "nejlepší příspěvky" tohoto tématu.
       description: "V tomto tématu je <b>{{count}}</b> příspěvků. A to už je hodně! Nechcete ušetřit čas při čtení tím, že zobrazíte pouze příspěvky, které mají nejvíce interakcí a odpovědí?"
       enable: 'Přepnout na "nejlepší příspěvky"'
@@ -724,8 +723,8 @@ cs:
           few: "od {{count}} vybraného uživatele"
           other: "od {{count}} vybraných uživatelů"
 
-        best_of: "{{n_best_posts}} {{of_n_posts}}."
-        n_best_posts:
+        summary: "{{n_summarized_posts}} {{of_n_posts}}."
+        n_summarized_posts:
           one: "Je zobrazen 1 nejlepší příspěvek"
           few: "Jsou zobrazeny {{count}} nejlepší příspěvky"
           other: "Je zobrazeno {{count}} nejlepších příspěvků"

config/locales/client.cs.yml

@@ -212,8 +212,7 @@ da:
     unmute: Unmute
     last_post: Sidste indlæg
 
-    best_of:
-      title: "Topindlæg"
+    summary:
       description: "Der er <b>{{count}}</b> indlæg i dette emne. Det er mange! Vil du gerne spare lidt tid, ved kun at se de indlæg der har flest interaktioner og svar?"
       button: 'Vis kun “Topindlæg”'
 
@@ -502,7 +501,7 @@ da:
 
       filters:
         user: "Du ser kun endlæg fra specifikke brugere."
-        best_of: "Du ser kun “Topindlæg”."
+        summary: "Du ser kun “Topindlæg”."
         cancel: "Se alle indlæg i emnet."
 
       move_selected:

config/locales/client.da.yml

@@ -363,8 +363,7 @@ de:
     unmute: Wieder beachten
     last_post: Letzter Beitrag
 
-    best_of:
-      title: "Top-Beiträge"
+    summary:
       enabled_description: Du siehst gerade die Top-Beiträge dieses Themas.
       description: "Es gibt <b>{{count}}</b> Beiträge zu diesem Thema. Das sind eine Menge! Möchtest Du Zeit sparen und nur die Beiträge mit den meisten Antworten und Nutzerreaktionen betrachten?"
       enable: 'Nur die Top-Beiträge anzeigen'
@@ -730,8 +729,8 @@ de:
           one: "von einem Benutzer"
           other: "von {{count}} Benutzern"
 
-        best_of: "Du betrachtest {{n_best_posts}} {{of_n_posts}}."
-        n_best_posts:
+        summary: "Du betrachtest {{n_summarized_posts}} {{of_n_posts}}."
+        n_summarized_posts:
           one: "den besten Beitrag"
           other: "{{count}} besten Beiträge"
         of_n_posts:

config/locales/client.de.yml

@@ -380,12 +380,11 @@ en:
     unmute: Unmute
     last_post: Last post
 
-    best_of:
-      title: "Best Of"
-      enabled_description: "You're viewing only the best posts in this topic. To see all posts again, click below."
-      description: "There are <b>{{count}}</b> posts in this topic. That's a lot! Would you like to save time by showing only the best posts?"
-      enable: 'Switch to "Best Of" view'
-      disable: 'Cancel "Best Of"'
+    summary:
+      enabled_description: "You're viewing a summary of this topic. To see all posts again, click below."
+      description: "There are <b>{{count}}</b> posts in this topic. That's a lot! Would you like to save time by showing only the most relevant posts?"
+      enable: 'Switch to Summary view'
+      disable: 'Cancel Summary view'
 
     private_message_info:
       title: "Private Message"
@@ -758,10 +757,10 @@ en:
           one: "made by 1 specific user"
           other: "made by {{count}} specific users"
 
-        best_of: "You're viewing the {{n_best_posts}} {{of_n_posts}}."
-        n_best_posts:
-          one: "1 best post"
-          other: "{{count}} best posts"
+        summary: "You're viewing the {{n_summarized_posts}} {{of_n_posts}}."
+        n_summarized_posts:
+          one: "1 summarized post"
+          other: "{{count}} summarized posts"
         of_n_posts:
           one: "of 1 in the topic"
           other: "of {{count}} in the topic"

config/locales/client.en.yml

@@ -297,8 +297,7 @@ es:
     unmute: Quitar silencio
     last_post: Última publicación
 
-    best_of:
-      title: "Lo Mejor De"
+    summary:
       description: "Hay <b>{{count}}</b> publicaciones en este tema. ¡Son muchas! ¿Te gustaría ahorrar algo de tiempo viendo sólo las publicaciones con más interacciones y respuestas?"
       button: 'Cambiar a la vista "Lo Mejor De"'
 
@@ -602,8 +601,8 @@ es:
           one: "hechos por 1 usuario específico"
           other: "hechos por {{count}} usuarios específicos"
 
-        best_of: "Estás viendo el {{n_best_posts}} {{of_n_posts}}."
-        n_best_posts:
+        summary: "Estás viendo el {{n_summarized_posts}} {{of_n_posts}}."
+        n_summarized_posts:
           one: "1 mejor mensaje"
           other: "{{count}} mejores mensajes"
         of_n_posts:

config/locales/client.es.yml

@@ -378,8 +378,7 @@ fr:
     unmute: Activer
     last_post: Dernier message
 
-    best_of:
-      title: "les meilleurs"
+    summary:
       enabled_description: "Vous êtes actuellement en train de consulter seulement les messages les plus populaires de cette discussion. Pour voir tous les messages, cliquez ci-dessous."
       description: "Il y a <b>{{count}}</b> messages dans cette discussion. C'est beaucoup ! Voulez-vous gagner du temps en n'affichant que les meilleurs messages ?"
       enable: 'Basculer dans la vue  : "les meilleurs"'
@@ -730,8 +729,8 @@ fr:
         by_n_users:
           one: "de l'utilisateur"
           other: "rédigés par {{count}} utilisateurs"
-        best_of: "Vous voyez seulement {{n_best_posts}} {{of_n_posts}} de cette discussion."
-        n_best_posts:
+        summary: "Vous voyez seulement {{n_summarized_posts}} {{of_n_posts}} de cette discussion."
+        n_summarized_posts:
           one: "le message"
           other: "les {{count}} messages"
         of_n_posts:

config/locales/client.fr.yml

@@ -206,10 +206,9 @@ id:
     unmute: Unmute
     last_post: Last post
 
-    best_of:
-      title: "Best Of"
-      description: "There are <b>{{count}}</b> posts in this topic. That's a lot! Would you like to save time by showing only the best posts?"
-      button: 'Switch to "Best Of" view'
+    summary:
+      description: "There are <b>{{count}}</b> posts in this topic. That's a lot! Would you like to save time by showing only the most relevant posts?"
+      button: 'Switch to "Summary" view'
 
     private_message_info:
       title: "Private Message"
@@ -463,7 +462,7 @@ id:
 
       filters:
         user: "You're viewing only posts by specific user(s)."
-        best_of: "You're viewing only the 'Best Of' posts."
+        summary: "You're viewing only the 'Summary' posts."
         cancel: "Show all posts in this topic again."
 
       move_selected:

config/locales/client.id.yml

@@ -361,12 +361,11 @@ it:
     unmute: Annulla ignora
     last_post: Ultimo post
 
-    best_of:
-      title: "Best Of"
-      enabled_description: Stai guardando il "Best Of" di questo topic.
+    summary:
+      enabled_description: Stai guardando il "Summary" di questo topic.
       description: "Ci sono <b>{{count}}</b> post in questo topic. Sono tanti! Vuoi risparmiare tempo leggendo solo i post con più interazioni e risposte?"
-      enable: 'Passa a "Best Of"'
-      disable: 'Annulla "Best Of"'
+      enable: 'Passa a "Summary"'
+      disable: 'Annulla "Summary"'
 
     private_message_info:
       title: "Conversazione Privata"
@@ -705,8 +704,8 @@ it:
           one: "da 1 utente specifico"
           other: "da {{count}} utenti specifici"
 
-        best_of: "Stai vedendo i {{n_best_posts}} {{of_n_posts}}."
-        n_best_posts:
+        summary: "Stai vedendo i {{n_summarized_posts}} {{of_n_posts}}."
+        n_summarized_posts:
           one: "1 best post"
           other: "{{count}} best post"
         of_n_posts: