mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-16 03:43:08 +00:00
d77fbbed73
Conflicts: - `.github/dependabot.yml`: Upstream made changes, but we had removed it. Discarded upstream changes. - `.rubocop_todo.yml`: Upstream regenerated the file, we had some glitch-soc-specific ignores. - `app/models/account_statuses_filter.rb`: Minor upstream code style change where glitch-soc had slightly different code due to handling of local-only posts. Updated to match upstream's code style. - `app/models/status.rb`: Upstream moved ActiveRecord callback definitions, glitch-soc had an extra one. Moved the definitions as upstream did. - `app/services/backup_service.rb`: Upstream rewrote a lot of the backup service, glitch-soc had changes because of exporting local-only posts. Took upstream changes and added back code to deal with local-only posts. - `config/routes.rb`: Upstream split the file into different files, while glitch-soc had a few extra routes. Extra routes added to `config/routes/settings.rb`, `config/routes/api.rb` and `config/routes/admin.rb` - `db/schema.rb`: Upstream has new migrations, while glitch-soc had an extra migration. Updated the expected serial number to match upstream's. - `lib/mastodon/version.rb`: Upstream added support to set version tags from environment variables, while glitch-soc has an extra `+glitch` tag. Changed the code to support upstream's feature but prepending a `+glitch`. - `spec/lib/activitypub/activity/create_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests due to `directMessage` handling. Applied upstream's changes while keeping glitch-soc's extra tests. - `spec/models/concerns/account_interactions_spec.rb`: Minor code style change upstream, while glitch-soc has extra tests. Applied upstream's changes while keeping glitch-soc's extra tests.
80 lines
2 KiB
YAML
80 lines
2 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-glitch/%{locale}.yml
|
|
- config/locales-glitch/*.%{locale}.yml
|
|
|
|
write:
|
|
- [
|
|
'{devise, simple_form, doorkeeper}.*',
|
|
'config/locales-glitch/\1.%{locale}.yml',
|
|
]
|
|
- config/locales-glitch/%{locale}.yml
|
|
|
|
external:
|
|
- config/locales/%{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}.*'
|
|
- '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,glitch_only}'
|
|
- '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.*'
|
|
- 'admin.reports.summary.action_preambles.*'
|
|
- 'admin.reports.summary.actions.*'
|
|
- 'admin_mailer.new_appeal.actions.*'
|
|
- 'statuses.attached.*'
|
|
- 'themes.*'
|
|
- 'move_handler.carry_{mutes,blocks}_over_text'
|
|
- 'notification_mailer.*'
|
|
- 'imports.overwrite_preambles.{following,blocking,muting,domain_blocking,bookmarks}_html'
|
|
- 'imports.preambles.{following,blocking,muting,domain_blocking,bookmarks}_html'
|
|
|
|
ignore_inconsistent_interpolations:
|
|
- '*.one'
|