added a few more things
This commit is contained in:
		
							parent
							
								
									abe95b614b
								
							
						
					
					
						commit
						a489e5d5cd
					
				
					 5 changed files with 39 additions and 2 deletions
				
			
		| 
						 | 
					@ -55,9 +55,25 @@ export default class ActionsModal extends ImmutablePureComponent {
 | 
				
			||||||
            <DisplayName account={this.props.status.get('account')} />
 | 
					            <DisplayName account={this.props.status.get('account')} />
 | 
				
			||||||
          </a>
 | 
					          </a>
 | 
				
			||||||
        </div>
 | 
					        </div>
 | 
				
			||||||
 | 
					        
 | 
				
			||||||
 | 
					        <div className='favourite-modal__status-header'>
 | 
				
			||||||
 | 
					          <div className='favourite-modal__status-time'>
 | 
				
			||||||
 | 
					            <a href={this.props.status.get('url')} className='status__relative-time' target='_blank' rel='noopener'>
 | 
				
			||||||
 | 
					              <RelativeTimestamp timestamp={this.props.status.get('created_at')} />
 | 
				
			||||||
 | 
					            </a>
 | 
				
			||||||
 | 
					          </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					          <a href={this.props.status.getIn(['account', 'url'])} className='status__display-name'>
 | 
				
			||||||
 | 
					            <div className='status__avatar'>
 | 
				
			||||||
 | 
					              <Avatar account={this.props.status.get('account')} size={48} />
 | 
				
			||||||
 | 
					            </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					            <DisplayName account={this.props.status.get('account')} />
 | 
				
			||||||
 | 
					          </a>
 | 
				
			||||||
 | 
					        </div>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <StatusContent status={this.props.status} />
 | 
					        <StatusContent status={this.props.status} />
 | 
				
			||||||
      </div>
 | 
					      </div>      
 | 
				
			||||||
    );
 | 
					    );
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    return (
 | 
					    return (
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1293,6 +1293,19 @@
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
    "path": "app/javascript/mastodon/features/ui/components/boost_modal.json"
 | 
					    "path": "app/javascript/mastodon/features/ui/components/boost_modal.json"
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					  {
 | 
				
			||||||
 | 
					    "descriptors": [
 | 
				
			||||||
 | 
					      {
 | 
				
			||||||
 | 
					        "defaultMessage": "Favourite",
 | 
				
			||||||
 | 
					        "id": "status.favourite"
 | 
				
			||||||
 | 
					      },
 | 
				
			||||||
 | 
					      {
 | 
				
			||||||
 | 
					        "defaultMessage": "You can press {combo} to skip this next time",
 | 
				
			||||||
 | 
					        "id": "favourite_modal.combo"
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					    ],
 | 
				
			||||||
 | 
					    "path": "app/javascript/mastodon/features/ui/components/favourite_modal.json"
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    "descriptors": [
 | 
					    "descriptors": [
 | 
				
			||||||
      {
 | 
					      {
 | 
				
			||||||
| 
						 | 
					@ -1601,4 +1614,4 @@
 | 
				
			||||||
    ],
 | 
					    ],
 | 
				
			||||||
    "path": "app/javascript/mastodon/features/video/index.json"
 | 
					    "path": "app/javascript/mastodon/features/video/index.json"
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
]
 | 
					]
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -25,6 +25,7 @@
 | 
				
			||||||
  "account.unmute_notifications": "Unmute notifications from @{name}",
 | 
					  "account.unmute_notifications": "Unmute notifications from @{name}",
 | 
				
			||||||
  "account.view_full_profile": "View full profile",
 | 
					  "account.view_full_profile": "View full profile",
 | 
				
			||||||
  "boost_modal.combo": "You can press {combo} to skip this next time",
 | 
					  "boost_modal.combo": "You can press {combo} to skip this next time",
 | 
				
			||||||
 | 
					  "favourite_modal.combo": "You can press {combo} to skip this next time",
 | 
				
			||||||
  "bundle_column_error.body": "Something went wrong while loading this component.",
 | 
					  "bundle_column_error.body": "Something went wrong while loading this component.",
 | 
				
			||||||
  "bundle_column_error.retry": "Try again",
 | 
					  "bundle_column_error.retry": "Try again",
 | 
				
			||||||
  "bundle_column_error.title": "Network error",
 | 
					  "bundle_column_error.title": "Network error",
 | 
				
			||||||
| 
						 | 
					@ -109,6 +110,7 @@
 | 
				
			||||||
  "home.settings": "Column settings",
 | 
					  "home.settings": "Column settings",
 | 
				
			||||||
  "keyboard_shortcuts.back": "to navigate back",
 | 
					  "keyboard_shortcuts.back": "to navigate back",
 | 
				
			||||||
  "keyboard_shortcuts.boost": "to boost",
 | 
					  "keyboard_shortcuts.boost": "to boost",
 | 
				
			||||||
 | 
					  "keyboard_shortcuts.favourite": "to favourite",
 | 
				
			||||||
  "keyboard_shortcuts.column": "to focus a status in one of the columns",
 | 
					  "keyboard_shortcuts.column": "to focus a status in one of the columns",
 | 
				
			||||||
  "keyboard_shortcuts.compose": "to focus the compose textarea",
 | 
					  "keyboard_shortcuts.compose": "to focus the compose textarea",
 | 
				
			||||||
  "keyboard_shortcuts.description": "Description",
 | 
					  "keyboard_shortcuts.description": "Description",
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -21,6 +21,7 @@ class UserSettingsDecorator
 | 
				
			||||||
    user.settings['default_sensitive']   = default_sensitive_preference if change?('setting_default_sensitive')
 | 
					    user.settings['default_sensitive']   = default_sensitive_preference if change?('setting_default_sensitive')
 | 
				
			||||||
    user.settings['unfollow_modal']      = unfollow_modal_preference if change?('setting_unfollow_modal')
 | 
					    user.settings['unfollow_modal']      = unfollow_modal_preference if change?('setting_unfollow_modal')
 | 
				
			||||||
    user.settings['boost_modal']         = boost_modal_preference if change?('setting_boost_modal')
 | 
					    user.settings['boost_modal']         = boost_modal_preference if change?('setting_boost_modal')
 | 
				
			||||||
 | 
					    user.settings['favourite_modal']         = boost_modal_preference if change?('setting_boost_modal')
 | 
				
			||||||
    user.settings['delete_modal']        = delete_modal_preference if change?('setting_delete_modal')
 | 
					    user.settings['delete_modal']        = delete_modal_preference if change?('setting_delete_modal')
 | 
				
			||||||
    user.settings['auto_play_gif']       = auto_play_gif_preference if change?('setting_auto_play_gif')
 | 
					    user.settings['auto_play_gif']       = auto_play_gif_preference if change?('setting_auto_play_gif')
 | 
				
			||||||
    user.settings['reduce_motion']       = reduce_motion_preference if change?('setting_reduce_motion')
 | 
					    user.settings['reduce_motion']       = reduce_motion_preference if change?('setting_reduce_motion')
 | 
				
			||||||
| 
						 | 
					@ -53,6 +54,10 @@ class UserSettingsDecorator
 | 
				
			||||||
  def boost_modal_preference
 | 
					  def boost_modal_preference
 | 
				
			||||||
    boolean_cast_setting 'setting_boost_modal'
 | 
					    boolean_cast_setting 'setting_boost_modal'
 | 
				
			||||||
  end
 | 
					  end
 | 
				
			||||||
 | 
					  
 | 
				
			||||||
 | 
					  def favourite_modal_preference
 | 
				
			||||||
 | 
					    boolean_cast_setting 'setting_favourite_modal'
 | 
				
			||||||
 | 
					  end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  def delete_modal_preference
 | 
					  def delete_modal_preference
 | 
				
			||||||
    boolean_cast_setting 'setting_delete_modal'
 | 
					    boolean_cast_setting 'setting_delete_modal'
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -28,6 +28,7 @@ class InitialStateSerializer < ActiveModel::Serializer
 | 
				
			||||||
      store[:me]             = object.current_account.id.to_s
 | 
					      store[:me]             = object.current_account.id.to_s
 | 
				
			||||||
      store[:unfollow_modal] = object.current_account.user.setting_unfollow_modal
 | 
					      store[:unfollow_modal] = object.current_account.user.setting_unfollow_modal
 | 
				
			||||||
      store[:boost_modal]    = object.current_account.user.setting_boost_modal
 | 
					      store[:boost_modal]    = object.current_account.user.setting_boost_modal
 | 
				
			||||||
 | 
					      store[:favourite_modal]  = object.current_account.user.setting_favourite_modal
 | 
				
			||||||
      store[:delete_modal]   = object.current_account.user.setting_delete_modal
 | 
					      store[:delete_modal]   = object.current_account.user.setting_delete_modal
 | 
				
			||||||
      store[:auto_play_gif]  = object.current_account.user.setting_auto_play_gif
 | 
					      store[:auto_play_gif]  = object.current_account.user.setting_auto_play_gif
 | 
				
			||||||
      store[:reduce_motion]  = object.current_account.user.setting_reduce_motion
 | 
					      store[:reduce_motion]  = object.current_account.user.setting_reduce_motion
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue