Remove invite comments from UI (#12068)

Due to UX confusion and insufficient time to fix it

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f13ad45016f5c0d7e9d940a39bd3d5a7ce8c751..69ceb602833976c2e3471cf5f7e005bf0191d547 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,7 +33,6 @@ All notable changes to this project will be documented in this file.
 - **Add account migration UI** ([Gargron](https://github.com/tootsuite/mastodon/pull/11846), [noellabo](https://github.com/tootsuite/mastodon/pull/11905), [noellabo](https://github.com/tootsuite/mastodon/pull/11907), [noellabo](https://github.com/tootsuite/mastodon/pull/11906), [noellabo](https://github.com/tootsuite/mastodon/pull/11902))
 - **Add table of contents to about page** ([Gargron](https://github.com/tootsuite/mastodon/pull/11885), [ykzts](https://github.com/tootsuite/mastodon/pull/11941), [ykzts](https://github.com/tootsuite/mastodon/pull/11895), [Kjwon15](https://github.com/tootsuite/mastodon/pull/11916))
 - **Add password challenge to 2FA settings, e-mail notifications** ([Gargron](https://github.com/tootsuite/mastodon/pull/11878))
-- Add optional invite comments ([ThibG](https://github.com/tootsuite/mastodon/pull/10465))
 - **Add optional public list of domain blocks with comments** ([ThibG](https://github.com/tootsuite/mastodon/pull/11298), [ThibG](https://github.com/tootsuite/mastodon/pull/11515), [Gargron](https://github.com/tootsuite/mastodon/pull/11908))
 - Add an RSS feed for featured hashtags ([noellabo](https://github.com/tootsuite/mastodon/pull/10502))
 - Add explanations to featured hashtags UI and profile ([Gargron](https://github.com/tootsuite/mastodon/pull/11586))

diff --git a/app/views/invites/_form.html.haml b/app/views/invites/_form.html.haml
index b19f7053962506cfc0d46270ea57968b728861c8..3a2a5ef0e1c78d64a84d92fdb361ad43f0bcc105 100644 (file)
--- a/app/views/invites/_form.html.haml
+++ b/app/views/invites/_form.html.haml
@@ -10,8 +10,5 @@
   .fields-group
     = f.input :autofollow, wrapper: :with_label
 
-  .fields-group
-    = f.input :comment, wrapper: :with_label, input_html: { maxlength: 420 }
-
   .actions
     = f.button :button, t('invites.generate'), type: :submit

diff --git a/app/views/invites/_invite.html.haml b/app/views/invites/_invite.html.haml
index 03050c86839e7b3b63afe0b0d3983c7c448193a3..62799ca5be20ef8e9f22986199a85c6ea9bd9333 100644 (file)
--- a/app/views/invites/_invite.html.haml
+++ b/app/views/invites/_invite.html.haml
@@ -20,9 +20,6 @@
     %td{ colspan: 2 }
       = t('invites.expired')
 
-  %td
-    = invite.comment
-
   %td
     - if invite.valid_for_use? && policy(invite).destroy?
       = table_link_to 'times', t('invites.delete'), invite_path(invite), method: :delete

diff --git a/app/views/invites/index.html.haml b/app/views/invites/index.html.haml
index 62065d6ae9fcc17b4ce9bf32471ef8a7fa886476..61420ab1e407970e14345717a4184bd7c7e38cae 100644 (file)
--- a/app/views/invites/index.html.haml
+++ b/app/views/invites/index.html.haml
@@ -15,7 +15,6 @@
         %th
         %th= t('invites.table.uses')
         %th= t('invites.table.expires_at')
-        %th= t('invites.table.comment')
         %th
     %tbody
       = render @invites

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 51b0f51d547ecd53e16b61a3ed9a166cc568e119..4b9f2aab4ec897ba48588c0eb39ceabbbe92c7fc 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -795,7 +795,7 @@ en:
       '604800': 1 week
       '86400': 1 day
     expires_in_prompt: Never
-    generate: Generate
+    generate: Generate invite link
     invited_by: 'You were invited by:'
     max_uses:
       one: 1 use