about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2018-12-18 16:55:15 +0100
committerThibaut Girka <thib@sitedethib.com>2018-12-18 16:55:15 +0100
commit034ffc079e40e0c723173b5998242803cc28dc50 (patch)
treefee1b208be2068cf372ab23f268a66ca51cc2dc3 /config
parent36d27e289177fdec5332539c94b8192022a412f2 (diff)
parent5bf100f87be571e86305f3ab244183fc46f1ede2 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
Diffstat (limited to 'config')
-rw-r--r--config/locales/ar.yml1
-rw-r--r--config/locales/co.yml2
-rw-r--r--config/locales/cs.yml2
-rw-r--r--config/locales/el.yml2
-rw-r--r--config/locales/en.yml2
-rw-r--r--config/locales/eu.yml2
-rw-r--r--config/locales/fr.yml2
-rw-r--r--config/locales/gl.yml2
-rw-r--r--config/locales/ja.yml2
-rw-r--r--config/locales/nl.yml2
-rw-r--r--config/locales/oc.yml2
-rw-r--r--config/locales/pl.yml2
-rw-r--r--config/locales/sk.yml2
-rw-r--r--config/routes.rb2
14 files changed, 0 insertions, 27 deletions
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index eda99e24c..4de1e4e26 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -541,7 +541,6 @@ ar:
     warning_title: توافر المحتوى المنشور و المبعثَر
   directories:
     explore_mastodon: استكشف %{title}
-    most_popular: المشهورة
   errors:
     '403': ليس لك الصلاحيات الكافية لعرض هذه الصفحة.
     '404': إنّ الصفحة التي تبحث عنها لا وجود لها أصلا.
diff --git a/config/locales/co.yml b/config/locales/co.yml
index d2dcef9a4..80d2decd3 100644
--- a/config/locales/co.yml
+++ b/config/locales/co.yml
@@ -531,8 +531,6 @@ co:
     directory: Annuariu di i prufili
     explanation: Scopre utilizatori à partesi di i so centri d'interessu
     explore_mastodon: Scopre à %{title}
-    most_popular: I più pupulari
-    most_recently_active: Attività a più fresca
     people:
       one: "%{count} persona"
       other: "%{count} persone"
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index a5a3c0184..1bba55f0f 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -536,8 +536,6 @@ cs:
     directory: Adresář profilů
     explanation: Objevujte uživatele podle jejich zájmů
     explore_mastodon: Prozkoumejte %{title}
-    most_popular: Nejpopulárnější
-    most_recently_active: Naposledy aktivní
     people:
       few: "%{count} lidé"
       one: "%{count} člověk"
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 342cad91c..9d41f353f 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -531,8 +531,6 @@ el:
     directory: Κατάλογος λογαριασμών
     explanation: Βρες χρήστες βάσει των ενδιαφερόντων τους
     explore_mastodon: Εξερεύνησε %{title}
-    most_popular: Δημοφιλείς
-    most_recently_active: Πρόσφατα ενεργοί
     people:
       one: "%{count} άτομο"
       other: "%{count} άτομα"
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ca139a35e..d6f071c78 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -535,8 +535,6 @@ en:
     directory: Profile directory
     explanation: Discover users based on their interests
     explore_mastodon: Explore %{title}
-    most_popular: Most popular
-    most_recently_active: Most recently active
     people:
       one: "%{count} person"
       other: "%{count} people"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 15307c76e..c96438bc3 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -531,8 +531,6 @@ eu:
     directory: Profilen direktorioa
     explanation: Deskubritu erabiltzaileak interesen arabera
     explore_mastodon: Esploratu %{title}
-    most_popular: Puri-purian
-    most_recently_active: Azkenaldian aktibo
     people:
       one: pertsona %{count}
       other: "%{count} pertsona"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index de3070e8a..c171d9342 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -531,8 +531,6 @@ fr:
     directory: Annuaire des profils
     explanation: Découvrir des utilisateurs en se basant sur leurs centres d'intérêt
     explore_mastodon: Explorer %{title}
-    most_popular: Les plus populaires
-    most_recently_active: Les actifs les plus récents
     people:
       one: "%{count} personne"
       other: "%{count} personne"
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 29d03859d..7c4b6e5ed 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -531,8 +531,6 @@ gl:
     directory: Directorio de perfil
     explanation: Descubra usuarias según o seu interese
     explore_mastodon: Explorar %{title}
-    most_popular: Máis popular
-    most_recently_active: Máis activa recentemente
     people:
       one: "%{count} persoa"
       other: "%{count} persoas"
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 06c8d28d7..21e4236a8 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -530,8 +530,6 @@ ja:
   directories:
     directory: ディレクトリ
     explore_mastodon: "%{title}を探索"
-    most_popular: 人気順
-    most_recently_active: 直近の活動順
     people:
       one: "%{count} 人"
       other: "%{count} 人"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b1a34efbd..8c654034c 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -531,8 +531,6 @@ nl:
     directory: Gebruikersgids
     explanation: Ontdek gebruikers aan de hand van hun interesses
     explore_mastodon: "%{title} verkennen"
-    most_popular: Meest populair
-    most_recently_active: Recentelijk actief
     people:
       one: "%{count} gebruikers"
       other: "%{count} gebruikers"
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 9e798067f..b65e02210 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -587,8 +587,6 @@ oc:
     directory: Annuari de perfils
     explanation: Trobar d’utilizaires segon lor interèsses
     explore_mastodon: Explorar %{title}
-    most_popular: Mai populars
-    most_recently_active: Mai actius recentament
     people:
       one: "%{count} persona"
       other: "%{count} personas"
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index e0bf082b2..0e4498eee 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -541,8 +541,6 @@ pl:
     directory: Katalog profilów
     explanation: Poznaj profile na podstawie zainteresowań
     explore_mastodon: Odkrywaj %{title}
-    most_popular: Napopularniejsi
-    most_recently_active: Ostatnio aktywni
     people:
       few: "%{count} osoby"
       many: "%{count} osób"
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 135fee51f..25d157155 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -536,8 +536,6 @@ sk:
     directory: Databáza profilov
     explanation: Pátraj po užívateľoch podľa ich záujmov
     explore_mastodon: Prebádaj %{title}
-    most_popular: Najpopulárnejšie
-    most_recently_active: Naposledy aktívni
     people:
       few: "%{count} ľudia"
       one: "%{count} človek"
diff --git a/config/routes.rb b/config/routes.rb
index c0cfbf465..918c69cc2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -81,9 +81,7 @@ Rails.application.routes.draw do
   post '/interact/:id', to: 'remote_interaction#create'
 
   get '/explore', to: 'directories#index', as: :explore
-  get '/explore/popular', to: 'directories#index', as: :explore_popular
   get '/explore/:id', to: 'directories#show', as: :explore_hashtag
-  get '/explore/:id/popular', to: 'directories#show', as: :explore_hashtag_popular
 
   namespace :settings do
     resource :profile, only: [:show, :update]