Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updated copy #85

Merged
Merged
Changes from all commits
Commits
File filter
Filter file types
Jump to
Jump to file
Failed to load files.

Always

Just for now

@@ -1612,7 +1612,7 @@
"message": "To use this function, navigate to another page."
},
"rewards_new_text": {
"message": "new Reward was discovered"
"message": "New Reward discovered!"
},
"rewards_copy_code": {
"message": "copy code"
@@ -1648,16 +1648,16 @@
"message": "Terms & Conditions"
},
"rewards_disable": {
"message": "Turn off Ghostery rewards"
"message": "Turn off Rewards"
},
"rewards_disable_notification": {
"message": "Ghostery Rewards is now off. You can always turn it on in Ghostery Settings or in the Ghostery Dashboard."
"message": "Ghostery Rewards is now off. You can always turn it on in your Settings or the Rewards dashboard."
},
"rewards_disable_confirm": {
"message": "OK, got it."
},
"rewards_about": {
"message": "About Ghostery Rewards"
"message": "About Rewards"
},
"rewards_settings": {
"message": "Ghostery Rewards Settings"
@@ -1666,10 +1666,10 @@
"message": "Delete this reward"
},
"rewards_first_prompt": {
"message": "Would you like to continue to Ghostery Rewards?"
"message": "Would you like to continue to your Ghostery Reward?"
},
"rewards_second_prompt": {
"message": "Are you sure you would like to opt-out of Ghostery Rewards?"
"message": "Would you like to opt out of future Ghostery Rewards?"
},
"rewards_yes": {
"message": "yes"
@@ -1695,4 +1695,4 @@
"rewards_learn_more": {
"message": "Learn More"
}
}
}
@@ -98,7 +98,7 @@ class HotDog extends Component {
<div>
<div onClick={this.navigate} className="hot-dog-container" style={{ backgroundImage: this.ghostyStar }} >
<div className="ghostery-reward-text">
1 {t('rewards_new_text')}!
{t('rewards_new_text')}
</div>
</div>
<div className="hot-dog-close" onClick={this.close} style={{ backgroundImage: this.closeIcon }} />
@@ -223,7 +223,7 @@ class OfferCard extends Component {

renderExpiresText() {
const { expirationMs } = this.props.reward.offer_data;
const expireDays = Math.round((new Date()).setDate(new Date().getDate() + expirationMs / 60 / 60 / 24));
const expireDays = Math.round((new Date()).setDate(new Date().getDate() + expirationMs / 1000 / 60 / 60 / 24));
const delta = computeTimeDelta(new Date(expireDays), new Date());
return t('rewards_expires_in', [delta.count, t(`rewards_expires_in_${delta.type}`)]);
}
@@ -71,7 +71,7 @@ class Rewards extends React.Component {
picture_url: reward.ui_info.template_data.picture_url,
redeem_url: reward.ui_info.template_data.call_to_action.url,
redeem_text: reward.ui_info.template_data.call_to_action.text,
expires: Math.round((new Date()).setDate(dateNow.getDate() + reward.expirationMs / 60 / 60 / 24)),
expires: Math.round((new Date()).setDate(dateNow.getDate() + reward.expirationMs / 1000 / 60 / 60 / 24)),
};
});
}
@@ -81,7 +81,8 @@
color: $white;
font-size: 12px;
margin-top: 16px;
margin-left: 58px;
margin-left: auto;
margin-right: auto;
transition: visibility 1s;
}

@@ -351,17 +352,17 @@
.rewards-settings {
color: $tundora;
position: absolute;
margin-left: -195px;
margin-top: -10px;
height: 94px;
width: 175px;
background-color: $white;
border: 1px solid #9b9b9b;
border-radius: 4px;
box-shadow: 0px 4px 10px grey;
display: flex;
flex-direction: column;
text-align: left;
line-height: 2;
padding: 5px;
margin-left: -148px;

a {
color: $tundora;
@@ -372,11 +373,13 @@
flex: 1;
display: flex;
align-items: center;
margin-left: 10px;
margin-right: 10px;
padding: 0px 10px;
font-weight: 500;
cursor: pointer;
user-select: none;
&:hover {
background: $porcelain;
}
}

.about {
ProTip! Use n and p to navigate between commits in a pull request.