From d420609f97e81d3bb696ec1b8bad927ae15b5c7b Mon Sep 17 00:00:00 2001
From: Shyam Sunder <sgsunder1@gmail.com>
Date: Tue, 23 Jun 2020 12:36:26 -0400
Subject: [PATCH] client/pools: inherit option to show underscores as spaces

---
 client/html/pool.tpl                                | 2 +-
 client/html/post_readonly_sidebar.tpl               | 2 +-
 client/html/settings.tpl                            | 4 ++--
 client/html/tag.tpl                                 | 2 +-
 client/js/controls/post_readonly_sidebar_control.js | 2 +-
 client/js/util/misc.js                              | 4 ++--
 client/js/util/views.js                             | 4 ++--
 client/js/views/pool_view.js                        | 2 +-
 client/js/views/settings_view.js                    | 5 ++---
 client/js/views/tag_view.js                         | 2 +-
 10 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/client/html/pool.tpl b/client/html/pool.tpl
index e1e5311f..831d07c6 100644
--- a/client/html/pool.tpl
+++ b/client/html/pool.tpl
@@ -1,5 +1,5 @@
 <div class='content-wrapper' id='pool'>
-    <h1><%- ctx.pool.names[0] %></h1>
+    <h1><%- ctx.getPrettyName(ctx.pool.names[0]) %></h1>
     <nav class='buttons'><!--
         --><ul><!--
             --><li data-name='summary'><a href='<%- ctx.formatClientLink('pool', ctx.pool.id) %>'>Summary</a></li><!--
diff --git a/client/html/post_readonly_sidebar.tpl b/client/html/post_readonly_sidebar.tpl
index ab3f1491..7be5ba3e 100644
--- a/client/html/post_readonly_sidebar.tpl
+++ b/client/html/post_readonly_sidebar.tpl
@@ -93,7 +93,7 @@
                         --><% if (ctx.canListPosts) { %><!--
                             --><a href='<%- ctx.formatClientLink('posts', {query: ctx.escapeColons(tag.names[0])}) %>' class='<%= ctx.makeCssName(tag.category, 'tag') %>'><!--
                         --><% } %><!--
-                            --><%- ctx.getPrettyTagName(tag.names[0]) %>&#32;<!--
+                            --><%- ctx.getPrettyName(tag.names[0]) %>&#32;<!--
                         --><% if (ctx.canListPosts) { %><!--
                             --></a><!--
                         --><% } %><!--
diff --git a/client/html/settings.tpl b/client/html/settings.tpl
index 4f729950..3b1967fa 100644
--- a/client/html/settings.tpl
+++ b/client/html/settings.tpl
@@ -66,8 +66,8 @@
 
             <li>
                 <%= ctx.makeCheckbox({
-                    text: 'Display underscores as spaces in tags',
-                    name: 'tag-underscores-as-spaces',
+                    text: 'Display underscores as spaces',
+                    name: 'underscores-as-spaces',
                     checked: ctx.browsingSettings.tagUnderscoresAsSpaces,
                 }) %>
                 <p class='hint'>Display all underscores as if they were spaces. This is only a visual change, which means that you'll still have to use underscores when searching or editing tags.</p>
diff --git a/client/html/tag.tpl b/client/html/tag.tpl
index 5b680231..d84e299e 100644
--- a/client/html/tag.tpl
+++ b/client/html/tag.tpl
@@ -1,5 +1,5 @@
 <div class='content-wrapper' id='tag'>
-    <h1><%- ctx.getPrettyTagName(ctx.tag.names[0]) %></h1>
+    <h1><%- ctx.getPrettyName(ctx.tag.names[0]) %></h1>
     <nav class='buttons'><!--
         --><ul><!--
             --><li data-name='summary'><a href='<%- ctx.formatClientLink('tag', ctx.tag.names[0]) %>'>Summary</a></li><!--
diff --git a/client/js/controls/post_readonly_sidebar_control.js b/client/js/controls/post_readonly_sidebar_control.js
index 580ef43f..9bc767fa 100644
--- a/client/js/controls/post_readonly_sidebar_control.js
+++ b/client/js/controls/post_readonly_sidebar_control.js
@@ -30,7 +30,7 @@ class PostReadonlySidebarControl extends events.EventTarget {
                 canViewTags: api.hasPrivilege("tags:view"),
                 escapeColons: uri.escapeColons,
                 extractRootDomain: uri.extractRootDomain,
-                getPrettyTagName: misc.getPrettyTagName,
+                getPrettyName: misc.getPrettyName,
             })
         );
 
diff --git a/client/js/util/misc.js b/client/js/util/misc.js
index b299d3a7..4f9d6d33 100644
--- a/client/js/util/misc.js
+++ b/client/js/util/misc.js
@@ -204,7 +204,7 @@ function dataURItoBlob(dataURI) {
     return new Blob([data], { type: mimeString });
 }
 
-function getPrettyTagName(tag) {
+function getPrettyName(tag) {
     if (settings.get().tagUnderscoresAsSpaces) {
         return tag.replace(/_/g, " ");
     }
@@ -228,5 +228,5 @@ module.exports = {
     decamelize: decamelize,
     escapeSearchTerm: escapeSearchTerm,
     dataURItoBlob: dataURItoBlob,
-    getPrettyTagName: getPrettyTagName,
+    getPrettyName: getPrettyName,
 };
diff --git a/client/js/util/views.js b/client/js/util/views.js
index f69b34b2..647fb991 100644
--- a/client/js/util/views.js
+++ b/client/js/util/views.js
@@ -210,7 +210,7 @@ function makePostLink(id, includeHash) {
 
 function makeTagLink(name, includeHash, includeCount, tag) {
     const category = tag ? tag.category : "unknown";
-    let text = misc.getPrettyTagName(name);
+    let text = misc.getPrettyName(name);
     if (includeHash === true) {
         text = "#" + text;
     }
@@ -235,7 +235,7 @@ function makeTagLink(name, includeHash, includeCount, tag) {
 
 function makePoolLink(id, includeHash, includeCount, pool, name) {
     const category = pool ? pool.category : "unknown";
-    let text = name ? name : pool.names[0];
+    let text = misc.getPrettyName(name ? name : pool.names[0]);
     if (includeHash === true) {
         text = "#" + text;
     }
diff --git a/client/js/views/pool_view.js b/client/js/views/pool_view.js
index 12b77040..99c1b027 100644
--- a/client/js/views/pool_view.js
+++ b/client/js/views/pool_view.js
@@ -18,7 +18,7 @@ class PoolView extends events.EventTarget {
         this._ctx = ctx;
         ctx.pool.addEventListener("change", (e) => this._evtChange(e));
         ctx.section = ctx.section || "summary";
-        ctx.getPrettyPoolName = misc.getPrettyPoolName;
+        ctx.getPrettyName = misc.getPrettyName;
 
         this._hostNode = document.getElementById("content-holder");
         this._install();
diff --git a/client/js/views/settings_view.js b/client/js/views/settings_view.js
index 184028ec..ef5677b0 100644
--- a/client/js/views/settings_view.js
+++ b/client/js/views/settings_view.js
@@ -42,9 +42,8 @@ class SettingsView extends events.EventTarget {
                     tagSuggestions: this._find("tag-suggestions").checked,
                     autoplayVideos: this._find("autoplay-videos").checked,
                     postsPerPage: this._find("posts-per-page").value,
-                    tagUnderscoresAsSpaces: this._find(
-                        "tag-underscores-as-spaces"
-                    ).checked,
+                    tagUnderscoresAsSpaces: this._find("underscores-as-spaces")
+                        .checked,
                 },
             })
         );
diff --git a/client/js/views/tag_view.js b/client/js/views/tag_view.js
index e6c37767..d08a8c4f 100644
--- a/client/js/views/tag_view.js
+++ b/client/js/views/tag_view.js
@@ -18,7 +18,7 @@ class TagView extends events.EventTarget {
         this._ctx = ctx;
         ctx.tag.addEventListener("change", (e) => this._evtChange(e));
         ctx.section = ctx.section || "summary";
-        ctx.getPrettyTagName = misc.getPrettyTagName;
+        ctx.getPrettyName = misc.getPrettyName;
 
         this._hostNode = document.getElementById("content-holder");
         this._install();