Merge remote-tracking branch 'origin/kb_development' into upstream-20240216

app/javascript/mastodon/components/visibility_icon.tsx

@@ -47,11 +47,11 @@ const messages = defineMessages({
   },
   limited_short: {
     id: 'privacy.limited.short',
-    defaultMessage: 'Limited menbers only',
+    defaultMessage: 'Limited',
   },
   mutual_short: {
     id: 'privacy.mutual.short',
-    defaultMessage: 'Mutual only',
+    defaultMessage: 'Mutual',
   },
   circle_short: {
     id: 'privacy.circle.short',

app/javascript/mastodon/locales/en.json

@@ -557,7 +557,7 @@
   "privacy.login.long": "Visible for login users only",
   "privacy.login.short": "Login only",
   "privacy.mutual.long": "Mutual followers only",
-  "privacy.mutual.short": "Mutual only",
+  "privacy.mutual.short": "Mutual",
   "privacy.personal.short": "Yourself only",
   "privacy.private.long": "Only your followers",
   "privacy.private.short": "Followers",

app/models/admin/ng_word.rb

@@ -53,7 +53,7 @@ class Admin::NgWord
       return unless options[:uri] && options[:target_type]
       return if options.key?(:public) && !options.delete(:public)
 
-      return if NgwordHistory.where('created_at > ?', 1.day.ago).exists?(uri: options[:uri], keyword: options[:keyword])
+      return if NgwordHistory.where('created_at > ?', 1.day.ago).exists?(uri: options[:uri], keyword: keyword)
 
       NgwordHistory.create(options.merge({
         reason: type,