From 39ad0d2210044f0f253fc132b80bb11251d5f86b Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Fri, 6 Mar 2020 19:37:11 -0600
Subject: [PATCH] settings: rename "disable responsive mode" to "enable desktop
 mode"

Desktop mode is a better description. Most users don't know what responsive mode means.
---
 app/controllers/users_controller.rb      | 2 +-
 app/javascript/src/javascripts/common.js | 2 +-
 app/models/user.rb                       | 2 +-
 app/views/layouts/default.html.erb       | 2 +-
 app/views/static/_footer.html.erb        | 2 +-
 app/views/users/edit.html.erb            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f43350b3a..3c1bc20b0 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -120,7 +120,7 @@ class UsersController < ApplicationController
       enable_auto_complete show_deleted_children
       disable_categorized_saved_searches disable_tagged_filenames
       disable_cropped_thumbnails disable_mobile_gestures
-      enable_safe_mode disable_responsive_mode disable_post_tooltips
+      enable_safe_mode enable_desktop_mode disable_post_tooltips
     ]
 
     permitted_params << :name if context == :create
diff --git a/app/javascript/src/javascripts/common.js b/app/javascript/src/javascripts/common.js
index c03552164..3401df5b1 100644
--- a/app/javascript/src/javascripts/common.js
+++ b/app/javascript/src/javascripts/common.js
@@ -23,7 +23,7 @@ $(function() {
 
   $("#desktop-version-link a").on("click.danbooru", async function(e) {
     e.preventDefault();
-    await CurrentUser.update({ disable_responsive_mode: true });
+    await CurrentUser.update({ enable_desktop_mode: true });
     location.reload();
   });
 });
diff --git a/app/models/user.rb b/app/models/user.rb
index 2e80fb742..dd7f7f7f8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -58,7 +58,7 @@ class User < ApplicationRecord
     disable_cropped_thumbnails
     disable_mobile_gestures
     enable_safe_mode
-    disable_responsive_mode
+    enable_desktop_mode
     disable_post_tooltips
     enable_recommended_posts
     opt_out_tracking
diff --git a/app/views/layouts/default.html.erb b/app/views/layouts/default.html.erb
index 44a06d7d0..b2b4dc447 100644
--- a/app/views/layouts/default.html.erb
+++ b/app/views/layouts/default.html.erb
@@ -14,7 +14,7 @@
   <% end %>
 
   <%= csrf_meta_tag %>
-  <% unless CurrentUser.disable_responsive_mode? %>
+  <% unless CurrentUser.enable_desktop_mode? %>
     <meta name="viewport" content="width=device-width,initial-scale=1">
   <% end %>
   <% if CurrentUser.user.blacklisted_tags.present? %>
diff --git a/app/views/static/_footer.html.erb b/app/views/static/_footer.html.erb
index 81e5f424e..295a0ae32 100644
--- a/app/views/static/_footer.html.erb
+++ b/app/views/static/_footer.html.erb
@@ -13,7 +13,7 @@
   <% if CurrentUser.is_member? %>
     <span id="desktop-version-link" class="mobile-only">
       &ndash;
-      <%= link_to "Disable responsive mode", edit_user_path(CurrentUser.id) %>
+      <%= link_to "Desktop mode", edit_user_path(CurrentUser.id) %>
     </span>
   <% end %>
 </footer>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
index 4ed6773a0..ef02dd5a0 100644
--- a/app/views/users/edit.html.erb
+++ b/app/views/users/edit.html.erb
@@ -65,7 +65,7 @@
         <%= f.input :disable_mobile_gestures, :as => :select, :hint => "Disable swipe left / swipe right gestures on mobile", :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false %>
         <%= f.input :disable_post_tooltips, :as => :select, :hint => "Disable advanced tooltips when hovering over thumbnails", :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false %>
         <%= f.input :disable_cropped_thumbnails, :as => :select, :hint => "Disable cropped (square) thumbnails on mobile", :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false %>
-        <%= f.input :disable_responsive_mode, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false, :hint => "Disable alternative layout for mobile and tablet" %>
+        <%= f.input :enable_desktop_mode, :as => :select, :collection => [["No", "false"], ["Yes", "true"]], :include_blank => false, :hint => "Use the desktop layout on mobile" %>
 
         <%= f.input :favorite_tags, :label => "Frequent tags", :hint => "A list of tags that you use often. They will appear when using the list of Related Tags.", :input_html => { :rows => 5, :data => { :autocomplete => "tag-query" } } %>
         <%= f.input :custom_style, :label => "Custom <a href='https://en.wikipedia.org/wiki/Cascading_Style_Sheets'>CSS</a> style".html_safe, :hint => "CSS rules to apply to the whole site.", :input_html => {:size => "40x5"} %>