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

fix typo #5508

Merged
merged 1 commit into from
Nov 19, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions app/assets/onepager/js/tx.js
Original file line number Diff line number Diff line change
Expand Up @@ -39820,7 +39820,7 @@ LevelUP.prototype.createValueStream = function(options) {
* Gets a value given a `key`
* @method get
* @param {Buffer|String} key - the key to search for
* @param {Function} cb A callback `Function` which is given the arguments `err` - for errors that may have occured and `value` - the found value in a `Buffer` or if no value was found `null`
* @param {Function} cb A callback `Function` which is given the arguments `err` - for errors that may have occurred and `value` - the found value in a `Buffer` or if no value was found `null`
*/
Trie.prototype.get = function(key, cb) {
var self = this;
Expand All @@ -39843,7 +39843,7 @@ LevelUP.prototype.createValueStream = function(options) {
* @method put
* @param {Buffer|String} key
* @param {Buffer|String} Value
* @param {Function} cb A callback `Function` which is given the argument `err` - for errors that may have occured
* @param {Function} cb A callback `Function` which is given the argument `err` - for errors that may have occurred
*/
Trie.prototype.put = function(key, value, cb) {
var self = this;
Expand Down Expand Up @@ -39903,7 +39903,7 @@ LevelUP.prototype.createValueStream = function(options) {
* Retrieves a raw value in the underlying db
* @method getRaw
* @param {Buffer} key
* @param {Function} callback A callback `Function`, which is given the arguments `err` - for errors that may have occured and `value` - the found value in a `Buffer` or if no value was found `null`.
* @param {Function} callback A callback `Function`, which is given the arguments `err` - for errors that may have occurred and `value` - the found value in a `Buffer` or if no value was found `null`.
*/
Trie.prototype.getRaw = function(key, cb) {
key = ethUtil.toBuffer(key);
Expand Down Expand Up @@ -39958,15 +39958,15 @@ LevelUP.prototype.createValueStream = function(options) {
* @method putRaw
* @param {Buffer|String} key The key as a `Buffer` or `String`
* @param {Buffer} value The value to be stored
* @param {Function} callback A callback `Function`, which is given the argument `err` - for errors that may have occured
* @param {Function} callback A callback `Function`, which is given the argument `err` - for errors that may have occurred
*/
Trie.prototype.putRaw = Trie.prototype._putRaw;

/**
* Removes a raw value in the underlying db
* @method delRaw
* @param {Buffer|String} key
* @param {Function} callback A callback `Function`, which is given the argument `err` - for errors that may have occured
* @param {Function} callback A callback `Function`, which is given the argument `err` - for errors that may have occurred
*/
Trie.prototype.delRaw = function(key, cb) {
function del(db, cb2) {
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/js/pages/profile-edit.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ $(document).ready(function() {
);
} else {
_alert(
{ message: gettext('An error occured. Please try again.') },
{ message: gettext('An error occurred. Please try again.') },
'error'
);
}
Expand Down
2 changes: 1 addition & 1 deletion app/assets/v2/js/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ $(document).ready(function() {
message.val('');
} else {
_alert(
{ message: gettext('An error occured. Please try again.') },
{ message: gettext('An error occurred. Please try again.') },
'error'
);
}
Expand Down
2 changes: 1 addition & 1 deletion app/dashboard/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3403,7 +3403,7 @@ def get_who_works_with(self, work_type='collected', network='mainnet', bounties=
Defaults to: None.

Returns:
dict: list of the profiles that were worked with (key) and the number of times they occured
dict: list of the profiles that were worked with (key) and the number of times they occurred

"""
if bounties is None:
Expand Down
2 changes: 1 addition & 1 deletion app/quests/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ def editquest(request, pk=None):
if settings.DEBUG:
raise e
logger.exception(e)
messages.error(request, 'An unexpected error has occured')
messages.error(request, 'An unexpected error has occurred')

#load edit page
if pk and not package.get('title'):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ <h2 style="text-transform: none;">{% trans "The world of open source is a better
<p class="grant-contribution">
<strong>{{ subscription.amount_per_period }} {{ subscription.token_symbol }} </strong>
</p>
<p>{% trans "occured at" %} </p>
<p>{% trans "occurred at" %} </p>
<p>{{ contribution.created_on|date:"fa F j, Y" }}</p>
<p>{% trans "You can see the transaction on Etherscan " %}
{% if subscription.network == 'mainnet' %}
Expand Down