Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
		
			
				
	
	
		
			67 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			YAML
		
	
	
	
	
	
			
		
		
	
	
			67 lines
		
	
	
		
			1.5 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}'
 | |
|   - '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.*'
 | |
|   - 'statuses.attached.*'
 | |
| 
 | |
| ignore_inconsistent_interpolations:
 | |
|   - '*.one'
 |