diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/locales/en-MP.yml | 9 | ||||
| -rw-r--r-- | config/navigation.rb | 2 | ||||
| -rw-r--r-- | config/routes.rb | 12 |
3 files changed, 16 insertions, 7 deletions
diff --git a/config/locales/en-MP.yml b/config/locales/en-MP.yml index d964e5c03..6c4d37c9f 100644 --- a/config/locales/en-MP.yml +++ b/config/locales/en-MP.yml @@ -14,6 +14,9 @@ en-MP: silenced: "Posts from these servers will be hidden in public timelines and no notifications will be generated from their users' interactions, unless you are following them or vise-versa. These are typically set for curation purposes rather than " accounts: endorsements_hint: You can endorse creatures you follow from the web interface, and they will show up here. + location: + claimed: Claimed + unclaimed: Unclaimed people_followed_by: Creatures whom %{name} follows people_who_follow: Creatures who follow %{name} pin_errors: @@ -34,6 +37,12 @@ en-MP: actions: update_status: "%{name} updated roar by %{target}" deleted_status: "(deleted roar)" + custom_emojis: + claim: Claim + owner: Contributor + ownership_warning: "NOTE: You can only make changes to custom emoji that you upload or copy unless you are a moderator." + unclaim: Unclaim + unclaimed: (unclaimed) dashboard: pending_users: creatures waiting for review feature_hcaptcha: hCaptcha diff --git a/config/navigation.rb b/config/navigation.rb index 7f292af3f..364747adb 100644 --- a/config/navigation.rb +++ b/config/navigation.rb @@ -38,6 +38,7 @@ SimpleNavigation::Configuration.run do |navigation| s.item :export, safe_join([fa_icon('cloud-download fw'), t('settings.export')]), settings_export_url end + n.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), custom_emojis_url, highlights_on: %r{/custom_emojis} n.item :invites, safe_join([fa_icon('user-plus fw'), t('invites.title')]), invites_path, if: proc { Setting.min_invite_role == 'user' && current_user.functional? } n.item :development, safe_join([fa_icon('code fw'), t('settings.development')]), settings_applications_url, if: -> { current_user.functional? } @@ -55,7 +56,6 @@ SimpleNavigation::Configuration.run do |navigation| s.item :dashboard, safe_join([fa_icon('tachometer fw'), t('admin.dashboard.title')]), admin_dashboard_url s.item :settings, safe_join([fa_icon('cogs fw'), t('admin.settings.title')]), edit_admin_settings_url, if: -> { current_user.admin? }, highlights_on: %r{/admin/settings} s.item :announcements, safe_join([fa_icon('bullhorn fw'), t('admin.announcements.title')]), admin_announcements_path, highlights_on: %r{/admin/announcements} - s.item :custom_emojis, safe_join([fa_icon('smile-o fw'), t('admin.custom_emojis.title')]), admin_custom_emojis_url, highlights_on: %r{/admin/custom_emojis} s.item :relays, safe_join([fa_icon('exchange fw'), t('admin.relays.title')]), admin_relays_url, if: -> { current_user.admin? && !whitelist_mode? }, highlights_on: %r{/admin/relays} s.item :sidekiq, safe_join([fa_icon('diamond fw'), 'Sidekiq']), sidekiq_url, link_html: { target: 'sidekiq' }, if: -> { current_user.admin? } s.item :pghero, safe_join([fa_icon('database fw'), 'PgHero']), pghero_url, link_html: { target: 'pghero' }, if: -> { current_user.admin? } diff --git a/config/routes.rb b/config/routes.rb index 33343625c..4e36fe074 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -188,6 +188,12 @@ Rails.application.routes.draw do resources :filters, except: [:show] resource :relationships, only: [:show, :update] + resources :custom_emojis, only: [:index, :new, :create] do + collection do + post :batch + end + end + get '/public', to: 'public_timelines#show', as: :public_timeline get '/media_proxy/:id/(*any)', to: 'media_proxy#show', as: :media_proxy @@ -287,12 +293,6 @@ Rails.application.routes.draw do resource :two_factor_authentication, only: [:destroy] end - resources :custom_emojis, only: [:index, :new, :create] do - collection do - post :batch - end - end - resources :account_moderation_notes, only: [:create, :destroy] resources :tags, only: [:index, :show, :update] do |