mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #678 from EdwardBetts/spelling 

Correct spelling mistakes
This commit is contained in:
daniel 2018-12-27 01:11:52 -07:00 committed by GitHub
parent cacaa6b721 94a1d7da90
commit 4571a68891
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/components.js vendored
View File

@ -62,7 +62,7 @@ require('./components/statusform');
// }); // });
// } // }
// Initalize Notification Helper // Initialize Notification Helper
window.pixelfed.n = {}; window.pixelfed.n = {};
Vue.component( Vue.component(

2
resources/assets/js/components/DiscoverComponent.vue
View File

@ -70,7 +70,7 @@ export default {
}).catch(err => { }).catch(err => {
swal( swal(
'Whoops! Something went wrong...', 'Whoops! Something went wrong...',
'An error occured, please try again later.', 'An error occurred, please try again later.',
'error' 'error'
); );
}); });

4
resources/assets/js/components/PostComments.vue
View File

@ -104,7 +104,7 @@ export default {
$('.postCommentsLoader .lds-ring') $('.postCommentsLoader .lds-ring')
.attr('style','width:100%') .attr('style','width:100%')
.addClass('pt-4 font-weight-bold text-muted') .addClass('pt-4 font-weight-bold text-muted')
.text('An error occured, cannot fetch comments. Please try again later.'); .text('An error occurred, cannot fetch comments. Please try again later.');
} else { } else {
switch(error.response.status) { switch(error.response.status) {
case 401: case 401:
@ -118,7 +118,7 @@ export default {
$('.postCommentsLoader .lds-ring') $('.postCommentsLoader .lds-ring')
.attr('style','width:100%') .attr('style','width:100%')
.addClass('pt-4 font-weight-bold text-muted') .addClass('pt-4 font-weight-bold text-muted')
.text('An error occured, cannot fetch comments. Please try again later.'); .text('An error occurred, cannot fetch comments. Please try again later.');
break; break;
} }
} }

4
resources/assets/js/components/PostComponent.vue
View File

@ -340,7 +340,7 @@ export default {
$('.postPresenterContainer').removeClass('d-none'); $('.postPresenterContainer').removeClass('d-none');
}).catch(error => { }).catch(error => {
if(!error.response) { if(!error.response) {
$('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('An error occured, cannot fetch media. Please try again later.'); $('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('An error occurred, cannot fetch media. Please try again later.');
} else { } else {
switch(error.response.status) { switch(error.response.status) {
case 401: case 401:
@ -351,7 +351,7 @@ export default {
break; break;
default: default:
$('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('An error occured, cannot fetch media. Please try again later.'); $('.postPresenterLoader .lds-ring').attr('style','width:100%').addClass('pt-4 font-weight-bold text-muted').text('An error occurred, cannot fetch media. Please try again later.');
break; break;
} }
} }

2
resources/assets/js/components/notifications.js vendored
View File

@ -96,7 +96,7 @@ $(document).ready(function() {
}).catch(err => { }).catch(err => {
swal( swal(
'Something went wrong!', 'Something went wrong!',
'An error occured, please try again later.', 'An error occurred, please try again later.',
'error' 'error'
); );
}); });

2
resources/views/settings/remove/permanent.blade.php
View File

@ -16,7 +16,7 @@
<p class="">When you press the button below, your photos, comments, likes, friendships and all other data will be removed permanently and will not be recoverable. If you decide to create another Pixelfed account in the future, you cannot sign up with the same username again on this instance.</p> <p class="">When you press the button below, your photos, comments, likes, friendships and all other data will be removed permanently and will not be recoverable. If you decide to create another Pixelfed account in the future, you cannot sign up with the same username again on this instance.</p>
<div class="alert alert-danger my-5"> <div class="alert alert-danger my-5">
<span class="font-weight-bold">Warning:</span> Some remote servers may contain your public data (statuses, avatars, ect) and will not be deleted until federation support is launched. <span class="font-weight-bold">Warning:</span> Some remote servers may contain your public data (statuses, avatars, etc) and will not be deleted until federation support is launched.
</div> </div>
<p> <p>

2
resources/views/site/help/getting-started.blade.php
View File

@ -64,7 +64,7 @@
<p> <p>
<a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse5" role="button" aria-expanded="false" aria-controls="collapse5"> <a class="text-dark font-weight-bold" data-toggle="collapse" href="#collapse5" role="button" aria-expanded="false" aria-controls="collapse5">
<i class="fas fa-chevron-down mr-2"></i> <i class="fas fa-chevron-down mr-2"></i>
I recieved an email that I created an account, but I never signed up for one. I received an email that I created an account, but I never signed up for one.
</a> </a>
<div class="collapse" id="collapse5"> <div class="collapse" id="collapse5">
<div class="mt-2"> <div class="mt-2">

4
resources/views/status/compose.blade.php
View File

@ -354,7 +354,7 @@ $(document).on('change', '.file-input', function(e) {
el.remove(); el.remove();
} }
}).catch(function(e) { }).catch(function(e) {
swal('Oops, something went wrong!', 'An unexpected error occured.', 'error'); swal('Oops, something went wrong!', 'An unexpected error occurred.', 'error');
}); });
io.value = null; io.value = null;
}); });
@ -478,7 +478,7 @@ $(document).on('click', '#create', function(e) {
let data = res.data; let data = res.data;
window.location.href = data; window.location.href = data;
}).catch(err => { }).catch(err => {
swal('Oops, something went wrong!', 'An unexpected error occured.', 'error'); swal('Oops, something went wrong!', 'An unexpected error occurred.', 'error');
}); });
}) })

2
resources/views/status/edit.blade.php
View File

@ -83,7 +83,7 @@
}).then((res) => { }).then((res) => {
swal('Success!', 'You have successfully updated your post', 'success'); swal('Success!', 'You have successfully updated your post', 'success');
}).catch((err) => { }).catch((err) => {
swal('Something went wrong', 'An error occured, please try again later', 'error'); swal('Something went wrong', 'An error occurred, please try again later', 'error');
}); });
}); });