diff options
| -rw-r--r-- | CONTRIBUTORS.md | 5 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/components/delete_button/delete_button.js | 2 | ||||
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 2 | ||||
| -rw-r--r-- | src/i18n/messages.js | 16 | ||||
| -rw-r--r-- | static/aurora_borealis.jpg | bin | 0 -> 642707 bytes | |||
| -rw-r--r-- | static/bg2.jpg (renamed from static/bg.jpg) | bin | 229574 -> 229574 bytes | |||
| -rw-r--r-- | static/config.json | 2 |
8 files changed, 20 insertions, 9 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 1bfe3179..3673b8b7 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -4,6 +4,7 @@ Contributors of this project. - Coco Snuss (cocosnuss@social.heldscal.la): Code - wakarimasen (wakarimasen@shitposter.club): NSFW hiding image - dtluna (dtluna@social.heldscal.la): Code -- sonyam (sonyam@social.heldscal.la): Default background image +- sonyam (sonyam@social.heldscal.la): Background images - hakui (hakui@freezepeach.xyz): CSS and styling -- shpuld (shpuld@shitposter.club): CSS and styling
\ No newline at end of file +- shpuld (shpuld@shitposter.club): CSS and styling +- Vincent Guth (https://unsplash.com/photos/XrwVIFy6rTw): Background images. @@ -6,7 +6,7 @@ # For Translators -To translate Pleroma, add your language to i18n/messages.js. Pleroma will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js. +To translate Pleroma, add your language to [src/i18n/messages.js](https://git.pleroma.social/pleroma/pleroma-fe/blob/develop/src/i18n/messages.js). Pleroma will set your language by your browser locale, but you can temporarily force it in the code by changing the locale in main.js. # FOR ADMINS diff --git a/src/components/delete_button/delete_button.js b/src/components/delete_button/delete_button.js index 77da1b87..f2920666 100644 --- a/src/components/delete_button/delete_button.js +++ b/src/components/delete_button/delete_button.js @@ -10,7 +10,7 @@ const DeleteButton = { }, computed: { currentUser () { return this.$store.state.users.currentUser }, - canDelete () { return this.currentUser.rights.delete_others_notice || this.status.user.id === this.currentUser.id } + canDelete () { return this.currentUser && this.currentUser.rights.delete_others_notice || this.status.user.id === this.currentUser.id } } } diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index ec90b8b0..359abfef 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -3,7 +3,7 @@ <div v-if="user" class="user-profile panel panel-default base00-background"> <user-card-content :user="user" :switcher="true"></user-card-content> </div> - <Timeline :title="'User Timeline'" v-bind:timeline="timeline" v-bind:timeline-name="'user'" :user-id="userId"/> + <Timeline :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/> </div> </template> diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 48708539..abf64607 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -20,7 +20,8 @@ const de = { muted: 'Stummgeschaltet', followers: 'Folgende', followees: 'Folgt', - per_day: 'pro Tag' + per_day: 'pro Tag', + remote_follow: 'Remote Follow' }, timeline: { show_new: 'Zeige Neuere', @@ -53,9 +54,9 @@ const de = { filtering: 'Filter', filtering_explanation: 'Alle Beiträge die diese Wörter enthalten werden ausgeblendet. Ein Wort pro Zeile.', attachments: 'Anhänge', - hide_attachments_in_tl: 'Anhänge in der Timeline ausblenden', + hide_attachments_in_tl: 'Anhänge in der Zeitleiste ausblenden', hide_attachments_in_convo: 'Anhänge in Unterhaltungen ausblenden', - nsfw_clickthrough: 'Aktiviere ausblendbares Overlay für als NSFW markierte Anhänge', + nsfw_clickthrough: 'Aktiviere ausblendbares Overlay für Anhänge, die als NSFW markiert sind', autoload: 'Aktiviere automatisches Laden von älteren Beiträgen beim scrollen', streaming: 'Aktiviere automatisches Laden (Streaming) von neuen Beiträgen', reply_link_preview: 'Aktiviere reply-link Vorschau bei Maus-Hover', @@ -94,6 +95,9 @@ const de = { general: { submit: 'Absenden', apply: 'Anwenden' + }, + user_profile: { + timeline_title: 'Beiträge' } } @@ -284,6 +288,9 @@ const en = { general: { submit: 'Submit', apply: 'Apply' + }, + user_profile: { + timeline_title: 'User Timeline' } } @@ -1137,6 +1144,9 @@ const ru = { general: { submit: 'Отправить', apply: 'Применить' + }, + user_profile: { + timeline_title: 'Лента пользователя' } } diff --git a/static/aurora_borealis.jpg b/static/aurora_borealis.jpg Binary files differnew file mode 100644 index 00000000..b6a0daf9 --- /dev/null +++ b/static/aurora_borealis.jpg diff --git a/static/bg.jpg b/static/bg2.jpg Binary files differindex 60e2311a..60e2311a 100644 --- a/static/bg.jpg +++ b/static/bg2.jpg diff --git a/static/config.json b/static/config.json index 6c9c27da..9863ec02 100644 --- a/static/config.json +++ b/static/config.json @@ -1,6 +1,6 @@ { "theme": "pleroma-dark", - "background": "/static/bg.jpg", + "background": "/static/aurora_borealis.jpg", "logo": "/static/logo.png", "defaultPath": "/main/all", "chatDisabled": false, |
