mirror of
https://github.com/pixelfed/pixelfed.git
synced 2024-11-10 00:34:50 +00:00
Merge pull request #906 from fediverse-pl/strings-improvements
some English strings improvements
This commit is contained in:
daniel
GitHub
commit
a9c4fbc6d7
12 changed files with 64 additions and 64 deletions
BIN
public/vendor/horizon/css/app.css
vendored
BIN
public/vendor/horizon/css/app.css
vendored
Binary file not shown.
|
|
@ -64,7 +64,7 @@ export default {
|
|||
},
|
||||
|
||||
methods: {
|
||||
|
||||
|
||||
followUser(id, event) {
|
||||
axios.post('/i/follow', {
|
||||
item: id
|
||||
|
|
@ -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'
|
||||
);
|
||||
|
|
@ -136,4 +136,4 @@ export default {
|
|||
},
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
@ -526,7 +526,7 @@ export default {
|
|||
});
|
||||
}
|
||||
},
|
||||
|
||||
|
||||
owner() {
|
||||
return this.user.id === this.status.account.id;
|
||||
},
|
||||
|
|
|
|||
|
|
@ -34,25 +34,25 @@
|
|||
<div class="profile-stats pb-3 d-inline-flex lead">
|
||||
<div class="font-weight-light pr-5">
|
||||
<a class="text-dark" :href="profile.url">
|
||||
<span class="font-weight-bold">{{profile.statuses_count}}</span>
|
||||
<span class="font-weight-bold">{{profile.statuses_count}}</span>
|
||||
Posts
|
||||
</a>
|
||||
</div>
|
||||
<div class="font-weight-light pr-5">
|
||||
<a class="text-dark cursor-pointer" v-on:click="followersModal()">
|
||||
<span class="font-weight-bold">{{profile.followers_count}}</span>
|
||||
<span class="font-weight-bold">{{profile.followers_count}}</span>
|
||||
Followers
|
||||
</a>
|
||||
</div>
|
||||
<div class="font-weight-light pr-5">
|
||||
<a class="text-dark cursor-pointer" v-on:click="followingModal()">
|
||||
<span class="font-weight-bold">{{profile.following_count}}</span>
|
||||
<span class="font-weight-bold">{{profile.following_count}}</span>
|
||||
Following
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<p class="lead mb-0 d-flex align-items-center">
|
||||
<span class="font-weight-bold pr-3">{{profile.display_name}}</span>
|
||||
<span class="font-weight-bold pr-3">{{profile.display_name}}</span>
|
||||
</p>
|
||||
<div v-if="profile.note" class="mb-0 lead" v-html="profile.note"></div>
|
||||
<p v-if="profile.website" class="mb-0"><a :href="profile.website" class="font-weight-bold" rel="me external nofollow noopener" target="_blank">{{profile.website}}</a></p>
|
||||
|
|
@ -144,7 +144,7 @@
|
|||
|
||||
<div class="postPresenterContainer">
|
||||
<div v-if="status.pf_type === 'photo'" class="w-100">
|
||||
<photo-presenter :status="status"></photo-presenter>
|
||||
<photo-presenter :status="status"></photo-presenter>
|
||||
</div>
|
||||
|
||||
<div v-else-if="status.pf_type === 'video'" class="w-100">
|
||||
|
|
@ -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">
|
||||
|
|
@ -329,7 +329,7 @@ export default {
|
|||
mode: 'grid',
|
||||
modes: ['grid', 'list', 'masonry'],
|
||||
modalStatus: false,
|
||||
relationship: {},
|
||||
relationship: {},
|
||||
followers: [],
|
||||
followerCursor: 1,
|
||||
followerMore: true,
|
||||
|
|
@ -456,7 +456,7 @@ export default {
|
|||
if($('body').hasClass('loggedIn') == false) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
axios.post('/i/like', {
|
||||
item: status.id
|
||||
}).then(res => {
|
||||
|
|
@ -688,7 +688,7 @@ export default {
|
|||
.then(res => {
|
||||
this.followers = res.data;
|
||||
this.followerCursor++;
|
||||
})
|
||||
})
|
||||
this.$refs.followerModal.show();
|
||||
},
|
||||
|
||||
|
|
@ -726,4 +726,4 @@ export default {
|
|||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -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">
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
</div>
|
||||
|
||||
<div v-if="!loading && !networkError" class="mt-5 row">
|
||||
|
||||
|
||||
<div class="col-12 col-md-3">
|
||||
<div>
|
||||
<p class="font-weight-bold">Filters</p>
|
||||
|
|
@ -31,7 +31,7 @@
|
|||
<div class="col-12 col-md-9">
|
||||
<p class="h3 font-weight-lighter">Showing results for <i>{{query}}</i></p>
|
||||
<hr>
|
||||
|
||||
|
||||
<div v-if="filters.hashtags && results.hashtags.length" class="row mb-4">
|
||||
<p class="col-12 font-weight-bold text-muted">Hashtags</p>
|
||||
<a v-for="(hashtag, index) in results.hashtags" class="col-12 col-md-4" style="text-decoration: none;" :href="hashtag.url">
|
||||
|
|
@ -76,7 +76,7 @@
|
|||
</template>
|
||||
|
||||
<style type="text/css" scoped>
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
|
@ -131,4 +131,4 @@ export default {
|
|||
}
|
||||
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@
|
|||
</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;">
|
||||
<div id="stories">
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -22,7 +22,7 @@
|
|||
</template>
|
||||
|
||||
<style type="text/css" scoped>
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
<script type="text/javascript">
|
||||
|
|
@ -53,4 +53,4 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@
|
|||
|
||||
<div class="postPresenterContainer">
|
||||
<div v-if="status.pf_type === 'photo'" class="w-100">
|
||||
<photo-presenter :status="status"></photo-presenter>
|
||||
<photo-presenter :status="status"></photo-presenter>
|
||||
</div>
|
||||
|
||||
<div v-else-if="status.pf_type === 'video'" class="w-100">
|
||||
|
|
@ -256,12 +256,12 @@
|
|||
<div v-else-if="n.type == 'follow'">
|
||||
<p class="my-0">
|
||||
<a :href="n.account.url" class="font-weight-bold text-dark word-break">{{n.account.username}}</a> followed you.
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
<div v-else-if="n.type == 'share'">
|
||||
<p class="my-0">
|
||||
<a :href="n.account.url" class="font-weight-bold text-dark word-break">{{n.account.username}}</a> shared your <a class="font-weight-bold" v-bind:href="n.status.reblog.url">post</a>.
|
||||
</p>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -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">
|
||||
|
|
@ -567,7 +567,7 @@
|
|||
if($('body').hasClass('loggedIn') == false) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
axios.post('/i/like', {
|
||||
item: status.id
|
||||
}).then(res => {
|
||||
|
|
@ -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',
|
||||
|
|
@ -908,7 +908,7 @@
|
|||
.then(res => {
|
||||
this.followers = res.data;
|
||||
this.followerCursor++;
|
||||
})
|
||||
})
|
||||
this.$refs.followerModal.show();
|
||||
},
|
||||
|
||||
|
|
@ -946,4 +946,4 @@
|
|||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -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.',
|
||||
|
||||
];
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
||||
];
|
||||
];
|
||||
|
|
|
|||
|
|
@ -32,8 +32,8 @@
|
|||
<p class="font-weight-ultralight h2 mb-0 text-truncate">{{$sys['php']}}</p>
|
||||
</div>
|
||||
<div class="card-footer font-weight-bold py-0 text-center bg-white">PHP</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-md-3">
|
||||
<div class="card mb-3 border-left-blue">
|
||||
<div class="card-body text-center">
|
||||
|
|
@ -48,9 +48,9 @@
|
|||
<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>
|
||||
<div class="card card-release d-none">
|
||||
<div class="card-body">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
|
|
@ -112,4 +112,4 @@ $(document).ready(function() {
|
|||
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
@endpush
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<span class="font-weight-bold">Compose</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</span>
|
||||
<div>
|
||||
<button class="btn btn-link text-muted" type="button" id="composeMenu">
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
</div>
|
||||
<div class="card-body bg-light">
|
||||
<div class="composeLoader d-none text-center">
|
||||
<div class="lds-ring"><div></div><div></div><div></div><div></div></div>
|
||||
<div class="lds-ring"><div></div><div></div><div></div><div></div></div>
|
||||
</div>
|
||||
<div class="d-none preview-pagination">
|
||||
<div class="d-flex justify-content-between align-items-center">
|
||||
|
|
@ -37,14 +37,14 @@
|
|||
</div>
|
||||
<div class="preview-thumbs">
|
||||
<div class="d-flex justify-content-center" style="overflow-x: auto;">
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="preview row"></div>
|
||||
<div class="preview-meta mb-4 d-none form-inline">
|
||||
<div class="form-group">
|
||||
|
||||
|
||||
<div class="btn-group mr-3" role="group" aria-label="First group">
|
||||
<button type="button" class="btn btn-outline-secondary btn-sm py-1" id="cw" data-toggle="tooltip" data-placement="bottom" title="A content warning or nsfw warning is required for certain content."><i class="far fa-eye d-none d-md-block"></i> CW/NSFW</button>
|
||||
<button type="button" class="btn btn-outline-secondary btn-sm py-1" id="alt"><i class="fab fa-accessible-icon d-none d-md-block"></i> Media Description</button>
|
||||
|
|
@ -83,33 +83,33 @@
|
|||
<div class="row">
|
||||
<div class="col-12 col-sm-2 px-0 text-center">
|
||||
<i class="fas fa-globe"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-10 pl-2">
|
||||
<p class="font-weight-bold mb-0">Public</p>
|
||||
<p class="small mb-0">Anyone can see</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
<a class="dropdown-item" href="#" data-id="private" data-title="Followers Only">
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-2 px-0 text-center">
|
||||
<i class="fas fa-lock"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-10 pl-2">
|
||||
<p class="font-weight-bold mb-0">Followers Only</p>
|
||||
<p class="small mb-0">Only followers can see</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a>
|
||||
{{-- <a class="dropdown-item" href="#" data-id="direct" data-title="Direct Message">
|
||||
<div class="row">
|
||||
<div class="col-12 col-sm-2 px-0 text-center">
|
||||
<i class="fas fa-envelope"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-12 col-sm-10 pl-2">
|
||||
<p class="font-weight-bold mb-0">Direct Message</p>
|
||||
<p class="small mb-0">Recipients only</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</a> --}}
|
||||
</div>
|
||||
|
|
@ -280,7 +280,7 @@ pixelfed.uploader.loadMeta = function() {
|
|||
if(pixelfed.uploader.ids.length > 1) {
|
||||
$('.next').removeClass('text-light');
|
||||
}
|
||||
}
|
||||
}
|
||||
if(cursor > 1) {
|
||||
$('.prev').removeClass('text-light');
|
||||
if(pixelfed.uploader.ids.length > cursor) {
|
||||
|
|
@ -490,14 +490,14 @@ $('.visibility .dropdown-item').on('click', function(e) {
|
|||
});
|
||||
el.addClass('active');
|
||||
$('#visibility').text(el.data('title'));
|
||||
pixelfed.uploader.visibility = el.data('id');
|
||||
pixelfed.uploader.visibility = el.data('id');
|
||||
});
|
||||
|
||||
$('#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'
|
||||
);
|
||||
});
|
||||
|
|
@ -526,4 +526,4 @@ $('#composeMenu').on('click', function(e) {
|
|||
}); --}}
|
||||
|
||||
</script>
|
||||
@endpush
|
||||
@endpush
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Reference in a new issue