gearheads/mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Rename "publish" to "toot" in english locale, fix lightbox showing old image

Browse source 
before loading new one, cache notifications API, fix missing follow button
on public profiles
This commit is contained in:
Eugen Rochko 2016-11-23 09:20:34 +01:00
parent 9b53c7d353
commit 4bdb6a0eaf
5 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/components/components/lightbox.jsx
View file

@ -43,13 +43,15 @@ const Lightbox = React.createClass({
render () {
const { intl, isVisible, onOverlayClicked, onCloseClicked, children } = this.props;
const content = isVisible ? children : <div />;
return (
<div className='lightbox' style={{...overlayStyle, display: isVisible ? 'flex' : 'none'}} onClick={onOverlayClicked}>
<Motion defaultStyle={{ y: -200 }} style={{ y: spring(isVisible ? 0 : -200) }}>
{({ y }) =>
<div style={{...dialogStyle, transform: `translateY(${y}px)`}}>
<IconButton title={intl.formatMessage({ id: 'lightbox.close', defaultMessage: 'Close' })} icon='times' onClick={onCloseClicked} size={16} style={closeStyle} />
{children}
{content}
</div>
}
</Motion>

2
app/assets/javascripts/components/locales/en.jsx
View file

@ -34,7 +34,7 @@ const en = {
"tabs_bar.public": "Public",
"tabs_bar.notifications": "Notifications",
"compose_form.placeholder": "What is on your mind?",
"compose_form.publish": "Publish",
"compose_form.publish": "Toot",
"navigation_bar.settings": "Settings",
"navigation_bar.public_timeline": "Public timeline",
"navigation_bar.logout": "Logout",