From 0532890c0e7a4683c2afbefa6c090ee22a4fe2a8 Mon Sep 17 00:00:00 2001 From: mgabdev <> Date: Fri, 27 Mar 2020 18:05:16 -0400 Subject: [PATCH] Removed featured tags We don't use --- .../settings/featured_tags_controller.rb | 51 ------------------- app/services/process_hashtags_service.rb | 4 -- app/services/remove_status_service.rb | 4 -- app/views/accounts/show.html.haml | 15 +----- .../settings/featured_tags/index.html.haml | 27 ---------- config/locales/ar.yml | 2 - config/locales/ca.yml | 5 -- config/locales/co.yml | 5 -- config/locales/cs.yml | 5 -- config/locales/cy.yml | 4 -- config/locales/de.yml | 5 -- config/locales/el.yml | 5 -- config/locales/en.yml | 5 -- config/locales/en_GB.yml | 5 -- config/locales/eo.yml | 5 -- config/locales/eu.yml | 5 -- config/locales/fa.yml | 5 -- config/locales/fr.yml | 5 -- config/locales/gl.yml | 5 -- config/locales/it.yml | 5 -- config/locales/ja.yml | 5 -- config/locales/kk.yml | 5 -- config/locales/ko.yml | 5 -- config/locales/lt.yml | 5 -- config/locales/nl.yml | 5 -- config/locales/oc.yml | 5 -- config/locales/pl.yml | 5 -- config/locales/pt-BR.yml | 5 -- config/locales/pt.yml | 5 -- config/locales/ru.yml | 5 -- config/locales/sk.yml | 5 -- config/locales/sq.yml | 5 -- config/locales/th.yml | 2 - config/navigation.rb | 2 - config/routes.rb | 1 - 35 files changed, 1 insertion(+), 236 deletions(-) delete mode 100644 app/controllers/settings/featured_tags_controller.rb delete mode 100644 app/views/settings/featured_tags/index.html.haml diff --git a/app/controllers/settings/featured_tags_controller.rb b/app/controllers/settings/featured_tags_controller.rb deleted file mode 100644 index 3a324142..00000000 --- a/app/controllers/settings/featured_tags_controller.rb +++ /dev/null @@ -1,51 +0,0 @@ -# frozen_string_literal: true - -class Settings::FeaturedTagsController < Settings::BaseController - layout 'admin' - - before_action :authenticate_user! - before_action :set_featured_tags, only: :index - before_action :set_featured_tag, except: [:index, :create] - before_action :set_most_used_tags, only: :index - - def index - @featured_tag = FeaturedTag.new - end - - def create - @featured_tag = current_account.featured_tags.new(featured_tag_params) - @featured_tag.reset_data - - if @featured_tag.save - redirect_to settings_featured_tags_path - else - set_featured_tags - set_most_used_tags - - render :index - end - end - - def destroy - @featured_tag.destroy! - redirect_to settings_featured_tags_path - end - - private - - def set_featured_tag - @featured_tag = current_account.featured_tags.find(params[:id]) - end - - def set_featured_tags - @featured_tags = current_account.featured_tags.order(statuses_count: :desc).reject(&:new_record?) - end - - def set_most_used_tags - @most_used_tags = Tag.most_used(current_account).where.not(id: @featured_tags.map(&:id)).limit(10) - end - - def featured_tag_params - params.require(:featured_tag).permit(:name) - end -end diff --git a/app/services/process_hashtags_service.rb b/app/services/process_hashtags_service.rb index d5ec076a..c7db4288 100644 --- a/app/services/process_hashtags_service.rb +++ b/app/services/process_hashtags_service.rb @@ -15,9 +15,5 @@ class ProcessHashtagsService < BaseService end return unless status.public_visibility? || status.unlisted_visibility? - - status.account.featured_tags.where(tag_id: records.map(&:id)).each do |featured_tag| - featured_tag.increment(status.created_at) - end end end diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 810e45f8..f0fb5df9 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -137,10 +137,6 @@ class RemoveStatusService < BaseService end def remove_from_hashtags - @account.featured_tags.where(tag_id: @status.tags.pluck(:id)).each do |featured_tag| - featured_tag.decrement(@status.id) - end - return unless @status.public_visibility? @tags.each do |hashtag| diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml index 0adea421..6b97c160 100644 --- a/app/views/accounts/show.html.haml +++ b/app/views/accounts/show.html.haml @@ -30,17 +30,4 @@ .entry= link_to_more @older_url .column-1 - = render 'bio', account: @account - - - @account.featured_tags.order(statuses_count: :desc).each do |featured_tag| - .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil } - = link_to short_account_tag_path(@account, featured_tag.tag) do - %h4 - = fa_icon 'hashtag' - = featured_tag.name - %small - - if featured_tag.last_status_at.nil? - = t('accounts.nothing_here') - - else - %time{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at - .trends__item__current= number_to_human featured_tag.statuses_count, strip_insignificant_zeros: true + = render 'bio', account: @account \ No newline at end of file diff --git a/app/views/settings/featured_tags/index.html.haml b/app/views/settings/featured_tags/index.html.haml deleted file mode 100644 index 5f69517f..00000000 --- a/app/views/settings/featured_tags/index.html.haml +++ /dev/null @@ -1,27 +0,0 @@ -- content_for :page_title do - = t('settings.featured_tags') - -= simple_form_for @featured_tag, url: settings_featured_tags_path do |f| - = render 'shared/error_messages', object: @featured_tag - - .fields-group - = f.input :name, wrapper: :with_block_label, hint: safe_join([t('simple_form.hints.featured_tag.name'), safe_join(@most_used_tags.map { |tag| link_to("##{tag.name}", settings_featured_tags_path(featured_tag: { name: tag.name }), method: :post) }, ', ')], ' ') - - .actions - = f.button :button, t('featured_tags.add_new'), type: :submit - -%hr.spacer/ - -- @featured_tags.each do |featured_tag| - .directory__tag{ class: params[:tag] == featured_tag.name ? 'active' : nil } - %div - %h4 - = fa_icon 'hashtag' - = featured_tag.name - %small - - if featured_tag.last_status_at.nil? - = t('accounts.nothing_here') - - else - %time{ datetime: featured_tag.last_status_at.iso8601, title: l(featured_tag.last_status_at) }= l featured_tag.last_status_at - = table_link_to 'trash', t('filters.index.delete'), settings_featured_tag_path(featured_tag), method: :delete, data: { confirm: t('admin.accounts.are_you_sure') } - .trends__item__current= number_to_human featured_tag.statuses_count, strip_insignificant_zeros: true diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 8e0f44ce..5a0be3c8 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -588,8 +588,6 @@ ar: lists: القوائم mutes: قُمتَ بكتم storage: ذاكرة التخزين - featured_tags: - add_new: إضافة واحد filters: contexts: home: الخيط الزمني الرئيسي diff --git a/config/locales/ca.yml b/config/locales/ca.yml index a1affcaa..b4b41876 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -610,10 +610,6 @@ ca: lists: Llistes mutes: Persones silenciades storage: Emmagatzematge - featured_tags: - add_new: Afegir nova - errors: - limit: Ja has mostrat la quantitat màxima d'etiquetes filters: contexts: home: Línia de temps Inici @@ -869,7 +865,6 @@ ca: development: Desenvolupament edit_profile: Editar perfil export: Exportar dades - featured_tags: Etiquetes destacades identity_proofs: Proves d'identitat import: Importar import_and_export: Importar i exportar diff --git a/config/locales/co.yml b/config/locales/co.yml index 28dfacac..57f70dc5 100644 --- a/config/locales/co.yml +++ b/config/locales/co.yml @@ -610,10 +610,6 @@ co: lists: Liste mutes: Piattate storage: I vostri media - featured_tags: - add_new: Aghjustà novu - errors: - limit: Avete digià messu in mostra u numeru massimale di hashtag filters: contexts: home: Accolta @@ -869,7 +865,6 @@ co: development: Sviluppu edit_profile: Mudificà u prufile export: Spurtazione d’infurmazione - featured_tags: Hashtag in vista identity_proofs: Prove d'identità import: Impurtazione import_and_export: Impurtazione è spurtazione diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 7b00f2c9..ce56ccba 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -617,10 +617,6 @@ cs: lists: Seznamy mutes: Skryl/a jste storage: Paměť médií - featured_tags: - add_new: Přidat nový - errors: - limit: Již jste zvýraznil/a maximální počet hashtagů filters: contexts: home: Domovská časová osa @@ -880,7 +876,6 @@ cs: development: Vývoj edit_profile: Upravit profil export: Export dat - featured_tags: Zvýrazněné hashtagy identity_proofs: Důkazy identity import: Import import_and_export: Import a export diff --git a/config/locales/cy.yml b/config/locales/cy.yml index 82209ebe..85a490ca 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -600,10 +600,6 @@ cy: lists: Rhestrau mutes: Yr ydych yn tawelu storage: Storio cyfryngau - featured_tags: - add_new: Ychwanegu - errors: - limit: Yr ydych yn barod wedi cynnwys yr uchafswm o hashnodau filters: contexts: home: Ffrwd gartref diff --git a/config/locales/de.yml b/config/locales/de.yml index 631a181a..a18f8093 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -610,10 +610,6 @@ de: lists: Listen mutes: Du hast stummgeschaltet storage: Medienspeicher - featured_tags: - add_new: Neu hinzufügen - errors: - limit: Du hast bereits die maximale Anzahl an empfohlenen Hashtags erreicht filters: contexts: home: Startseite @@ -869,7 +865,6 @@ de: development: Entwicklung edit_profile: Profil bearbeiten export: Datenexport - featured_tags: Empfohlene Hashtags identity_proofs: Identitätsnachweise import: Datenimport import_and_export: Importieren und Exportieren diff --git a/config/locales/el.yml b/config/locales/el.yml index c27a58b3..7e2c820b 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -603,10 +603,6 @@ el: lists: Λίστες mutes: Αποσιωπάς storage: Αποθήκευση πολυμέσων - featured_tags: - add_new: Προσθήκη νέας - errors: - limit: Έχεις ήδη προσθέσει το μέγιστο αριθμό ταμπελών filters: contexts: home: Αρχική ροή @@ -852,7 +848,6 @@ el: development: Ανάπτυξη edit_profile: Επεξεργασία προφίλ export: Εξαγωγή δεδομένων - featured_tags: Χαρακτηριστικές ταμπέλες identity_proofs: Αποδείξεις ταυτοτήτων import: Εισαγωγή migrate: Μετακόμιση λογαριασμού diff --git a/config/locales/en.yml b/config/locales/en.yml index f267caaf..8bf70355 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -633,10 +633,6 @@ en: lists: Lists mutes: You mute storage: Media storage - featured_tags: - add_new: Add new - errors: - limit: You have already featured the maximum amount of hashtags filters: contexts: home: Home timeline @@ -892,7 +888,6 @@ en: development: Development edit_profile: Edit profile export: Data export - featured_tags: Featured hashtags identity_proofs: Identity proofs billing: Billing upgrade: Upgrade diff --git a/config/locales/en_GB.yml b/config/locales/en_GB.yml index 6e8fba54..0f1e2f4c 100644 --- a/config/locales/en_GB.yml +++ b/config/locales/en_GB.yml @@ -600,10 +600,6 @@ en_GB: lists: Lists mutes: You mute storage: Media storage - featured_tags: - add_new: Add new - errors: - limit: You have already featured the maximum amount of hashtags filters: contexts: home: Home timeline @@ -847,7 +843,6 @@ en_GB: development: Development edit_profile: Edit profile export: Data export - featured_tags: Featured hashtags identity_proofs: Identity proofs import: Import migrate: Account migration diff --git a/config/locales/eo.yml b/config/locales/eo.yml index b3d1d10d..047d6deb 100644 --- a/config/locales/eo.yml +++ b/config/locales/eo.yml @@ -606,10 +606,6 @@ eo: lists: Listoj mutes: Vi silentigas storage: Aŭdovidaĵa konservado - featured_tags: - add_new: Aldoni novan - errors: - limit: Vi jam elstarigis la maksimuman kvanton da kradvortoj filters: contexts: home: Hejma templinio @@ -862,7 +858,6 @@ eo: development: Evoluigado edit_profile: Redakti profilon export: Eksporti datumojn - featured_tags: Elstarigitaj kradvortoj identity_proofs: Identity proofs import: Importi migrate: Konta migrado diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 1e06ee2b..85bee588 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -571,10 +571,6 @@ eu: lists: Zerrendak mutes: Zuk mututukoak storage: Multimedia biltegiratzea - featured_tags: - add_new: Gehitu berria - errors: - limit: Gehienezko traola kopurua nabarmendu duzu jada filters: contexts: home: Hasierako denbora-lerroa @@ -782,7 +778,6 @@ eu: development: Garapena edit_profile: Aldatu profila export: Datuen esportazioa - featured_tags: Nabarmendutako traolak import: Inportazioa migrate: Kontuaren migrazioa notifications: Jakinarazpenak diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 02dd443c..15886b6b 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -603,10 +603,6 @@ fa: lists: فهرست‌ها mutes: حساب‌های بی‌صداشده storage: تصویرهای ذخیره‌شده - featured_tags: - add_new: افزودن تازه - errors: - limit: شما بیشترین تعداد مجاز برچسب‌ها را دارید filters: contexts: home: خانه @@ -853,7 +849,6 @@ fa: development: فرابری edit_profile: ویرایش نمایه export: برون‌سپاری داده‌ها - featured_tags: برچسب‌های منتخب identity_proofs: مدرک شناسه‌ها import: درون‌ریزی migrate: انتقال حساب diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 6e7473f6..4afe8e96 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -572,10 +572,6 @@ fr: lists: Listes mutes: Vous masquez storage: Médias stockés - featured_tags: - add_new: Ajouter un nouvel hashtag - errors: - limit: Vous avez déjà mis en avant le nombre maximum de hashtags filters: contexts: home: Accueil @@ -793,7 +789,6 @@ fr: development: Développement edit_profile: Modifier le profil export: Export de données - featured_tags: Hashtags mis en avant import: Import de données migrate: Migration de compte notifications: Notifications diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 6f5146a3..cd74b812 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -600,10 +600,6 @@ gl: lists: Listas mutes: Acalou storage: Almacenamento de medios - featured_tags: - add_new: Engadir novo - errors: - limit: Xa acadou o número máximo de etiquetas filters: contexts: home: Liña temporal inicial @@ -848,7 +844,6 @@ gl: development: Desenvolvemento edit_profile: Editar perfil export: Exportar datos - featured_tags: Etiquetas destacadas identity_proofs: Probas de identidade import: Importar migrate: Migrar conta diff --git a/config/locales/it.yml b/config/locales/it.yml index 2cfe6fbb..2bbccab1 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -551,10 +551,6 @@ it: lists: Liste mutes: Stai silenziando storage: Archiviazione media - featured_tags: - add_new: Aggiungi nuovo - errors: - limit: Hai già messo in evidenza il numero massimo di hashtag filters: contexts: home: Timeline home @@ -757,7 +753,6 @@ it: development: Sviluppo edit_profile: Modifica profilo export: Esporta impostazioni - featured_tags: Hashtag in evidenza import: Importa migrate: Migrazione dell'account notifications: Notifiche diff --git a/config/locales/ja.yml b/config/locales/ja.yml index b492357b..fa4c2bdd 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -610,10 +610,6 @@ ja: lists: リスト mutes: ミュート storage: メディア - featured_tags: - add_new: 追加 - errors: - limit: 注目のハッシュタグの上限に達しました filters: contexts: home: ホームタイムライン @@ -868,7 +864,6 @@ ja: development: 開発 edit_profile: プロフィールを編集 export: データのエクスポート - featured_tags: 注目のハッシュタグ identity_proofs: Identity proofs import: データのインポート import_and_export: インポート・エクスポート diff --git a/config/locales/kk.yml b/config/locales/kk.yml index 9e266366..69118a4e 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -572,10 +572,6 @@ kk: lists: Тізімдер mutes: Үнсіздер storage: Медиа жинақ - featured_tags: - add_new: Жаңасын қосу - errors: - limit: Хэштег лимитинен асып кеттіңіз filters: contexts: home: Ішкі желі @@ -792,7 +788,6 @@ kk: development: Жасаушы топ edit_profile: Профиль өңдеу export: Экспорт уақыты - featured_tags: Таңдаулы хэштегтер import: Импорт migrate: Аккаунт көшіру notifications: Ескертпелер diff --git a/config/locales/ko.yml b/config/locales/ko.yml index c646f794..c81474b4 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -612,10 +612,6 @@ ko: lists: 리스트 mutes: 뮤트 storage: 미디어 - featured_tags: - add_new: 추가 - errors: - limit: 이미 추천 해시태그의 개수가 최대입니다 filters: contexts: home: 홈 타임라인 @@ -871,7 +867,6 @@ ko: development: 개발 edit_profile: 프로필 편집 export: 데이터 내보내기 - featured_tags: 추천 해시태그 identity_proofs: 신원 증명 import: 데이터 가져오기 import_and_export: 가져오기 / 내보내기 diff --git a/config/locales/lt.yml b/config/locales/lt.yml index 71ae5d5b..44f8d30d 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -581,10 +581,6 @@ lt: lists: Sąrašai mutes: Jūs tildote storage: Medijos sandėlis - featured_tags: - add_new: Pridėti naują - errors: - limit: Jūs jau naudojate maksimalų galimą saitažodžių(#) kiekį filters: contexts: home: Namų laiko juosta @@ -795,7 +791,6 @@ lt: development: Plėtojimas edit_profile: Keisti profilį export: Informacijos eksportas - featured_tags: Rodomi saitažodžiai(#) import: Importuoti migrate: Paskyros migracija notifications: Pranešimai diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 0914534b..7ec91572 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -610,10 +610,6 @@ nl: lists: Lijsten mutes: Jij negeert storage: Mediaopslag - featured_tags: - add_new: Nieuwe toevoegen - errors: - limit: Je hebt al het maximaal aantal hashtags uitgelicht filters: contexts: home: Starttijdlijn @@ -869,7 +865,6 @@ nl: development: Ontwikkelaars edit_profile: Profiel bewerken export: Exporteren - featured_tags: Uitgelichte hashtags identity_proofs: Identiteitsbewijzen import: Importeren import_and_export: Importeren en exporteren diff --git a/config/locales/oc.yml b/config/locales/oc.yml index fe273c34..83fc065b 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -648,10 +648,6 @@ oc: lists: Listas mutes: Personas rescondudas storage: Mèdias gardats - featured_tags: - add_new: Ajustar una etiqueta nòva - errors: - limit: Avètz ja utilizat lo maximum d’etiquetas filters: contexts: home: Flux d’acuèlh @@ -884,7 +880,6 @@ oc: development: Desvolopament edit_profile: Modificar lo perfil export: Exportar de donadas - featured_tags: Etiquetas en avant import: Importar de donadas migrate: Migracion de compte notifications: Notificacions diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 8bb70ebe..71542831 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -618,10 +618,6 @@ pl: lists: Listy mutes: Wyciszeni storage: Urządzenie przechowujące dane - featured_tags: - add_new: Dodaj nowy - errors: - limit: Już przekroczyłeś(-aś) maksymalną liczbę wyróżnionych hashtagów filters: contexts: home: Strona główna @@ -882,7 +878,6 @@ pl: development: Tworzenie aplikacji edit_profile: Edytuj profil export: Eksportowanie danych - featured_tags: Wyróżnione hashtagi identity_proofs: Dowody tożsamości import: Importowanie danych migrate: Migracja konta diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index f1ebe8e6..d7d3fe2e 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -610,10 +610,6 @@ pt-BR: lists: Listas mutes: Você silenciou storage: Armazenamento de mídia - featured_tags: - add_new: Adicionar uma nova hashtag - errors: - limit: Você atingiu o limite de hashtags em destaque filters: contexts: home: Página inicial @@ -869,7 +865,6 @@ pt-BR: development: Desenvolvimento edit_profile: Editar perfil export: Exportar dados - featured_tags: Hashtags em destaque identity_proofs: Provas de identidade import: Importar import_and_export: Importar e exportar diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 98c571de..0a989898 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -574,10 +574,6 @@ pt: lists: Listas mutes: Tens em silêncio storage: Armazenamento de média - featured_tags: - add_new: Adicionar nova - errors: - limit: Já atingiste o limite máximo de hashtags filters: contexts: home: Cronologia inicial @@ -795,7 +791,6 @@ pt: development: Desenvolvimento edit_profile: Editar perfil export: Exportar dados - featured_tags: Hashtags destacadas import: Importar migrate: Migração de conta notifications: Notificações diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 7fe8e442..3738a7f7 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -624,10 +624,6 @@ ru: lists: Списки mutes: Список глушения storage: Ваш медиаконтент - featured_tags: - add_new: Добавить - errors: - limit: Вы уже добавили максимальное число хэштегов filters: contexts: home: Домашняя лента @@ -891,7 +887,6 @@ ru: development: Разработка edit_profile: Изменить профиль export: Экспорт данных - featured_tags: Особенные хэштеги identity_proofs: Подтверждения личности import: Импорт import_and_export: Импорт и экспорт diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 217f2818..9a7b44ec 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -609,10 +609,6 @@ sk: lists: Zoznamy mutes: Stíšil/a si storage: Úložisko médií - featured_tags: - add_new: Pridaj nový - errors: - limit: Už si si predvolil/a najvyšší možný počet obľúbených haštagov filters: contexts: home: Domáca os @@ -836,7 +832,6 @@ sk: development: Vývoj edit_profile: Uprav profil export: Exportuj dáta - featured_tags: Zvýraznené haštagy import: Importuj import_and_export: Import a export migrate: Presuň účet diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 60670466..cbfd8970 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -569,10 +569,6 @@ sq: lists: Lista mutes: Heshtoni storage: Depozitim për media - featured_tags: - add_new: Shtoni të re - errors: - limit: Keni përdorur tashmë si të zgjedhur sasinë maksimum të hashtagëve filters: contexts: home: Rrjedhë kohore vetjake @@ -779,7 +775,6 @@ sq: development: Zhvillim edit_profile: Përpunoni profilin export: Eksportim të dhënash - featured_tags: Hashtagë të zgjedhur import: Importo migrate: Migrim llogarie notifications: Njoftime diff --git a/config/locales/th.yml b/config/locales/th.yml index bb0f8d82..1bbdd944 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -430,8 +430,6 @@ th: lists: รายการ mutes: คุณปิดเสียง storage: ที่เก็บข้อมูลสื่อ - featured_tags: - add_new: เพิ่มใหม่ filters: contexts: home: เส้นเวลาหน้าแรก diff --git a/config/navigation.rb b/config/navigation.rb index e11e0a02..24a14ead 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -6,8 +6,6 @@ SimpleNavigation::Configuration.run do |navigation| n.item :profile, safe_join([fa_icon('user fw'), t('settings.profile')]), settings_profile_url do |s| s.item :profile, safe_join([fa_icon('pencil fw'), t('settings.appearance')]), settings_profile_url, highlights_on: %r{/settings/profile|/settings/migration} - s.item :featured_tags, safe_join([fa_icon('hashtag fw'), t('settings.featured_tags')]), settings_featured_tags_url - s.item :identity_proofs, safe_join([fa_icon('key fw'), t('settings.identity_proofs')]), settings_identity_proofs_path, highlights_on: %r{/settings/identity_proofs*}, if: proc { current_account.identity_proofs.exists? } end n.item :preferences, safe_join([fa_icon('cog fw'), t('settings.preferences')]), settings_preferences_url, highlights_on: %r{/settings/preferences|/settings/notifications} diff --git a/config/routes.rb b/config/routes.rb index 3ea35757..1af7757a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -134,7 +134,6 @@ Rails.application.routes.draw do resource :migration, only: [:show, :update] resources :sessions, only: [:destroy] - resources :featured_tags, only: [:index, :create, :destroy] resources :scheduled_statuses, only: [:index, :destroy] end