221580a3af
Conflicts: - `app/controllers/home_controller.rb`: Upstream made it so `/web` is available to non-logged-in users and `/` redirects to `/web` instead of `/about`. Kept our version since glitch-soc's WebUI doesn't have what's needed yet and I think /about is still a much better landing page anyway. - `app/models/form/admin_settings.rb`: Upstream added new settings, and glitch-soc had an extra setting. Not really a conflict. Added upstream's new settings. - `app/serializers/initial_state_serializer.rb`: Upstream added a new `server` initial state object. Not really a conflict. Merged upstream's changes. - `app/views/admin/settings/edit.html.haml`: Upstream added new settings. Not really a conflict. Merged upstream's changes. - `app/workers/scheduler/feed_cleanup_scheduler.rb`: Upstream refactored that part and removed the file. Ported our relevant changes into `app/lib/vacuum/feeds_vacuum.rb` - `config/settings.yml`: Upstream added new settings. Not a real conflict. Added upstream's new settings.
70 lines
1.7 KiB
YAML
70 lines
1.7 KiB
YAML
# i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks
|
|
|
|
# The "main" locale.
|
|
base_locale: en
|
|
data:
|
|
read:
|
|
- config/locales/%{locale}.yml
|
|
- config/locales/**/*.%{locale}.yml
|
|
|
|
write:
|
|
- ['{devise, simple_form, doorkeeper}.*', 'config/locales/\1.%{locale}.yml']
|
|
- config/locales/%{locale}.yml
|
|
|
|
yaml:
|
|
write:
|
|
line_width: -1
|
|
|
|
search:
|
|
paths:
|
|
- app/
|
|
- config/navigation.rb
|
|
|
|
relative_roots:
|
|
- app/controllers
|
|
- app/helpers
|
|
- app/mailers
|
|
- app/views
|
|
|
|
exclude:
|
|
- app/assets/images
|
|
- app/assets/fonts
|
|
- app/assets/videos
|
|
|
|
ignore_missing:
|
|
- 'activemodel.errors.*'
|
|
- 'activerecord.attributes.*'
|
|
- 'activerecord.errors.*'
|
|
- '{pagination,doorkeeper}.*'
|
|
- '{date,datetime,time,number}.*'
|
|
- 'errors.messages.*'
|
|
- 'activerecord.errors.models.doorkeeper/*'
|
|
- 'sessions.{browsers,platforms}.*'
|
|
- 'terms.body_html'
|
|
- 'application_mailer.salutation'
|
|
- 'errors.500'
|
|
- 'auth.providers.*'
|
|
|
|
ignore_unused:
|
|
- 'activemodel.errors.*'
|
|
- 'activerecord.attributes.*'
|
|
- 'activerecord.errors.*'
|
|
- '{devise,pagination,doorkeeper}.*'
|
|
- '{date,datetime,time,number}.*'
|
|
- 'simple_form.{yes,no,recommended,not_recommended}'
|
|
- 'simple_form.{placeholders,hints,labels}.*'
|
|
- 'simple_form.{error_notification,required}.:'
|
|
- 'errors.messages.*'
|
|
- 'activerecord.errors.models.doorkeeper/*'
|
|
- 'errors.429'
|
|
- 'admin.accounts.roles.*'
|
|
- 'admin.action_logs.actions.*'
|
|
- 'themes.*'
|
|
- 'admin_mailer.new_appeal.actions.*'
|
|
- 'statuses.attached.*'
|
|
- 'move_handler.carry_{mutes,blocks}_over_text'
|
|
- 'notification_mailer.*'
|
|
|
|
ignore_inconsistent_interpolations:
|
|
- '*.one'
|