UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-10 00:34:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'frontend-ui-refactor' into patch-1

Browse source
This commit is contained in:
marcin mikołajczak 2019-02-28 22:05:59 +01:00 committed by GitHub
commit 3a6064aa7d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 193 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -49,6 +49,6 @@
}, },
"collective": { "collective": {
"type": "opencollective", "type": "opencollective",
"url": "https://opencollective.com/pixelfed-528" "url": "https://opencollective.com/pixelfed"
} }
} }

BIN
public/vendor/horizon/css/app.css vendored
View file

Binary file not shown.

6
resources/assets/js/components/DiscoverComponent.vue
View file

@ -64,7 +64,7 @@ export default {
}, },
methods: { methods: {
followUser(id, event) { followUser(id, event) {
axios.post('/i/follow', { axios.post('/i/follow', {
item: id item: id
@ -74,7 +74,7 @@ export default {
el.text('Unfollow'); el.text('Unfollow');
}).catch(err => { }).catch(err => {
swal( swal(
'Whoops! Something went wrong...', 'Whoops! Something went wrong…',
'An error occurred, please try again later.', 'An error occurred, please try again later.',
'error' 'error'
); );
@ -136,4 +136,4 @@ export default {
}, },
} }
} }
</script> </script>

8
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"> <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="_token" value="">
<input type="hidden" name="item" :value="statusId"> <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" /> <input type="submit" value="Send" class="btn btn-primary comment-submit" />
</form> </form>
</div> </div>
@ -172,7 +172,7 @@
<div class="list-group-item border-0" v-for="(user, index) in likes" :key="'modal_likes_'+index"> <div class="list-group-item border-0" v-for="(user, index) in likes" :key="'modal_likes_'+index">
<div class="media"> <div class="media">
<a :href="user.url"> <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> </a>
<div class="media-body"> <div class="media-body">
<p class="mb-0" style="font-size: 14px"> <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="list-group-item border-0" v-for="(user, index) in shares" :key="'modal_shares_'+index">
<div class="media"> <div class="media">
<a :href="user.url"> <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> </a>
<div class="media-body"> <div class="media-body">
<div class="d-inline-block"> <div class="d-inline-block">
@ -526,7 +526,7 @@ export default {
}); });
} }
}, },
owner() { owner() {
return this.user.id === this.status.account.id; return this.user.id === this.status.account.id;
}, },

26
resources/assets/js/components/Profile.vue
View file

@ -34,25 +34,25 @@
<div class="profile-stats pb-3 d-inline-flex lead"> <div class="profile-stats pb-3 d-inline-flex lead">
<div class="font-weight-light pr-5"> <div class="font-weight-light pr-5">
<a class="text-dark" :href="profile.url"> <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 Posts
</a> </a>
</div> </div>
<div class="font-weight-light pr-5"> <div class="font-weight-light pr-5">
<a class="text-dark cursor-pointer" v-on:click="followersModal()"> <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 Followers
</a> </a>
</div> </div>
<div class="font-weight-light pr-5"> <div class="font-weight-light pr-5">
<a class="text-dark cursor-pointer" v-on:click="followingModal()"> <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 Following
</a> </a>
</div> </div>
</div> </div>
<p class="lead mb-0 d-flex align-items-center"> <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> </p>
<div v-if="profile.note" class="mb-0 lead" v-html="profile.note"></div> <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> <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 class="postPresenterContainer">
<div v-if="status.pf_type === 'photo'" class="w-100"> <div v-if="status.pf_type === 'photo'" class="w-100">
<photo-presenter :status="status"></photo-presenter> <photo-presenter :status="status"></photo-presenter>
</div> </div>
<div v-else-if="status.pf_type === 'video'" class="w-100"> <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="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index">
<div class="media"> <div class="media">
<a :href="user.url"> <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> </a>
<div class="media-body"> <div class="media-body">
<p class="mb-0" style="font-size: 14px"> <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="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index">
<div class="media"> <div class="media">
<a :href="user.url"> <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> </a>
<div class="media-body"> <div class="media-body">
<p class="mb-0" style="font-size: 14px"> <p class="mb-0" style="font-size: 14px">
@ -329,7 +329,7 @@ export default {
mode: 'grid', mode: 'grid',
modes: ['grid', 'list', 'masonry'], modes: ['grid', 'list', 'masonry'],
modalStatus: false, modalStatus: false,
relationship: {}, relationship: {},
followers: [], followers: [],
followerCursor: 1, followerCursor: 1,
followerMore: true, followerMore: true,
@ -456,7 +456,7 @@ export default {
if($('body').hasClass('loggedIn') == false) { if($('body').hasClass('loggedIn') == false) {
return; return;
} }
axios.post('/i/like', { axios.post('/i/like', {
item: status.id item: status.id
}).then(res => { }).then(res => {
@ -671,7 +671,7 @@ export default {
.then(res => { .then(res => {
this.following = res.data; this.following = res.data;
this.followingCursor++; this.followingCursor++;
if(res.data.length < 10) { if(res.data.length < 10) {
this.followingMore = false; this.followingMore = false;
} }
}); });
@ -691,7 +691,7 @@ export default {
.then(res => { .then(res => {
this.followers = res.data; this.followers = res.data;
this.followerCursor++; this.followerCursor++;
if(res.data.length < 10) { if(res.data.length < 10) {
this.followerMore = false; this.followerMore = false;
} }
}) })
@ -709,7 +709,7 @@ export default {
this.following.push(...res.data); this.following.push(...res.data);
this.followingCursor++; this.followingCursor++;
} }
if(res.data.length < 10) { if(res.data.length < 10) {
this.followingMore = false; this.followingMore = false;
} }
}); });
@ -727,7 +727,7 @@ export default {
this.followers.push(...res.data); this.followers.push(...res.data);
this.followerCursor++; this.followerCursor++;
} }
if(res.data.length < 10) { if(res.data.length < 10) {
this.followerMore = false; this.followerMore = false;
} }
}); });

10
resources/assets/js/components/SearchResults.vue
View file

@ -2,7 +2,7 @@
<div class="container"> <div class="container">
<div v-if="loading" class="pt-5 text-center"> <div v-if="loading" class="pt-5 text-center">
<div class="spinner-border" role="status"> <div class="spinner-border" role="status">
<span class="sr-only">Loading...</span> <span class="sr-only">Loading…</span>
</div> </div>
</div> </div>
<div v-if="networkError" class="pt-5 text-center"> <div v-if="networkError" class="pt-5 text-center">
@ -10,7 +10,7 @@
</div> </div>
<div v-if="!loading && !networkError" class="mt-5 row"> <div v-if="!loading && !networkError" class="mt-5 row">
<div class="col-12 col-md-3"> <div class="col-12 col-md-3">
<div> <div>
<p class="font-weight-bold">Filters</p> <p class="font-weight-bold">Filters</p>
@ -31,7 +31,7 @@
<div class="col-12 col-md-9"> <div class="col-12 col-md-9">
<p class="h3 font-weight-lighter">Showing results for <i>{{query}}</i></p> <p class="h3 font-weight-lighter">Showing results for <i>{{query}}</i></p>
<hr> <hr>
<div v-if="filters.hashtags && results.hashtags.length" class="row mb-4"> <div v-if="filters.hashtags && results.hashtags.length" class="row mb-4">
<p class="col-12 font-weight-bold text-muted">Hashtags</p> <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"> <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> </template>
<style type="text/css" scoped> <style type="text/css" scoped>
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
@ -131,4 +131,4 @@ export default {
} }
} }
</script> </script>

8
resources/assets/js/components/Stories.vue
View file

@ -9,12 +9,12 @@
</div> </div>
<div class="card-body loader text-center" style="height: 120px;"> <div class="card-body loader text-center" style="height: 120px;">
<div class="spinner-border" role="status"> <div class="spinner-border" role="status">
<span class="sr-only">Loading...</span> <span class="sr-only">Loading…</span>
</div> </div>
</div> </div>
<div class="card-body pt-2 contents" style="max-height: 120px; overflow-y: scroll;"> <div class="card-body pt-2 contents" style="max-height: 120px; overflow-y: scroll;">
<div id="stories"> <div id="stories">
</div> </div>
</div> </div>
</div> </div>
@ -22,7 +22,7 @@
</template> </template>
<style type="text/css" scoped> <style type="text/css" scoped>
</style> </style>
<script type="text/javascript"> <script type="text/javascript">
@ -53,4 +53,4 @@
} }
} }
} }
</script> </script>

28
resources/assets/js/components/Timeline.vue
View file

@ -58,7 +58,7 @@
<div class="postPresenterContainer"> <div class="postPresenterContainer">
<div v-if="status.pf_type === 'photo'" class="w-100"> <div v-if="status.pf_type === 'photo'" class="w-100">
<photo-presenter :status="status"></photo-presenter> <photo-presenter :status="status"></photo-presenter>
</div> </div>
<div v-else-if="status.pf_type === 'video'" class="w-100"> <div v-else-if="status.pf_type === 'video'" class="w-100">
@ -256,12 +256,12 @@
<div v-else-if="n.type == 'follow'"> <div v-else-if="n.type == 'follow'">
<p class="my-0"> <p class="my-0">
<a :href="n.account.url" class="font-weight-bold text-dark word-break">{{n.account.username}}</a> followed you. <a :href="n.account.url" class="font-weight-bold text-dark word-break">{{n.account.username}}</a> followed you.
</p> </p>
</div> </div>
<div v-else-if="n.type == 'share'"> <div v-else-if="n.type == 'share'">
<p class="my-0"> <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>. <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> </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="list-group-item border-0" v-for="(user, index) in following" :key="'following_'+index">
<div class="media"> <div class="media">
<a :href="user.url"> <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> </a>
<div class="media-body"> <div class="media-body">
<p class="mb-0" style="font-size: 14px"> <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="list-group-item border-0" v-for="(user, index) in followers" :key="'follower_'+index">
<div class="media"> <div class="media">
<a :href="user.url"> <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> </a>
<div class="media-body"> <div class="media-body">
<p class="mb-0" style="font-size: 14px"> <p class="mb-0" style="font-size: 14px">
@ -567,7 +567,7 @@
if($('body').hasClass('loggedIn') == false) { if($('body').hasClass('loggedIn') == false) {
return; return;
} }
axios.post('/i/like', { axios.post('/i/like', {
item: status.id item: status.id
}).then(res => { }).then(res => {
@ -786,7 +786,7 @@
break; break;
case 'disable': 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({ swal({
title: 'Confirm', title: 'Confirm',
text: msg, text: msg,
@ -800,7 +800,7 @@
item_id: status.id, item_id: status.id,
item_type: 'status' item_type: 'status'
}).then(res => { }).then(res => {
swal('Success', 'Successfully disabled ' + username + '\'s account', 'success'); swal('Success', 'Successfully disabled ' + username + '’s account', 'success');
}).catch(err => { }).catch(err => {
swal( swal(
'Error', 'Error',
@ -813,7 +813,7 @@
break; break;
case 'suspend': 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({ swal({
title: 'Confirm', title: 'Confirm',
text: msg, text: msg,
@ -827,7 +827,7 @@
item_id: status.id, item_id: status.id,
item_type: 'status' item_type: 'status'
}).then(res => { }).then(res => {
swal('Success', 'Successfully suspend ' + username + '\'s account', 'success'); swal('Success', 'Successfully suspend ' + username + '’s account', 'success');
}).catch(err => { }).catch(err => {
swal( swal(
'Error', 'Error',
@ -892,7 +892,7 @@
this.following = res.data; this.following = res.data;
this.followingCursor++; this.followingCursor++;
}); });
if(res.data.length < 10) { if(res.data.length < 10) {
this.followingMore = false; this.followingMore = false;
} }
this.$refs.followingModal.show(); this.$refs.followingModal.show();
@ -912,7 +912,7 @@
this.followers = res.data; this.followers = res.data;
this.followerCursor++; this.followerCursor++;
}) })
if(res.data.length < 10) { if(res.data.length < 10) {
this.followerMore = false; this.followerMore = false;
} }
this.$refs.followerModal.show(); this.$refs.followerModal.show();
@ -929,7 +929,7 @@
this.following.push(...res.data); this.following.push(...res.data);
this.followingCursor++; this.followingCursor++;
} }
if(res.data.length < 10) { if(res.data.length < 10) {
this.followingMore = false; this.followingMore = false;
} }
}); });
@ -947,7 +947,7 @@
this.followers.push(...res.data); this.followers.push(...res.data);
this.followerCursor++; this.followerCursor++;
} }
if(res.data.length < 10) { if(res.data.length < 10) {
this.followerMore = false; this.followerMore = false;
} }
}); });

39
resources/assets/sass/custom.scss vendored
View file

@ -211,6 +211,45 @@ body, button, input, textarea {
animation: loading-bar 3s linear infinite; animation: loading-bar 3s linear infinite;
} }
.liked {
position: relative;
z-index: 1;
}
.liked::after {
content: "\F0a3";
color: transparent;
animation: liking 1.5s;
position: absolute;
z-index: -1;
left: 50%;
top: 0;
}
@keyframes liking {
0% {
-webkit-transform:rotate(0deg);
transform:rotate(0deg);
font-size:0;
top: .25rem;
color: #ebf70e;
}
75% {
-webkit-transform:rotate(1turn);
transform:rotate(1turn);
top: -0.55rem;
font-size: 2.8rem;
opacity:1;
left: -0.55rem;
}
100% {
transform:rotate(1turn);
top: 2.5rem;
left: 0em;
font-size:0;
left: 0.9rem
}
.max-hide-overflow { .max-hide-overflow {
max-height: 500px; max-height: 500px;
overflow-y: hidden; overflow-y: hidden;

20
resources/lang/cs/navmenu.php
View file

@ -2,13 +2,17 @@
return [ return [
'viewMyProfile' => 'Zobrazit můj profil', 'search' => 'Hledat',
'myTimeline' => 'Moje časová osa', 'home' => 'Domů',
'publicTimeline' => 'Veřejná časová osa', 'local' => 'Místní',
'remoteFollow' => 'Vzdálené sledování', 'discover' => 'Objevovat',
'settings' => 'Nastavení', 'viewMyProfile' => 'Zobrazit můj profil',
'admin' => 'Administrace', 'myTimeline' => 'Moje časová osa',
'logout' => 'Odhlásit', 'publicTimeline' => 'Veřejná časová osa',
'directMessages' => 'Přímé zprávy', 'remoteFollow' => 'Vzdálené sledování',
'settings' => 'Nastavení',
'admin' => 'Administrace',
'logout' => 'Odhlásit',
'directMessages' => 'Přímé zprávy',
]; ];

2
resources/lang/de/site.php
View file

@ -9,7 +9,7 @@ return [
'opensource' => 'Open Source', 'opensource' => 'Open Source',
'terms' => 'Nutzungshinweise', 'terms' => 'Nutzungshinweise',
'privacy' => 'Privacy', 'privacy' => 'Privacy',
'l10nWip' => 'Wir arbeiten noch an der Unterstützung weiterer Sprachen.', 'l10nWip' => 'Wir arbeiten noch an der Unterstützung weiterer Sprachen',
'currentLocale' => 'Aktuelle Sprache', 'currentLocale' => 'Aktuelle Sprache',
'selectLocale' => 'Wähle eine der unterstützten Sprachen aus', 'selectLocale' => 'Wähle eine der unterstützten Sprachen aus',

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.', 'password' => 'Passwords must be at least six characters and match the confirmation.',
'reset' => 'Your password has been reset!', '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.', '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.',
]; ];

4
resources/lang/en/site.php
View file

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

4
resources/lang/eu/navmenu.php
View file

@ -2,6 +2,10 @@
return [ return [
'search' => 'Bilatu',
'home' => 'Sarrera',
'local' => 'Lokala',
'discover' => 'Esploratu',
'viewMyProfile' => 'Ikusi nire profila', 'viewMyProfile' => 'Ikusi nire profila',
'myTimeline' => 'Nire denboralerroa', 'myTimeline' => 'Nire denboralerroa',
'publicTimeline' => 'Denboralerro publikoa', 'publicTimeline' => 'Denboralerro publikoa',

2
resources/lang/id/auth.php
View file

@ -14,6 +14,6 @@ return [
*/ */
'failed' => 'Kredensial ini tidak cocok dengan data kami.', 'failed' => 'Kredensial ini tidak cocok dengan data kami.',
'throttle' => 'Terlalu banyak percobaan login. COba lagi setelah :seconds detik.', 'throttle' => 'Terlalu banyak percobaan login. Coba lagi setelah :seconds detik.',
]; ];

2
resources/lang/id/profile.php
View file

@ -4,7 +4,7 @@ return [
'emptyFollowers' => 'User ini belum punya pengikut!', 'emptyFollowers' => 'User ini belum punya pengikut!',
'emptyFollowing' => 'User ini belum mengikuti siapapun!', 'emptyFollowing' => 'User ini belum mengikuti siapapun!',
'emptySaved' => 'Kamu belum membuat posting!', 'emptySaved' => 'Kamu belum membuat posting!',
'savedWarning' => 'Hanya kami yang bisa melihat posting kamu sendiri', 'savedWarning' => 'Hanya kamu yang bisa melihat posting kamu sendiri',
'privateProfileWarning' => 'Akun ini Privat', 'privateProfileWarning' => 'Akun ini Privat',
'alreadyFollow' => 'Sudah mengikuti :username?', 'alreadyFollow' => 'Sudah mengikuti :username?',
'loginToSeeProfile' => 'untuk melihat foro dan videonya.', 'loginToSeeProfile' => 'untuk melihat foro dan videonya.',

66
resources/lang/id/validation.php
View file

@ -31,7 +31,7 @@ return [
'date' => ':attribute bukan berupa tanggal yang benar.', 'date' => ':attribute bukan berupa tanggal yang benar.',
'date_format' => ':attribute tidak sesuai dengan format :format.', 'date_format' => ':attribute tidak sesuai dengan format :format.',
'different' => ':attribute dan :other harus berbeda.', 'different' => ':attribute dan :other harus berbeda.',
'digits' => ':attribute haurs berisi :digits digit.', 'digits' => ':attribute harus berisi :digits digit.',
'digits_between' => ':attribute harus antara :min dan :max digit.', 'digits_between' => ':attribute harus antara :min dan :max digit.',
'dimensions' => ':attribute berisi dimensi gambar yang tidak benar.', 'dimensions' => ':attribute berisi dimensi gambar yang tidak benar.',
'distinct' => 'Bagian :attribute memiliki duplikasi.', 'distinct' => 'Bagian :attribute memiliki duplikasi.',
@ -48,43 +48,43 @@ return [
'ipv6' => ':attribute harus berupa alamat IPv6 yang benar.', 'ipv6' => ':attribute harus berupa alamat IPv6 yang benar.',
'json' => ':attribute harus berupa string JSON yang benar.', 'json' => ':attribute harus berupa string JSON yang benar.',
'max' => [ 'max' => [
'numeric' => 'The :attribute may not be greater than :max.', 'numeric' => ':attribute tidak boleh lebih dari :max.',
'file' => 'The :attribute may not be greater than :max kilobytes.', 'file' => ':attribute tidak boleh lebih dari :max kilobyte.',
'string' => 'The :attribute may not be greater than :max characters.', 'string' => ':attribute tidak boleh lebih dari :max karakter.',
'array' => 'The :attribute may not have more than :max items.', 'array' => ':attribute tidak boleh lebih dari :max item.',
], ],
'mimes' => 'The :attribute must be a file of type: :values.', 'mimes' => ':attribute harus berupa berkas: :values.',
'mimetypes' => 'The :attribute must be a file of type: :values.', 'mimetypes' => ':attribute harus berupa berkas: :values.',
'min' => [ 'min' => [
'numeric' => 'The :attribute must be at least :min.', 'numeric' => ':attribute minimal harus :min.',
'file' => 'The :attribute must be at least :min kilobytes.', 'file' => ':attribute minimal harus :min kilobyte.',
'string' => 'The :attribute must be at least :min characters.', 'string' => ':attribute minimal harus :min karakter.',
'array' => 'The :attribute must have at least :min items.', 'array' => ':attribute minimal harus berisi :min item.',
], ],
'not_in' => 'The selected :attribute is invalid.', 'not_in' => ':attribute yang dipilih tidak benar.',
'not_regex' => 'The :attribute format is invalid.', 'not_regex' => 'Format :attribute tidak benar.',
'numeric' => 'The :attribute must be a number.', 'numeric' => ':attribute harus berupa angka.',
'present' => 'The :attribute field must be present.', 'present' => 'Bagian :attribute harus diisi.',
'regex' => 'The :attribute format is invalid.', 'regex' => 'Format :attribute tidak benar.',
'required' => 'The :attribute field is required.', 'required' => 'Bagian :attribute harus diisi.',
'required_if' => 'The :attribute field is required when :other is :value.', 'required_if' => 'Bagian :attribute harus diisi jika :other :value.',
'required_unless' => 'The :attribute field is required unless :other is in :values.', 'required_unless' => 'Bagian :attribute harus diisi kecuali jika :other :values.',
'required_with' => 'The :attribute field is required when :values is present.', 'required_with' => 'Bagian :attribute harus diisi jika ada :values.',
'required_with_all' => 'The :attribute field is required when :values is present.', 'required_with_all' => 'Bagian :attribute harus diisi jika ada :values.',
'required_without' => 'The :attribute field is required when :values is not present.', 'required_without' => 'Bagian :attribute harus diisi jika tidak ada :values.',
'required_without_all' => 'The :attribute field is required when none of :values are present.', 'required_without_all' => 'Bagian :attribute harus diisi jika tidak ada :values.',
'same' => 'The :attribute and :other must match.', 'same' => ':attribute dan :other harus sama.',
'size' => [ 'size' => [
'numeric' => 'The :attribute must be :size.', 'numeric' => ':attribute harus :size.',
'file' => 'The :attribute must be :size kilobytes.', 'file' => ':attribute harus berukuran :size kilobyte.',
'string' => 'The :attribute must be :size characters.', 'string' => ':attribute harus berisi :size karaker.',
'array' => 'The :attribute must contain :size items.', 'array' => ':attribute harus berisi :size item.',
], ],
'string' => 'The :attribute must be a string.', 'string' => ':attribute harus berupa string.',
'timezone' => 'The :attribute must be a valid zone.', 'timezone' => ':attribute harus berupa zona yang benar.',
'unique' => 'The :attribute has already been taken.', 'unique' => ':attribute sudah digunakan.',
'uploaded' => 'The :attribute failed to upload.', 'uploaded' => ':attribute gagal diunggah.',
'url' => 'The :attribute format is invalid.', 'url' => 'Format :attribute tidak benar.',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Custom Validation Language Lines | Custom Validation Language Lines

6
resources/lang/pl/navmenu.php
View file

@ -2,12 +2,16 @@
return [ return [
'search' => 'Szukaj',
'home' => 'Strona główna',
'local' => 'Lokalne',
'discover' => 'Odkrywaj',
'viewMyProfile' => 'Pokaż mój profil', 'viewMyProfile' => 'Pokaż mój profil',
'myTimeline' => 'Moja oś czasu', 'myTimeline' => 'Moja oś czasu',
'publicTimeline' => 'Publiczna oś czasu', 'publicTimeline' => 'Publiczna oś czasu',
'remoteFollow' => 'Zdalne śledzenie', 'remoteFollow' => 'Zdalne śledzenie',
'settings' => 'Ustawienia', 'settings' => 'Ustawienia',
'admin' => 'Administrator', 'admin' => 'Administracja',
'logout' => 'Wyloguj się', 'logout' => 'Wyloguj się',
'directMessages' => 'Wiadomości bezpośrednie', 'directMessages' => 'Wiadomości bezpośrednie',

1
resources/lang/pl/notification.php
View file

@ -6,5 +6,6 @@ return [
'startedFollowingYou' => 'zaczął(-ęła) Cię obserwować.', 'startedFollowingYou' => 'zaczął(-ęła) Cię obserwować.',
'commented' => 'skomentował(a) Twój wpis', 'commented' => 'skomentował(a) Twój wpis',
'mentionedYou' => 'wspomniał(a) o Tobie.', 'mentionedYou' => 'wspomniał(a) o Tobie.',
'shared' => 'udostępnił(a) Twój wpis.',
]; ];

4
resources/lang/pl/passwords.php
View file

@ -15,8 +15,8 @@ return [
'password' => 'Hasło musi składać się z przynajmniej 6 znaków i być równe powtórzonemu.', 'password' => 'Hasło musi składać się z przynajmniej 6 znaków i być równe powtórzonemu.',
'reset' => 'Twoje hasło zostało zresetowane!', 'reset' => 'Twoje hasło zostało zresetowane!',
'sent' => 'Wysłaliśmy Ci link resetujący hasło mailem!', 'sent' => 'Jeżeli ten adres e-mail jest obecny w naszej bazie danych, otrzymasz wiadomość z odnośnikiem resetowania hasła w ciągu kilku minut. Jeżeli nie dostałeś(-aś) tego maila, sprawdź zawartość folderu Spam.',
'token' => 'This password reset token is invalid.', 'token' => 'This password reset token is invalid.',
'user' => 'Nie znaleziono użytkownika z tym adresem e-mail.', 'user' => 'Jeżeli ten adres e-mail jest obecny w naszej bazie danych, otrzymasz wiadomość z odnośnikiem resetowania hasła w ciągu kilku minut. Jeżeli nie dostałeś(-aś) tego maila, sprawdź zawartość folderu Spam.',
]; ];

13
resources/lang/pl/profile.php
View file

@ -1,9 +1,12 @@
<?php <?php
return [ return [
'emptyTimeline' => 'Ten użytkownik nie opublikował jeszcze niczego!', 'emptyTimeline' => 'Ten użytkownik nie opublikował jeszcze niczego!',
'emptyFollowers' => 'Nikt nie obserwuje tego użytkownika!', 'emptyFollowers' => 'Nikt nie obserwuje tego użytkownika!',
'emptyFollowing' => 'Ten użytkownik nie obserwuje nikogo!', 'emptyFollowing' => 'Ten użytkownik nie obserwuje nikogo!',
'emptySaved' => 'Nie zapisałeś(-aś) jeszcze niczego!', 'emptySaved' => 'Nie zapisałeś(-aś) jeszcze niczego!',
'savedWarning' => 'Tylko Ty widzisz to, co zapisałeś(-aś)', 'savedWarning' => 'Tylko Ty widzisz to, co zapisałeś(-aś)',
'privateProfileWarning' => 'To konto jest prywatne',
'alreadyFollow' => 'Już obserwujesz :username?',
'loginToSeeProfile' => 'aby zobaczyć zdjęcia i filmy tego użytkownika.',
]; ];

16
resources/lang/pl/site.php Normal file
View file

@ -0,0 +1,16 @@
<?php
return [
'about' => 'O nas',
'help' => 'Pomoc',
'language' => 'Język',
'fediverse' => 'Fediwersum',
'opensource' => 'Otwarte źródło',
'terms' => 'Zasady',
'privacy' => 'Prywatność',
'l10nWip' => 'Wciąż pracujemy nad obsługą wielu języków',
'currentLocale' => 'Obecny język',
'selectLocale' => 'Wybierz jeden z dostępnych języków',
];

10
resources/views/admin/settings/system.blade.php
View file

@ -32,8 +32,8 @@
<p class="font-weight-ultralight h2 mb-0 text-truncate">{{$sys['php']}}</p> <p class="font-weight-ultralight h2 mb-0 text-truncate">{{$sys['php']}}</p>
</div> </div>
<div class="card-footer font-weight-bold py-0 text-center bg-white">PHP</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="col-12 col-md-3">
<div class="card mb-3 border-left-blue"> <div class="card mb-3 border-left-blue">
<div class="card-body text-center"> <div class="card-body text-center">
@ -48,9 +48,9 @@
<div> <div>
<div class="card-loading text-center"> <div class="card-loading text-center">
<div class="spinner-border" role="status"> <div class="spinner-border" role="status">
<span class="sr-only">Loading...</span> <span class="sr-only">Loading…</span>
</div> </div>
</div> </div>
<div class="card card-release d-none"> <div class="card card-release d-none">
<div class="card-body"> <div class="card-body">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -112,4 +112,4 @@ $(document).ready(function() {
}); });
</script> </script>
@endpush @endpush

2
resources/views/site/language.blade.php
View file

@ -11,7 +11,7 @@
<p class="font-weight-light">{{__('site.selectLocale')}}:</p> <p class="font-weight-light">{{__('site.selectLocale')}}:</p>
<ul class="list-group"> <ul class="list-group">
@foreach(App\Util\Localization\Localization::languages() as $lang) @foreach(App\Util\Localization\Localization::languages() as $lang)
<a class="list-group-item font-weight-bold" href="/i/lang/{{$lang}}">{{locale_get_display_language($lang)}}</a> <a class="list-group-item font-weight-bold" href="/i/lang/{{$lang}}">{{locale_get_display_language($lang, $lang)}}</a>
@endforeach @endforeach
</ul> </ul>
@endsection @endsection

28
resources/views/status/compose.blade.php
View file

@ -13,7 +13,7 @@
<span class="font-weight-bold">Compose</span> <span class="font-weight-bold">Compose</span>
</p> </p>
</div> </div>
</div> </div>
</span> </span>
<div> <div>
<button class="btn btn-link text-muted" type="button" id="composeMenu"> <button class="btn btn-link text-muted" type="button" id="composeMenu">
@ -23,7 +23,7 @@
</div> </div>
<div class="card-body bg-light"> <div class="card-body bg-light">
<div class="composeLoader d-none text-center"> <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>
<div class="d-none preview-pagination"> <div class="d-none preview-pagination">
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
@ -37,14 +37,14 @@
</div> </div>
<div class="preview-thumbs"> <div class="preview-thumbs">
<div class="d-flex justify-content-center" style="overflow-x: auto;"> <div class="d-flex justify-content-center" style="overflow-x: auto;">
</div> </div>
</div> </div>
</div> </div>
<div class="preview row"></div> <div class="preview row"></div>
<div class="preview-meta mb-4 d-none form-inline"> <div class="preview-meta mb-4 d-none form-inline">
<div class="form-group"> <div class="form-group">
<div class="btn-group mr-3" role="group" aria-label="First 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="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> <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="row">
<div class="col-12 col-sm-2 px-0 text-center"> <div class="col-12 col-sm-2 px-0 text-center">
<i class="fas fa-globe"></i> <i class="fas fa-globe"></i>
</div> </div>
<div class="col-12 col-sm-10 pl-2"> <div class="col-12 col-sm-10 pl-2">
<p class="font-weight-bold mb-0">Public</p> <p class="font-weight-bold mb-0">Public</p>
<p class="small mb-0">Anyone can see</p> <p class="small mb-0">Anyone can see</p>
</div> </div>
</div> </div>
</a> </a>
<a class="dropdown-item" href="#" data-id="private" data-title="Followers Only"> <a class="dropdown-item" href="#" data-id="private" data-title="Followers Only">
<div class="row"> <div class="row">
<div class="col-12 col-sm-2 px-0 text-center"> <div class="col-12 col-sm-2 px-0 text-center">
<i class="fas fa-lock"></i> <i class="fas fa-lock"></i>
</div> </div>
<div class="col-12 col-sm-10 pl-2"> <div class="col-12 col-sm-10 pl-2">
<p class="font-weight-bold mb-0">Followers Only</p> <p class="font-weight-bold mb-0">Followers Only</p>
<p class="small mb-0">Only followers can see</p> <p class="small mb-0">Only followers can see</p>
</div> </div>
</div> </div>
</a> </a>
{{-- <a class="dropdown-item" href="#" data-id="direct" data-title="Direct Message"> {{-- <a class="dropdown-item" href="#" data-id="direct" data-title="Direct Message">
<div class="row"> <div class="row">
<div class="col-12 col-sm-2 px-0 text-center"> <div class="col-12 col-sm-2 px-0 text-center">
<i class="fas fa-envelope"></i> <i class="fas fa-envelope"></i>
</div> </div>
<div class="col-12 col-sm-10 pl-2"> <div class="col-12 col-sm-10 pl-2">
<p class="font-weight-bold mb-0">Direct Message</p> <p class="font-weight-bold mb-0">Direct Message</p>
<p class="small mb-0">Recipients only</p> <p class="small mb-0">Recipients only</p>
</div> </div>
</div> </div>
</a> --}} </a> --}}
</div> </div>
@ -280,7 +280,7 @@ pixelfed.uploader.loadMeta = function() {
if(pixelfed.uploader.ids.length > 1) { if(pixelfed.uploader.ids.length > 1) {
$('.next').removeClass('text-light'); $('.next').removeClass('text-light');
} }
} }
if(cursor > 1) { if(cursor > 1) {
$('.prev').removeClass('text-light'); $('.prev').removeClass('text-light');
if(pixelfed.uploader.ids.length > cursor) { if(pixelfed.uploader.ids.length > cursor) {
@ -490,14 +490,14 @@ $('.visibility .dropdown-item').on('click', function(e) {
}); });
el.addClass('active'); el.addClass('active');
$('#visibility').text(el.data('title')); $('#visibility').text(el.data('title'));
pixelfed.uploader.visibility = el.data('id'); pixelfed.uploader.visibility = el.data('id');
}); });
$('#composeMenu').on('click', function(e) { $('#composeMenu').on('click', function(e) {
e.preventDefault(); e.preventDefault();
swal( swal(
'Experimental Feature', 'Experimental Feature',
'We\'re still working on this feature.', 'We’re still working on this feature.',
'info' 'info'
); );
}); });
@ -526,4 +526,4 @@ $('#composeMenu').on('click', function(e) {
}); --}} }); --}}
</script> </script>
@endpush @endpush

4
resources/views/status/show/sidebar.blade.php
View file

@ -111,7 +111,7 @@
@csrf @csrf
<input type="hidden" name="item" value="{{$status->id}}"> <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> </form>
</div> </div>
</div> </div>