about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--app/javascript/flavours/glitch/styles/accounts.scss3
-rw-r--r--app/javascript/flavours/glitch/styles/forms.scss6
-rw-r--r--app/javascript/styles/mastodon-light/diff.scss6
-rw-r--r--app/javascript/styles/mastodon/accounts.scss3
-rw-r--r--app/javascript/styles/mastodon/forms.scss6
-rw-r--r--app/views/settings/preferences/appearance/show.html.haml2
-rw-r--r--app/views/settings/preferences/other/show.html.haml4
-rw-r--r--app/views/settings/profiles/show.html.haml2
-rw-r--r--config/i18n-tasks.yml2
-rw-r--r--config/initializers/simple_form.rb10
-rw-r--r--config/locales/simple_form.ar.yml1
-rw-r--r--config/locales/simple_form.ast.yml1
-rw-r--r--config/locales/simple_form.ca.yml1
-rw-r--r--config/locales/simple_form.co.yml1
-rw-r--r--config/locales/simple_form.cs.yml1
-rw-r--r--config/locales/simple_form.cy.yml1
-rw-r--r--config/locales/simple_form.da.yml1
-rw-r--r--config/locales/simple_form.de.yml1
-rw-r--r--config/locales/simple_form.el.yml1
-rw-r--r--config/locales/simple_form.en.yml1
-rw-r--r--config/locales/simple_form.eo.yml1
-rw-r--r--config/locales/simple_form.es-AR.yml1
-rw-r--r--config/locales/simple_form.es.yml1
-rw-r--r--config/locales/simple_form.et.yml1
-rw-r--r--config/locales/simple_form.eu.yml1
-rw-r--r--config/locales/simple_form.fa.yml1
-rw-r--r--config/locales/simple_form.fi.yml1
-rw-r--r--config/locales/simple_form.fr.yml1
-rw-r--r--config/locales/simple_form.gl.yml1
-rw-r--r--config/locales/simple_form.hu.yml1
-rw-r--r--config/locales/simple_form.hy.yml1
-rw-r--r--config/locales/simple_form.id.yml1
-rw-r--r--config/locales/simple_form.is.yml1
-rw-r--r--config/locales/simple_form.it.yml1
-rw-r--r--config/locales/simple_form.ja.yml1
-rw-r--r--config/locales/simple_form.kab.yml1
-rw-r--r--config/locales/simple_form.kk.yml1
-rw-r--r--config/locales/simple_form.ko.yml1
-rw-r--r--config/locales/simple_form.nl.yml1
-rw-r--r--config/locales/simple_form.nn.yml1
-rw-r--r--config/locales/simple_form.no.yml1
-rw-r--r--config/locales/simple_form.oc.yml1
-rw-r--r--config/locales/simple_form.pl.yml1
-rw-r--r--config/locales/simple_form.pt-BR.yml1
-rw-r--r--config/locales/simple_form.pt-PT.yml1
-rw-r--r--config/locales/simple_form.ro.yml1
-rw-r--r--config/locales/simple_form.ru.yml1
-rw-r--r--config/locales/simple_form.sk.yml1
-rw-r--r--config/locales/simple_form.sl.yml1
-rw-r--r--config/locales/simple_form.sq.yml1
-rw-r--r--config/locales/simple_form.sv.yml1
-rw-r--r--config/locales/simple_form.th.yml1
-rw-r--r--config/locales/simple_form.tr.yml1
-rw-r--r--config/locales/simple_form.uk.yml1
-rw-r--r--config/locales/simple_form.vi.yml1
-rw-r--r--config/locales/simple_form.zh-CN.yml1
-rw-r--r--config/locales/simple_form.zh-HK.yml1
-rw-r--r--config/locales/simple_form.zh-TW.yml1
58 files changed, 7 insertions, 85 deletions
diff --git a/app/javascript/flavours/glitch/styles/accounts.scss b/app/javascript/flavours/glitch/styles/accounts.scss
index a5ddde937..d66a2b237 100644
--- a/app/javascript/flavours/glitch/styles/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/accounts.scss
@@ -203,8 +203,7 @@
   }
 }
 
-.account-role,
-.simple_form .recommended {
+.account-role {
   display: inline-block;
   padding: 4px 6px;
   cursor: default;
diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index 6767c15f1..726da1da7 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -79,12 +79,6 @@ code {
           text-decoration: none;
         }
       }
-
-      .recommended {
-        position: absolute;
-        margin: 0 4px;
-        margin-top: -2px;
-      }
     }
   }
 
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss
index 8c8d69fc4..ae79c6baf 100644
--- a/app/javascript/styles/mastodon-light/diff.scss
+++ b/app/javascript/styles/mastodon-light/diff.scss
@@ -624,12 +624,6 @@ html {
     background: rgba($error-red, 0.5);
     text-shadow: none;
   }
-
-  .recommended {
-    border-color: $ui-highlight-color;
-    color: $ui-highlight-color;
-    background-color: rgba($ui-highlight-color, 0.1);
-  }
 }
 
 .compose-form .compose-form__warning {
diff --git a/app/javascript/styles/mastodon/accounts.scss b/app/javascript/styles/mastodon/accounts.scss
index 2c78e81be..332b9f420 100644
--- a/app/javascript/styles/mastodon/accounts.scss
+++ b/app/javascript/styles/mastodon/accounts.scss
@@ -201,8 +201,7 @@
   }
 }
 
-.account-role,
-.simple_form .recommended {
+.account-role {
   display: inline-block;
   padding: 4px 6px;
   cursor: default;
diff --git a/app/javascript/styles/mastodon/forms.scss b/app/javascript/styles/mastodon/forms.scss
index 7a0b2f9a3..0164c43dd 100644
--- a/app/javascript/styles/mastodon/forms.scss
+++ b/app/javascript/styles/mastodon/forms.scss
@@ -79,12 +79,6 @@ code {
           text-decoration: none;
         }
       }
-
-      .recommended {
-        position: absolute;
-        margin: 0 4px;
-        margin-top: -2px;
-      }
     }
   }
 
diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml
index 5fc865814..e613f7399 100644
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@ -25,7 +25,7 @@
     = f.input :setting_use_pending_items, as: :boolean, wrapper: :with_label
 
   .fields-group
-    = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label, recommended: true
+    = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label
     = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
     = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label
     = f.input :setting_system_emoji_font, as: :boolean, wrapper: :with_label
diff --git a/app/views/settings/preferences/other/show.html.haml b/app/views/settings/preferences/other/show.html.haml
index 3b5c7016d..372d934fb 100644
--- a/app/views/settings/preferences/other/show.html.haml
+++ b/app/views/settings/preferences/other/show.html.haml
@@ -14,7 +14,7 @@
     = f.input :setting_hide_network, as: :boolean, wrapper: :with_label
 
   .fields-group
-    = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label, recommended: true
+    = f.input :setting_aggregate_reblogs, as: :boolean, wrapper: :with_label
 
   - unless Setting.hide_followers_count
     .fields-group
@@ -33,7 +33,7 @@
     = f.input :setting_default_sensitive, as: :boolean, wrapper: :with_label
 
   .fields-group
-    = f.input :setting_show_application, as: :boolean, wrapper: :with_label, recommended: true
+    = f.input :setting_show_application, as: :boolean, wrapper: :with_label
 
   .fields-group
     = f.input :setting_default_content_type, collection: ['text/plain', 'text/markdown', 'text/html'], wrapper: :with_label, include_blank: false, label_method: lambda { |item| safe_join([t("simple_form.labels.defaults.setting_default_content_type_#{item.split('/')[1]}"), content_tag(:span, t("simple_form.hints.defaults.setting_default_content_type_#{item.split('/')[1]}"), class: 'hint')]) }, required: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li'
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
index 6061e9cfd..fb7ce6780 100644
--- a/app/views/settings/profiles/show.html.haml
+++ b/app/views/settings/profiles/show.html.haml
@@ -31,7 +31,7 @@
 
   - if Setting.profile_directory
     .fields-group
-      = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable'), recommended: true
+      = f.input :discoverable, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.discoverable')
 
   %hr.spacer/
 
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index e09f4262b..3db1bc602 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -51,7 +51,7 @@ ignore_unused:
   - 'activerecord.errors.*'
   - '{devise,pagination,doorkeeper}.*'
   - '{date,datetime,time,number}.*'
-  - 'simple_form.{yes,no,recommended}'
+  - 'simple_form.{yes,no}'
   - 'simple_form.{placeholders,hints,labels}.*'
   - 'simple_form.{error_notification,required}.:'
   - 'errors.messages.*'
diff --git a/config/initializers/simple_form.rb b/config/initializers/simple_form.rb
index 3dc48ef08..dcf6296fa 100644
--- a/config/initializers/simple_form.rb
+++ b/config/initializers/simple_form.rb
@@ -8,16 +8,7 @@ module AppendComponent
   end
 end
 
-module RecommendedComponent
-  def recommended(wrapper_options = nil)
-    return unless options[:recommended]
-    options[:label_text] = ->(raw_label_text, _required_label_text, _label_present) { safe_join([raw_label_text, ' ', content_tag(:span, I18n.t('simple_form.recommended'), class: 'recommended')]) }
-    nil
-  end
-end
-
 SimpleForm.include_component(AppendComponent)
-SimpleForm.include_component(RecommendedComponent)
 
 SimpleForm.setup do |config|
   # Wrappers are used by the form builder to generate a
@@ -74,7 +65,6 @@ SimpleForm.setup do |config|
     b.use :html5
 
     b.wrapper tag: :div, class: :label_input do |ba|
-      ba.optional :recommended
       ba.use :label
 
       ba.wrapper tag: :div, class: :label_input__wrapper do |bb|
diff --git a/config/locales/simple_form.ar.yml b/config/locales/simple_form.ar.yml
index 8d149d11f..3c3a35a9e 100644
--- a/config/locales/simple_form.ar.yml
+++ b/config/locales/simple_form.ar.yml
@@ -178,7 +178,6 @@ ar:
         trendable: السماح لهذه الكلمة المفتاحية بالظهور تحت المتداوَلة
         usable: اسمح للتبويقات باستخدام هذا الوسم
     'no': لا
-    recommended: موصى بها
     required:
       mark: "*"
       text: مطلوب
diff --git a/config/locales/simple_form.ast.yml b/config/locales/simple_form.ast.yml
index 1a62eb76b..1fe5fa798 100644
--- a/config/locales/simple_form.ast.yml
+++ b/config/locales/simple_form.ast.yml
@@ -94,7 +94,6 @@ ast:
       tag:
         name: Etiqueta
     'no': Non
-    recommended: Aconséyase
     required:
       mark: "*"
       text: ríquese
diff --git a/config/locales/simple_form.ca.yml b/config/locales/simple_form.ca.yml
index 00ca1ed5d..02e3ee53f 100644
--- a/config/locales/simple_form.ca.yml
+++ b/config/locales/simple_form.ca.yml
@@ -184,7 +184,6 @@ ca:
         trendable: Permet que aquesta etiqueta aparegui en les tendències
         usable: Permet als tuts emprar aquesta etiqueta
     'no': 'No'
-    recommended: Recomanat
     required:
       mark: "*"
       text: necessari
diff --git a/config/locales/simple_form.co.yml b/config/locales/simple_form.co.yml
index f3edefdf3..3e852cff9 100644
--- a/config/locales/simple_form.co.yml
+++ b/config/locales/simple_form.co.yml
@@ -184,7 +184,6 @@ co:
         trendable: Auturizà stu hashtag à esse vistu in e tendenze
         usable: Auturizà i statuti à utilizà stu hashtag
     'no': Nò
-    recommended: Ricumandati
     required:
       mark: "*"
       text: riquisiti
diff --git a/config/locales/simple_form.cs.yml b/config/locales/simple_form.cs.yml
index d03636247..9f3f36b1e 100644
--- a/config/locales/simple_form.cs.yml
+++ b/config/locales/simple_form.cs.yml
@@ -184,7 +184,6 @@ cs:
         trendable: Povolit tento hashtag v trendech
         usable: Povolit používat tento hashtag v tootech
     'no': Ne
-    recommended: Doporučeno
     required:
       mark: "*"
       text: vyžadováno
diff --git a/config/locales/simple_form.cy.yml b/config/locales/simple_form.cy.yml
index d6681e664..72fe55dee 100644
--- a/config/locales/simple_form.cy.yml
+++ b/config/locales/simple_form.cy.yml
@@ -183,7 +183,6 @@ cy:
         trendable: Gadewch i'r hashnod hwn ymddangos o dan dueddiadau
         usable: Caniatáu i tŵtiau ddefnyddio'r hashnod hwn
     'no': Na
-    recommended: Argymhellwyd
     required:
       mark: "*"
       text: gofynnol
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml
index d7a10a4a9..9c793f04a 100644
--- a/config/locales/simple_form.da.yml
+++ b/config/locales/simple_form.da.yml
@@ -129,7 +129,6 @@ da:
         trendable: Tillad at dette hashtag vises under trends
         usable: Tillad toots at benytte dette hashtag
     'no': Nej
-    recommended: Anbefalet
     required:
       mark: "*"
       text: påkrævet
diff --git a/config/locales/simple_form.de.yml b/config/locales/simple_form.de.yml
index 999c4432d..0f65a60c2 100644
--- a/config/locales/simple_form.de.yml
+++ b/config/locales/simple_form.de.yml
@@ -184,7 +184,6 @@ de:
         trendable: Erlaube es diesen Hashtag in den Trends erscheinen zu lassen
         usable: Beiträge erlauben, diesen Hashtag zu verwenden
     'no': Nein
-    recommended: Empfohlen
     required:
       mark: "*"
       text: Pflichtfeld
diff --git a/config/locales/simple_form.el.yml b/config/locales/simple_form.el.yml
index 86ba0d303..3b4063056 100644
--- a/config/locales/simple_form.el.yml
+++ b/config/locales/simple_form.el.yml
@@ -184,7 +184,6 @@ el:
         trendable: Εμφάνιση της ετικέτας στις τάσεις
         usable: Χρήση της ετικέτας σε τουτ
     'no': Όχι
-    recommended: Προτείνεται
     required:
       mark: "*"
       text: απαιτείται
diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml
index 78735e9c3..813cebef5 100644
--- a/config/locales/simple_form.en.yml
+++ b/config/locales/simple_form.en.yml
@@ -184,7 +184,6 @@ en:
         trendable: Allow this hashtag to appear under trends
         usable: Allow toots to use this hashtag
     'no': 'No'
-    recommended: Recommended
     required:
       mark: "*"
       text: required
diff --git a/config/locales/simple_form.eo.yml b/config/locales/simple_form.eo.yml
index 308738c88..1ea3295bb 100644
--- a/config/locales/simple_form.eo.yml
+++ b/config/locales/simple_form.eo.yml
@@ -159,7 +159,6 @@ eo:
         trendable: Permesi al ĉi tiu kradvorto aperi en furoraĵoj
         usable: Permesi tootojn uzi ĉiun tiun haketon
     'no': Ne
-    recommended: Rekomendita
     required:
       mark: "*"
       text: bezonata
diff --git a/config/locales/simple_form.es-AR.yml b/config/locales/simple_form.es-AR.yml
index a3195f6b8..4306dc39b 100644
--- a/config/locales/simple_form.es-AR.yml
+++ b/config/locales/simple_form.es-AR.yml
@@ -184,7 +184,6 @@ es-AR:
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
         usable: Permitir a los toots usar esta etiqueta
     'no': 'No'
-    recommended: Opción recomendada
     required:
       mark: "*"
       text: obligatorio
diff --git a/config/locales/simple_form.es.yml b/config/locales/simple_form.es.yml
index bc29918f1..8d624f966 100644
--- a/config/locales/simple_form.es.yml
+++ b/config/locales/simple_form.es.yml
@@ -184,7 +184,6 @@ es:
         trendable: Permitir que esta etiqueta aparezca bajo tendencias
         usable: Permitir a los toots usar esta etiqueta
     'no': 'No'
-    recommended: Recomendado
     required:
       mark: "*"
       text: necesario
diff --git a/config/locales/simple_form.et.yml b/config/locales/simple_form.et.yml
index 79934c0b1..93154745d 100644
--- a/config/locales/simple_form.et.yml
+++ b/config/locales/simple_form.et.yml
@@ -183,7 +183,6 @@ et:
         trendable: Luba sellel sildil trendida
         usable: Luba tuututustel seda silti kasutada
     'no': Ei
-    recommended: Soovituslik
     required:
       mark: "*"
       text: kohustuslik
diff --git a/config/locales/simple_form.eu.yml b/config/locales/simple_form.eu.yml
index c3520b072..41eded347 100644
--- a/config/locales/simple_form.eu.yml
+++ b/config/locales/simple_form.eu.yml
@@ -183,7 +183,6 @@ eu:
         trendable: Baimendu traola hau joeretan agertzea
         usable: Baimendu tootek traola hau erabiltzea
     'no': Ez
-    recommended: Aholkatua
     required:
       mark: "*"
       text: beharrezkoa
diff --git a/config/locales/simple_form.fa.yml b/config/locales/simple_form.fa.yml
index 83f2d206f..0af51685b 100644
--- a/config/locales/simple_form.fa.yml
+++ b/config/locales/simple_form.fa.yml
@@ -184,7 +184,6 @@ fa:
         trendable: بگذارید که این برچسب در موضوعات پرطرفدار دیده شود
         usable: بگذارید که این برچسب در بوق‌ها به کار بروند
     'no': خیر
-    recommended: توصیه می‌شود
     required:
       mark: "*"
       text: ضروری
diff --git a/config/locales/simple_form.fi.yml b/config/locales/simple_form.fi.yml
index 1b4acc9b9..74eda70fc 100644
--- a/config/locales/simple_form.fi.yml
+++ b/config/locales/simple_form.fi.yml
@@ -128,7 +128,6 @@ fi:
         trendable: Salli tämän aihetunnisteen näkyä trendeissä
         usable: Salli tuuttauksien käyttää tätä aihetunnistetta
     'no': Ei
-    recommended: Suositeltu
     required:
       mark: "*"
       text: pakollinen tieto
diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml
index 01e3f8cce..f9ca762db 100644
--- a/config/locales/simple_form.fr.yml
+++ b/config/locales/simple_form.fr.yml
@@ -184,7 +184,6 @@ fr:
         trendable: Autoriser ce hashtag à apparaitre dans les tendances
         usable: Autoriser les pouets à utiliser ce hashtag
     'no': Non
-    recommended: Recommandé
     required:
       mark: "*"
       text: Champs requis
diff --git a/config/locales/simple_form.gl.yml b/config/locales/simple_form.gl.yml
index f2e859acb..58c09a245 100644
--- a/config/locales/simple_form.gl.yml
+++ b/config/locales/simple_form.gl.yml
@@ -184,7 +184,6 @@ gl:
         trendable: Permitir que este cancelo apareza en tendencias
         usable: Permitir que os toots utilicen este cancelo
     'no': Non
-    recommended: Recomendado
     required:
       mark: "*"
       text: requerido
diff --git a/config/locales/simple_form.hu.yml b/config/locales/simple_form.hu.yml
index 0b164c5b6..1e6f332b8 100644
--- a/config/locales/simple_form.hu.yml
+++ b/config/locales/simple_form.hu.yml
@@ -184,7 +184,6 @@ hu:
         trendable: A hashtag megjelenhet a trendek között
         usable: Tülkök használhatják ezt a hashtaget
     'no': Nem
-    recommended: Ajánlott
     required:
       mark: "*"
       text: kötelező
diff --git a/config/locales/simple_form.hy.yml b/config/locales/simple_form.hy.yml
index cd73ee679..c7f934754 100644
--- a/config/locales/simple_form.hy.yml
+++ b/config/locales/simple_form.hy.yml
@@ -35,7 +35,6 @@ hy:
       invite:
         comment: Մեկնաբանություն
     'no': Ոչ
-    recommended: Խորհուրդ է տրվում
     required:
       mark: "*"
       text: պարտադիր
diff --git a/config/locales/simple_form.id.yml b/config/locales/simple_form.id.yml
index 1717d0722..f3c995eab 100644
--- a/config/locales/simple_form.id.yml
+++ b/config/locales/simple_form.id.yml
@@ -183,7 +183,6 @@ id:
         trendable: Izinkan tagar ini muncul di bawah tren
         usable: Izinkan toot memakai tagar ini
     'no': Tidak
-    recommended: Direkomendasikan
     required:
       mark: "*"
       text: wajib
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml
index 5a1c51883..6f8aacaaf 100644
--- a/config/locales/simple_form.is.yml
+++ b/config/locales/simple_form.is.yml
@@ -184,7 +184,6 @@ is:
         trendable: Leyfa þessu myllumerki að birtast undir tilhneigingum
         usable: Leyfa tístum að nota þetta myllumerki
     'no': Nei
-    recommended: Mælt með
     required:
       mark: "*"
       text: nauðsynlegt
diff --git a/config/locales/simple_form.it.yml b/config/locales/simple_form.it.yml
index f76ca05b6..229dc622a 100644
--- a/config/locales/simple_form.it.yml
+++ b/config/locales/simple_form.it.yml
@@ -184,7 +184,6 @@ it:
         trendable: Permetti a questo hashtag di apparire nelle tendenze
         usable: Permetti ai toot di utilizzare questo hashtag
     'no': 'No'
-    recommended: Consigliato
     required:
       mark: "*"
       text: richiesto
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml
index bbc0b5fd7..b1b22890c 100644
--- a/config/locales/simple_form.ja.yml
+++ b/config/locales/simple_form.ja.yml
@@ -184,7 +184,6 @@ ja:
         trendable: トレンドへの表示を許可する
         usable: トゥートへの使用を許可する
     'no': いいえ
-    recommended: おすすめ
     required:
       mark: "*"
       text: 必須
diff --git a/config/locales/simple_form.kab.yml b/config/locales/simple_form.kab.yml
index 6976ed433..3b718613d 100644
--- a/config/locales/simple_form.kab.yml
+++ b/config/locales/simple_form.kab.yml
@@ -87,7 +87,6 @@ kab:
       tag:
         name: Ahacṭag
     'no': Ala
-    recommended: Yettuwelleh
     required:
       mark: "*"
       text: ilaq
diff --git a/config/locales/simple_form.kk.yml b/config/locales/simple_form.kk.yml
index 544c684a6..859c70418 100644
--- a/config/locales/simple_form.kk.yml
+++ b/config/locales/simple_form.kk.yml
@@ -164,7 +164,6 @@ kk:
         trendable: Хештегті трендтерде көрсетуге рұқсат бер
         usable: Бұл хештегті қолдануға рұқсат бер
     'no': Жоқ
-    recommended: Рекоменделген
     required:
       mark: "*"
       text: міндетті
diff --git a/config/locales/simple_form.ko.yml b/config/locales/simple_form.ko.yml
index 7c05521fe..2eb3c9fd0 100644
--- a/config/locales/simple_form.ko.yml
+++ b/config/locales/simple_form.ko.yml
@@ -184,7 +184,6 @@ ko:
         trendable: 이 해시태그가 유행에 보여지도록 허용
         usable: 이 해시태그를 툿에 사용 가능하도록 허용
     'no': 아니오
-    recommended: 추천함
     required:
       mark: "*"
       text: 필수 항목
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml
index 3f4bd9b9e..361720fe9 100644
--- a/config/locales/simple_form.nl.yml
+++ b/config/locales/simple_form.nl.yml
@@ -184,7 +184,6 @@ nl:
         trendable: Toestaan dat deze hashtag onder trends te zien valt
         usable: Toestaan dat deze hashtag in toots gebruikt mag worden
     'no': Nee
-    recommended: Aanbevolen
     required:
       mark: "*"
       text: vereist
diff --git a/config/locales/simple_form.nn.yml b/config/locales/simple_form.nn.yml
index 54a5ecf01..1f4087438 100644
--- a/config/locales/simple_form.nn.yml
+++ b/config/locales/simple_form.nn.yml
@@ -183,7 +183,6 @@ nn:
         trendable: Tillat denne emneknaggen til å vises under trender
         usable: Gje tut lov til å nytta denne emneknaggen
     'no': Nei
-    recommended: Tilrådt
     required:
       mark: "*"
       text: obligatorisk
diff --git a/config/locales/simple_form.no.yml b/config/locales/simple_form.no.yml
index 0210e5a6e..6bad51d68 100644
--- a/config/locales/simple_form.no.yml
+++ b/config/locales/simple_form.no.yml
@@ -183,7 +183,6 @@
         trendable: Tillat denne emneknaggen til å vises under trender
         usable: Tillat tuter å bruke denne emneknaggen
     'no': Nei
-    recommended: Anbefalt
     required:
       mark: "*"
       text: obligatorisk
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml
index 16bde88ce..a68b19b54 100644
--- a/config/locales/simple_form.oc.yml
+++ b/config/locales/simple_form.oc.yml
@@ -184,7 +184,6 @@ oc:
         trendable: Permetre a aquesta etiqueta d’aparéisser a las tendéncias
         usable: Permetre als tuts d’utilizar aquesta etiqueta
     'no': Non
-    recommended: Recomandat
     required:
       mark: "*"
       text: requesit
diff --git a/config/locales/simple_form.pl.yml b/config/locales/simple_form.pl.yml
index d2a1e9386..7e9e57c59 100644
--- a/config/locales/simple_form.pl.yml
+++ b/config/locales/simple_form.pl.yml
@@ -184,7 +184,6 @@ pl:
         trendable: Pozwól na wyświetlanie tego hashtagu w „Na czasie”
         usable: Pozwól na umieszczanie tego hashtagu we wpisach
     'no': Nie
-    recommended: Polecane
     required:
       mark: "*"
       text: pole wymagane
diff --git a/config/locales/simple_form.pt-BR.yml b/config/locales/simple_form.pt-BR.yml
index c112ad4bc..50d643dc1 100644
--- a/config/locales/simple_form.pt-BR.yml
+++ b/config/locales/simple_form.pt-BR.yml
@@ -184,7 +184,6 @@ pt-BR:
         trendable: Permitir que esta hashtag fique em alta
         usable: Permitir que toots usem esta hashtag
     'no': Não
-    recommended: Recomendado
     required:
       mark: "*"
       text: obrigatório
diff --git a/config/locales/simple_form.pt-PT.yml b/config/locales/simple_form.pt-PT.yml
index d3cf5911a..c9712b1d6 100644
--- a/config/locales/simple_form.pt-PT.yml
+++ b/config/locales/simple_form.pt-PT.yml
@@ -184,7 +184,6 @@ pt-PT:
         trendable: Permitir que esta hashtag apareça em destaque
         usable: Permitir que toots utilizem esta hashtag
     'no': Não
-    recommended: Recomendado
     required:
       mark: "*"
       text: obrigatório
diff --git a/config/locales/simple_form.ro.yml b/config/locales/simple_form.ro.yml
index aa0b07708..36ac81b65 100644
--- a/config/locales/simple_form.ro.yml
+++ b/config/locales/simple_form.ro.yml
@@ -183,7 +183,6 @@ ro:
         trendable: Permite acestui hashtag să apară sub tendințe
         usable: Permite postărilor să folosească acest hashtag
     'no': Nu
-    recommended: Recomandat
     required:
       mark: "*"
       text: obligatoriu
diff --git a/config/locales/simple_form.ru.yml b/config/locales/simple_form.ru.yml
index 6cc565228..997a87b36 100644
--- a/config/locales/simple_form.ru.yml
+++ b/config/locales/simple_form.ru.yml
@@ -184,7 +184,6 @@ ru:
         trendable: Разрешить показ хэштега в трендах
         usable: Разрешить использовать этот хэштег в постах
     'no': Нет
-    recommended: Рекомендуем
     required:
       mark: "*"
       text: обязательно
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml
index 9e03d7254..a5fdc2a69 100644
--- a/config/locales/simple_form.sk.yml
+++ b/config/locales/simple_form.sk.yml
@@ -170,7 +170,6 @@ sk:
         trendable: Povoľ zobrazovanie tohto haštagu medzi trendujúcimi
         usable: Povoľ používanie tohto haštagu v príspevkoch
     'no': Nie
-    recommended: Odporúčané
     required:
       mark: "*"
       text: povinné
diff --git a/config/locales/simple_form.sl.yml b/config/locales/simple_form.sl.yml
index 771edf383..31648b119 100644
--- a/config/locales/simple_form.sl.yml
+++ b/config/locales/simple_form.sl.yml
@@ -137,7 +137,6 @@ sl:
         reblog: Pošlji e-pošto, ko nekdo sune vaše stanje
         report: Pošlji e-pošto, ko je oddana nova prijava
     'no': Ne
-    recommended: Priporočeno
     required:
       mark: "*"
       text: zahtevano
diff --git a/config/locales/simple_form.sq.yml b/config/locales/simple_form.sq.yml
index 0093edde2..d00880663 100644
--- a/config/locales/simple_form.sq.yml
+++ b/config/locales/simple_form.sq.yml
@@ -184,7 +184,6 @@ sq:
         trendable: Lejoje këtë hashtag të shfaqet në prirje
         usable: Lejoji mesazhet të përdorin këtë hashtag
     'no': Jo
-    recommended: E rekomanduar
     required:
       mark: "*"
       text: e domosdoshme
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index 80b699c28..97132d2e9 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -108,7 +108,6 @@ sv:
         mention: Skicka e-post när någon nämner dig
         reblog: Skicka e-post när någon knuffar din status
     'no': Nej
-    recommended: Rekommenderad
     required:
       mark: "*"
       text: obligatorisk
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml
index 3ed64c322..b0c9bf877 100644
--- a/config/locales/simple_form.th.yml
+++ b/config/locales/simple_form.th.yml
@@ -183,7 +183,6 @@ th:
         trendable: อนุญาตให้แฮชแท็กนี้ปรากฏภายใต้แนวโน้ม
         usable: อนุญาตให้โพสต์ใช้แฮชแท็กนี้
     'no': ไม่
-    recommended: แนะนำ
     required:
       mark: "*"
       text: ต้องระบุ
diff --git a/config/locales/simple_form.tr.yml b/config/locales/simple_form.tr.yml
index ea913048d..9084b3a52 100644
--- a/config/locales/simple_form.tr.yml
+++ b/config/locales/simple_form.tr.yml
@@ -181,7 +181,6 @@ tr:
         trendable: Bu etiketin trendlerin altında görünmesine izin ver
         usable: Tootların bu etiketi kullanmasına izin ver
     'no': Hayır
-    recommended: Önerilen
     required:
       mark: "*"
       text: gerekli
diff --git a/config/locales/simple_form.uk.yml b/config/locales/simple_form.uk.yml
index a490efed5..c51f6a01b 100644
--- a/config/locales/simple_form.uk.yml
+++ b/config/locales/simple_form.uk.yml
@@ -183,7 +183,6 @@ uk:
         trendable: Дозволити появу цього хештеґа у списку популярних хештеґів
         usable: Дозволити дмухам використовувати цей хештеґ
     'no': Ні
-    recommended: Рекомендовано
     required:
       mark: "*"
       text: обов'язкове
diff --git a/config/locales/simple_form.vi.yml b/config/locales/simple_form.vi.yml
index afa80821b..632088b3c 100644
--- a/config/locales/simple_form.vi.yml
+++ b/config/locales/simple_form.vi.yml
@@ -184,7 +184,6 @@ vi:
         trendable: Cho phép hashtag này xuất hiện trong xu hướng
         usable: Cho phép các tút sử dụng hashtag này
     'no': Tắt
-    recommended: Khuyến nghị
     required:
       mark: "*"
       text: yêu cầu
diff --git a/config/locales/simple_form.zh-CN.yml b/config/locales/simple_form.zh-CN.yml
index 6bb1053a8..458b44da6 100644
--- a/config/locales/simple_form.zh-CN.yml
+++ b/config/locales/simple_form.zh-CN.yml
@@ -184,7 +184,6 @@ zh-CN:
         trendable: 允许在热门下显示此话题
         usable: 允许嘟文使用此话题标签
     'no': 否
-    recommended: 推荐
     required:
       mark: "*"
       text: 必填
diff --git a/config/locales/simple_form.zh-HK.yml b/config/locales/simple_form.zh-HK.yml
index fd192fbbc..4034be5d5 100644
--- a/config/locales/simple_form.zh-HK.yml
+++ b/config/locales/simple_form.zh-HK.yml
@@ -161,7 +161,6 @@ zh-HK:
         trendable: 允許此主題標籤在趨勢下顯示
         usable: 允許嘟文使用此主題標籤
     'no': 否
-    recommended: 建議
     required:
       mark: "*"
       text: 必須填寫
diff --git a/config/locales/simple_form.zh-TW.yml b/config/locales/simple_form.zh-TW.yml
index a09c9945d..cef5b62c0 100644
--- a/config/locales/simple_form.zh-TW.yml
+++ b/config/locales/simple_form.zh-TW.yml
@@ -161,7 +161,6 @@ zh-TW:
         trendable: 允許此主題標籤在趨勢下顯示
         usable: 允許嘟文使用此主題標籤
     'no': 否
-    recommended: 建議
     required:
       mark: "*"
       text: 必須填寫