chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #906 from fediverse-pl/strings-improvements 

some English strings improvements
This commit is contained in:
daniel 2019-02-28 12:53:24 -07:00 committed by GitHub
parent 0a2f804b79 850544f006
commit a9c4fbc6d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/vendor/horizon/css/app.css vendored
View File

File diff suppressed because one or more lines are too long

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

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

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

@ -152,7 +152,7 @@
<form class="comment-form d-none" method="post" action="/i/comment" :data-id="statusId" data-truncate="false">
<input type="hidden" name="_token" value="">
<input type="hidden" name="item" :value="statusId">
<input class="form-control" name="comment" placeholder="Add a comment..." autocomplete="off">
<input class="form-control" name="comment" placeholder="Add a comment…" autocomplete="off">
<input type="submit" value="Send" class="btn btn-primary comment-submit" />
</form>
</div>
@ -172,7 +172,7 @@
<div class="list-group-item border-0" v-for="(user, index) in likes" :key="'modal_likes_'+index">
<div class="media">
<a :href="user.url">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + ’s avatar'" width="30px">
</a>
<div class="media-body">
<p class="mb-0" style="font-size: 14px">
@ -203,7 +203,7 @@
<div class="list-group-item border-0" v-for="(user, index) in shares" :key="'modal_shares_'+index">
<div class="media">
<a :href="user.url">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px">
</a>
<div class="media-body">
<div class="d-inline-block">

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

@ -233,7 +233,7 @@
<div class="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index">
<div class="media">
<a :href="user.url">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px">
</a>
<div class="media-body">
<p class="mb-0" style="font-size: 14px">
@ -262,7 +262,7 @@
<div class="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index">
<div class="media">
<a :href="user.url">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px">
</a>
<div class="media-body">
<p class="mb-0" style="font-size: 14px">

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

@ -2,7 +2,7 @@
<div class="container">
<div v-if="loading" class="pt-5 text-center">
<div class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
<span class="sr-only">Loading…</span>
</div>
</div>
<div v-if="networkError" class="pt-5 text-center">

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

@ -9,7 +9,7 @@
</div>
<div class="card-body loader text-center" style="height: 120px;">
<div class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
<span class="sr-only">Loading…</span>
</div>
</div>
<div class="card-body pt-2 contents" style="max-height: 120px; overflow-y: scroll;">

12
resources/assets/js/components/Timeline.vue
View File

@ -307,7 +307,7 @@
<div class="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index">
<div class="media">
<a :href="user.url">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px">
</a>
<div class="media-body">
<p class="mb-0" style="font-size: 14px">
@ -336,7 +336,7 @@
<div class="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index">
<div class="media">
<a :href="user.url">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '\'s avatar'" width="30px">
<img class="mr-3 rounded-circle box-shadow" :src="user.avatar" :alt="user.username + '’s avatar'" width="30px">
</a>
<div class="media-body">
<p class="mb-0" style="font-size: 14px">
@ -786,7 +786,7 @@
break;
case 'disable':
msg = 'Are you sure you want to disable ' + username + '\'s account ?';
msg = 'Are you sure you want to disable ' + username + '’s account ?';
swal({
title: 'Confirm',
text: msg,
@ -800,7 +800,7 @@
item_id: status.id,
item_type: 'status'
}).then(res => {
swal('Success', 'Successfully disabled ' + username + '\'s account', 'success');
swal('Success', 'Successfully disabled ' + username + '’s account', 'success');
}).catch(err => {
swal(
'Error',
@ -813,7 +813,7 @@
break;
case 'suspend':
msg = 'Are you sure you want to suspend ' + username + '\'s account ?';
msg = 'Are you sure you want to suspend ' + username + '’s account ?';
swal({
title: 'Confirm',
text: msg,
@ -827,7 +827,7 @@
item_id: status.id,
item_type: 'status'
}).then(res => {
swal('Success', 'Successfully suspend ' + username + '\'s account', 'success');
swal('Success', 'Successfully suspend ' + username + '’s account', 'success');
}).catch(err => {
swal(
'Error',

4
resources/lang/en/passwords.php
View File

@ -15,8 +15,8 @@ return [
'password' => 'Passwords must be at least six characters and match the confirmation.',
'reset' => 'Your password has been reset!',
'sent' => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn\'t receive this email.',
'sent' => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn’t receive this email.',
'token' => 'This password reset token is invalid.',
'user' => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn\'t receive this email.',
'user' => 'If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes. Please check your spam folder if you didn’t receive this email.',
];

2
resources/lang/en/site.php
View File

@ -11,6 +11,6 @@ return [
'privacy' => 'Privacy',
'l10nWip' => 'We’re still working on localization support',
'currentLocale' => 'Current locale',
'selectLocale' => 'Select from one of the supported languages',
'selectLocale' => 'Select one of the supported languages',
];

2
resources/views/admin/settings/system.blade.php
View File

@ -48,7 +48,7 @@
<div>
<div class="card-loading text-center">
<div class="spinner-border" role="status">
<span class="sr-only">Loading...</span>
<span class="sr-only">Loading…</span>
</div>
</div>
<div class="card card-release d-none">

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

@ -497,7 +497,7 @@ $('#composeMenu').on('click', function(e) {
e.preventDefault();
swal(
'Experimental Feature',
'We\'re still working on this feature.',
'We’re still working on this feature.',
'info'
);
});

2
resources/views/status/show/sidebar.blade.php
View File

@ -111,7 +111,7 @@
@csrf
<input type="hidden" name="item" value="{{$status->id}}">
<input class="form-control" name="comment" placeholder="Add a comment..." autocomplete="off">
<input class="form-control" name="comment" placeholder="Add a comment…" autocomplete="off">
</form>
</div>
</div>