diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/paperclip.rb | 6 | ||||
| -rw-r--r-- | config/locales/en.yml | 1 | ||||
| -rw-r--r-- | config/locales/simple_form.en.yml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index ce4185e02..3c35f60e0 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -84,3 +84,9 @@ else url: (ENV['PAPERCLIP_ROOT_URL'] || '/system') + '/:class/:attachment/:id_partition/:style/:filename', ) end + +Paperclip.options[:content_type_mappings] = { + json: %w(text/plain text/html application/json application/json+ld), + jsonld: %w(text/plain text/html application/json application/json+ld), + csv: %w(text/plain), +} diff --git a/config/locales/en.yml b/config/locales/en.yml index 0931713e5..a371a5c7c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -714,7 +714,6 @@ en: domain_blocking: Domain blocking list following: Following list muting: Muting list - profile: Profile information (JSON) statuses: Roars (JSON) upload: Upload in_memoriam_html: In Memoriam. diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 126a8e52f..289523f3d 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -48,7 +48,7 @@ en: featured_tag: name: 'You might want to use one of these:' imports: - data: CSV file exported from another Monsterpit server + data: CSV or JSON file exported from another server invite_request: text: This will help us review your join request sessions: |