From 488a362129c19f4c88f474df81d56139c6cc5a09 Mon Sep 17 00:00:00 2001
From: Developer <>
Date: Wed, 10 Feb 2021 13:48:13 -0500
Subject: [PATCH] Updated labels and hints in user registration form
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• Updated:
- labels and hints in user registration form
- Made clear requirements for usernames

• Removed:
- question of "Are you human?" in the captcha label as people were answering "yes" in the input instead of the captcha value
---
 app/views/auth/registrations/new.html.haml | 4 ++--
 config/locales/simple_form.en.yml          | 2 +-
 config/locales/simple_form.en_GB.yml       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/auth/registrations/new.html.haml b/app/views/auth/registrations/new.html.haml
index e3d7d071..3112bfdd 100644
--- a/app/views/auth/registrations/new.html.haml
+++ b/app/views/auth/registrations/new.html.haml
@@ -12,7 +12,7 @@
 
   = f.simple_fields_for :account do |ff|
     .fields-group
-      = ff.input :username, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off' }, hint: t('simple_form.hints.defaults.username', domain: site_hostname)
+      = ff.input :username, wrapper: :with_label, autofocus: true, label: t('simple_form.labels.defaults.username'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.username'), :autocomplete => 'off' }, hint: t('simple_form.hints.defaults.username')
 
   .fields-group
     = f.input :email, wrapper: :with_label, label: t('simple_form.labels.defaults.email'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.email'), :autocomplete => 'off' }
@@ -24,7 +24,7 @@
     = f.input :password_confirmation, wrapper: :with_label, label: t('simple_form.labels.defaults.confirm_password'), required: true, input_html: { 'aria-label' => t('simple_form.labels.defaults.confirm_password'), :autocomplete => 'off' }
 
   .fields-group{style: "flex-direction:column;"}
-    = f.input :challenge, wrapper: :with_label, label: "Are you a human? Enter the text below.", required: true, input_html: { 'aria-label' => "Are you a human? Enter the text below.", :autocomplete => 'off' }
+    = f.input :challenge, wrapper: :with_label, label: "Enter the text below.", required: true, input_html: { 'aria-label' => "Enter the text below.", :autocomplete => 'off' }
     %span{style: "margin-top:5px;font-size:12px;color:red;"}= flash[:captcha_error]
     %div#gab-captcha{style: "display:block;position:relative;width:240px;height:100px;margin-top:10px;border-radius:6px;overflow:hidden;border:1px solid #ccc;"}
       %span{style:"display:block;position:absolute;line-height:100px;width:240px;height:100px;top:0;left:0;right:0;bottom:0;text-align:center;color:#ccc;"} •   •   •
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 1dfdc035..2f36deaf 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -35,7 +35,7 @@ en:
         setting_noindex: Affects your public profile and status pages
         setting_show_application: The application you use to gab will be displayed in the detailed view of your gabs
         setting_theme: Affects how Gab Social looks when you're logged in from any device.
-        username: Your username will be unique on %{domain}
+        username: Only numbers, letters, periods and underscores allowed. No spaces.
         whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
       featured_tag:
         name: 'You might want to use one of these:'
diff --git a/config/locales/simple_form.en_GB.yml b/config/locales/simple_form.en_GB.yml
index 5de700ee..8bbba484 100644
--- a/config/locales/simple_form.en_GB.yml
+++ b/config/locales/simple_form.en_GB.yml
@@ -35,7 +35,7 @@ en_GB:
         setting_noindex: Affects your public profile and status pages
         setting_show_application: The application you use to gab will be displayed in the detailed view of your gabs
         setting_theme: Affects how Gab Social looks when you're logged in from any device.
-        username: Your username will be unique on %{domain}
+        username: Only numbers, letters, periods and underscores allowed. No spaces.
         whole_word: When the keyword or phrase is alphanumeric only, it will only be applied if it matches the whole word
       featured_tag:
         name: 'You might want to use one of these:'