about summary refs log tree commit diff
path: root/app/models
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-05-10 05:58:37 -0500
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:16:23 -0500
commit24a59d8f58a55e5903496c7773184dba737f4a9a (patch)
treea2a02a036597d5595fcf4ff9d760b2da48e3eb4b /app/models
parent47a251048c7b236a667195591a0db02b9e0f6745 (diff)
Correct a 6-in-the-morning breaking typos.
Diffstat (limited to 'app/models')
-rw-r--r--app/models/account.rb2
-rw-r--r--app/models/user.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/account.rb b/app/models/account.rb
index 704e5bcc7..163e0161e 100644
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -153,7 +153,7 @@ class Account < ApplicationRecord
            :hides_filtered_gap?,
            :hides_mascot?,
            :hides_color_formatting?,
-           :hides_captions,
+           :hides_captions?,
 
            to: :user,
            prefix: true,
diff --git a/app/models/user.rb b/app/models/user.rb
index 343d68db5..7f2892b00 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -318,7 +318,7 @@ class User < ApplicationRecord
   end
 
   def default_language
-    @_default_language ||= (setting.default_language || 'en')
+    @_default_language ||= (settings.default_language || 'en')
   end
 
   def setting_default_privacy