aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/boot/after_store.js6
-rw-r--r--src/components/follow_card/follow_card.js7
-rw-r--r--src/components/follow_card/follow_card.vue9
-rw-r--r--src/components/image_cropper/image_cropper.js18
-rw-r--r--src/components/image_cropper/image_cropper.vue7
-rw-r--r--src/components/remote_follow/remote_follow.js10
-rw-r--r--src/components/remote_follow/remote_follow.vue24
-rw-r--r--src/components/settings/settings.js20
-rw-r--r--src/components/settings/settings.vue22
-rw-r--r--src/components/user_card/user_card.js4
-rw-r--r--src/components/user_card/user_card.vue15
-rw-r--r--src/components/user_settings/user_settings.js8
-rw-r--r--src/i18n/en.json6
-rw-r--r--src/i18n/oc.json147
-rw-r--r--src/i18n/pt.json36
-rw-r--r--src/modules/instance.js6
-rw-r--r--src/services/version/version.service.js6
17 files changed, 293 insertions, 58 deletions
diff --git a/src/boot/after_store.js b/src/boot/after_store.js
index 0a4ec857..a5f8c978 100644
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@@ -203,6 +203,12 @@ const getNodeInfo = async ({ store }) => {
const suggestions = metadata.suggestions
store.dispatch('setInstanceOption', { name: 'suggestionsEnabled', value: suggestions.enabled })
store.dispatch('setInstanceOption', { name: 'suggestionsWeb', value: suggestions.web })
+
+ const software = data.software
+ store.dispatch('setInstanceOption', { name: 'backendVersion', value: software.version })
+
+ const frontendVersion = window.___pleromafe_commit_hash
+ store.dispatch('setInstanceOption', { name: 'frontendVersion', value: frontendVersion })
} else {
throw (res)
}
diff --git a/src/components/follow_card/follow_card.js b/src/components/follow_card/follow_card.js
index 425c9c3e..ac4e265a 100644
--- a/src/components/follow_card/follow_card.js
+++ b/src/components/follow_card/follow_card.js
@@ -1,4 +1,5 @@
import BasicUserCard from '../basic_user_card/basic_user_card.vue'
+import RemoteFollow from '../remote_follow/remote_follow.vue'
import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
const FollowCard = {
@@ -14,13 +15,17 @@ const FollowCard = {
}
},
components: {
- BasicUserCard
+ BasicUserCard,
+ RemoteFollow
},
computed: {
isMe () { return this.$store.state.users.currentUser.id === this.user.id },
following () { return this.updated ? this.updated.following : this.user.following },
showFollow () {
return !this.following || this.updated && !this.updated.following
+ },
+ loggedIn () {
+ return this.$store.state.users.currentUser
}
},
methods: {
diff --git a/src/components/follow_card/follow_card.vue b/src/components/follow_card/follow_card.vue
index 6cb064eb..9bd21cfd 100644
--- a/src/components/follow_card/follow_card.vue
+++ b/src/components/follow_card/follow_card.vue
@@ -4,9 +4,12 @@
<span class="faint" v-if="!noFollowsYou && user.follows_you">
{{ isMe ? $t('user_card.its_you') : $t('user_card.follows_you') }}
</span>
+ <div class="btn-follow" v-if="showFollow && !loggedIn">
+ <RemoteFollow :user="user" />
+ </div>
<button
- v-if="showFollow"
- class="btn btn-default"
+ v-if="showFollow && loggedIn"
+ class="btn btn-default btn-follow"
@click="followUser"
:disabled="inProgress"
:title="requestSent ? $t('user_card.follow_again') : ''"
@@ -44,7 +47,7 @@
flex-wrap: wrap;
line-height: 1.5em;
- .btn {
+ .btn-follow {
margin-top: 0.5em;
margin-left: auto;
width: 10em;
diff --git a/src/components/image_cropper/image_cropper.js b/src/components/image_cropper/image_cropper.js
index 49d51846..5ba8f04e 100644
--- a/src/components/image_cropper/image_cropper.js
+++ b/src/components/image_cropper/image_cropper.js
@@ -31,6 +31,9 @@ const ImageCropper = {
saveButtonLabel: {
type: String
},
+ saveWithoutCroppingButtonlabel: {
+ type: String
+ },
cancelButtonLabel: {
type: String
}
@@ -48,6 +51,9 @@ const ImageCropper = {
saveText () {
return this.saveButtonLabel || this.$t('image_cropper.save')
},
+ saveWithoutCroppingText () {
+ return this.saveWithoutCroppingButtonlabel || this.$t('image_cropper.save_without_cropping')
+ },
cancelText () {
return this.cancelButtonLabel || this.$t('image_cropper.cancel')
},
@@ -76,6 +82,18 @@ const ImageCropper = {
this.submitting = false
})
},
+ submitWithoutCropping () {
+ this.submitting = true
+ this.avatarUploadError = null
+ this.submitHandler(false, this.dataUrl)
+ .then(() => this.destroy())
+ .catch((err) => {
+ this.submitError = err
+ })
+ .finally(() => {
+ this.submitting = false
+ })
+ },
pickImage () {
this.$refs.input.click()
},
diff --git a/src/components/image_cropper/image_cropper.vue b/src/components/image_cropper/image_cropper.vue
index 24a6f3bd..129e6f46 100644
--- a/src/components/image_cropper/image_cropper.vue
+++ b/src/components/image_cropper/image_cropper.vue
@@ -7,6 +7,7 @@
<div class="image-cropper-buttons-wrapper">
<button class="btn" type="button" :disabled="submitting" @click="submit" v-text="saveText"></button>
<button class="btn" type="button" :disabled="submitting" @click="destroy" v-text="cancelText"></button>
+ <button class="btn" type="button" :disabled="submitting" @click="submitWithoutCropping" v-text="saveWithoutCroppingText"></button>
<i class="icon-spin4 animate-spin" v-if="submitting"></i>
</div>
<div class="alert error" v-if="submitError">
@@ -36,7 +37,11 @@
}
&-buttons-wrapper {
- margin-top: 15px;
+ margin-top: 10px;
+
+ button {
+ margin-top: 5px;
+ }
}
}
</style>
diff --git a/src/components/remote_follow/remote_follow.js b/src/components/remote_follow/remote_follow.js
new file mode 100644
index 00000000..461d58c9
--- /dev/null
+++ b/src/components/remote_follow/remote_follow.js
@@ -0,0 +1,10 @@
+export default {
+ props: [ 'user' ],
+ computed: {
+ subscribeUrl () {
+ // eslint-disable-next-line no-undef
+ const serverUrl = new URL(this.user.statusnet_profile_url)
+ return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
+ }
+ }
+}
diff --git a/src/components/remote_follow/remote_follow.vue b/src/components/remote_follow/remote_follow.vue
new file mode 100644
index 00000000..fb2147bd
--- /dev/null
+++ b/src/components/remote_follow/remote_follow.vue
@@ -0,0 +1,24 @@
+<template>
+ <div class="remote-follow">
+ <form method="POST" :action='subscribeUrl'>
+ <input type="hidden" name="nickname" :value="user.screen_name">
+ <input type="hidden" name="profile" value="">
+ <button click="submit" class="remote-button">
+ {{ $t('user_card.remote_follow') }}
+ </button>
+ </form>
+ </div>
+</template>
+
+<script src="./remote_follow.js"></script>
+
+<style lang="scss">
+.remote-follow {
+ max-width: 220px;
+
+ .remote-button {
+ width: 100%;
+ min-height: 28px;
+ }
+}
+</style>
diff --git a/src/components/settings/settings.js b/src/components/settings/settings.js
index 979457a5..b77c5197 100644
--- a/src/components/settings/settings.js
+++ b/src/components/settings/settings.js
@@ -1,8 +1,13 @@
/* eslint-env browser */
+import { filter, trim } from 'lodash'
+
import TabSwitcher from '../tab_switcher/tab_switcher.js'
import StyleSwitcher from '../style_switcher/style_switcher.vue'
import InterfaceLanguageSwitcher from '../interface_language_switcher/interface_language_switcher.vue'
-import { filter, trim } from 'lodash'
+import { extractCommit } from '../../services/version/version.service'
+
+const pleromaFeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma-fe/commit/'
+const pleromaBeCommitUrl = 'https://git.pleroma.social/pleroma/pleroma/commit/'
const settings = {
data () {
@@ -78,7 +83,10 @@ const settings = {
// Future spec, still not supported in Nightly 63 as of 08/2018
Object.getOwnPropertyDescriptor(HTMLMediaElement.prototype, 'audioTracks'),
playVideosInModal: user.playVideosInModal,
- useContainFit: user.useContainFit
+ useContainFit: user.useContainFit,
+
+ backendVersion: instance.backendVersion,
+ frontendVersion: instance.frontendVersion
}
},
components: {
@@ -96,7 +104,13 @@ const settings = {
postFormats () {
return this.$store.state.instance.postFormats || []
},
- instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel }
+ instanceSpecificPanelPresent () { return this.$store.state.instance.showInstanceSpecificPanel },
+ frontendVersionLink () {
+ return pleromaFeCommitUrl + this.frontendVersion
+ },
+ backendVersionLink () {
+ return pleromaBeCommitUrl + extractCommit(this.backendVersion)
+ }
},
watch: {
hideAttachmentsLocal (value) {
diff --git a/src/components/settings/settings.vue b/src/components/settings/settings.vue
index d2346747..17f1f1a1 100644
--- a/src/components/settings/settings.vue
+++ b/src/components/settings/settings.vue
@@ -261,6 +261,28 @@
</div>
</div>
</div>
+ <div :label="$t('settings.version.title')" >
+ <div class="setting-item">
+ <ul class="setting-list">
+ <li>
+ <p>{{$t('settings.version.backend_version')}}</p>
+ <ul class="option-list">
+ <li>
+ <a :href="backendVersionLink" target="_blank">{{backendVersion}}</a>
+ </li>
+ </ul>
+ </li>
+ <li>
+ <p>{{$t('settings.version.frontend_version')}}</p>
+ <ul class="option-list">
+ <li>
+ <a :href="frontendVersionLink" target="_blank">{{frontendVersion}}</a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </div>
+ </div>
</tab-switcher>
</keep-alive>
</div>
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index 43a77f45..b07da675 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -1,4 +1,5 @@
import UserAvatar from '../user_avatar/user_avatar.vue'
+import RemoteFollow from '../remote_follow/remote_follow.vue'
import { hex2rgb } from '../../services/color_convert/color_convert.js'
import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate'
import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator'
@@ -99,7 +100,8 @@ export default {
}
},
components: {
- UserAvatar
+ UserAvatar,
+ RemoteFollow
},
methods: {
followUser () {
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index 690e1bde..f4114e6e 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -84,14 +84,8 @@
</button>
</span>
</div>
- <div class="remote-follow" v-if='!loggedIn && user.is_local'>
- <form method="POST" :action='subscribeUrl'>
- <input type="hidden" name="nickname" :value="user.screen_name">
- <input type="hidden" name="profile" value="">
- <button click="submit" class="remote-button">
- {{ $t('user_card.remote_follow') }}
- </button>
- </form>
+ <div v-if='!loggedIn && user.is_local'>
+ <RemoteFollow :user="user" />
</div>
<div class='block' v-if='isOtherUser && loggedIn'>
<span v-if='user.statusnet_blocking'>
@@ -375,11 +369,6 @@
min-height: 28px;
}
- .remote-follow {
- max-width: 220px;
- min-height: 28px;
- }
-
.follow {
max-width: 220px;
min-height: 28px;
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index c0ab759c..72e7bb53 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -158,7 +158,13 @@ const UserSettings = {
reader.readAsDataURL(file)
},
submitAvatar (cropper, file) {
- const img = cropper.getCroppedCanvas().toDataURL(file.type)
+ let img
+ if (cropper) {
+ img = cropper.getCroppedCanvas().toDataURL(file.type)
+ } else {
+ img = file
+ }
+
return this.$store.state.api.backendInteractor.updateAvatar({ params: { img } }).then((user) => {
if (!user.error) {
this.$store.commit('addNewUsers', [user])
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 01fe2fba..68503f99 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -25,6 +25,7 @@
"image_cropper": {
"crop_picture": "Crop picture",
"save": "Save",
+ "save_without_cropping": "Save without cropping",
"cancel": "Cancel"
},
"login": {
@@ -347,6 +348,11 @@
"checkbox": "I have skimmed over terms and conditions",
"link": "a nice lil' link"
}
+ },
+ "version": {
+ "title": "Version",
+ "backend_version": "Backend Version",
+ "frontend_version": "Frontend Version"
}
},
"timeline": {
diff --git a/src/i18n/oc.json b/src/i18n/oc.json
index baac3d25..ecc4df61 100644
--- a/src/i18n/oc.json
+++ b/src/i18n/oc.json
@@ -59,19 +59,21 @@
"broken_favorite": "Estatut desconegut, sèm a lo cercar...",
"favorited_you": "a aimat vòstre estatut",
"followed_you": "vos a seguit",
- "load_older": "Cargar las notificaciones mai ancianas",
+ "load_older": "Cargar las notificacions mai ancianas",
"notifications": "Notficacions",
- "read": "Legit !",
+ "read": "Legit !",
"repeated_you": "a repetit vòstre estatut",
"no_more_notifications": "Pas mai de notificacions"
},
"post_status": {
"new_status": "Publicar d’estatuts novèls",
- "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu'a vòstres seguidors.",
+ "account_not_locked_warning": "Vòstre compte es pas {0}. Qual que siá pòt vos seguir per veire vòstras publicacions destinadas pas qu’a vòstres seguidors.",
"account_not_locked_warning_link": "clavat",
"attachments_sensitive": "Marcar las pèças juntas coma sensiblas",
"content_type": {
- "text/plain": "Tèxte brut"
+ "text/plain": "Tèxte brut",
+ "text/html": "HTML",
+ "text/markdown": "Markdown"
},
"content_warning": "Avís de contengut (opcional)",
"default": "Escrivètz aquí vòstre estatut.",
@@ -118,12 +120,12 @@
"blocks_tab": "Blocatges",
"btnRadius": "Botons",
"cBlue": "Blau (Respondre, seguir)",
- "cGreen": "Verd (Repartajar)",
+ "cGreen": "Verd (Repertir)",
"cOrange": "Irange (Aimar)",
"cRed": "Roge (Anullar)",
"change_password": "Cambiar lo senhal",
"change_password_error": "Una error s’es producha en cambiant lo senhal.",
- "changed_password": "Senhal corrèctament cambiat !",
+ "changed_password": "Senhal corrèctament cambiat !",
"collapse_subject": "Replegar las publicacions amb de subjèctes",
"composing": "Escritura",
"confirm_new_password": "Confirmatz lo nòu senhal",
@@ -134,7 +136,7 @@
"default_vis": "Nivèl de visibilitat per defaut",
"delete_account": "Suprimir lo compte",
"delete_account_description": "Suprimir vòstre compte e los messatges per sempre.",
- "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrador d’instància.",
+ "delete_account_error": "Una error s’es producha en suprimir lo compte. S’aquò ten d’arribar mercés de contactar vòstre administrator d’instància.",
"delete_account_instructions": "Picatz vòstre senhal dins lo camp tèxte çai-jos per confirmar la supression del compte.",
"avatar_size_instruction": "La talha minimum recomandada pels imatges d’avatar es 150x150 pixèls.",
"export_theme": "Enregistrar la preconfiguracion",
@@ -154,14 +156,14 @@
"hide_isp": "Amagar lo panèl especial instància",
"preload_images": "Precargar los imatges",
"use_one_click_nsfw": "Dobrir las pèças juntas NSFW amb un clic",
- "hide_post_stats": "Amagar los estatistics de publicacion (ex. lo ombre de favorits)",
+ "hide_post_stats": "Amagar las estatisticas de publicacion (ex. lo nombre de favorits)",
"hide_user_stats": "Amagar las estatisticas de l’utilizaire (ex. lo nombre de seguidors)",
"hide_filtered_statuses": "Amagar los estatuts filtrats",
"import_followers_from_a_csv_file": "Importar los seguidors d’un fichièr csv",
"import_theme": "Cargar un tèma",
"inputRadius": "Camps tèxte",
"checkboxRadius": "Casas de marcar",
- "instance_default": "(defaut : {value})",
+ "instance_default": "(defaut : {value})",
"instance_default_simple": "(defaut)",
"interface": "Interfàcia",
"interfaceLanguage": "Lenga de l’interfàcia",
@@ -172,7 +174,7 @@
"loop_video": "Bocla vidèo",
"loop_video_silent_only": "Legir en bocla solament las vidèos sens son (coma los « Gifs » de Mastodon)",
"mutes_tab": "Agamats",
- "play_videos_in_modal": "Legir las vidèoas dirèctament dins la visualizaira mèdia",
+ "play_videos_in_modal": "Legir las vidèos dirèctament dins la visualizaira mèdia",
"use_contain_fit": "Talhar pas las pèças juntas per las vinhetas",
"name": "Nom",
"name_bio": "Nom & Bio",
@@ -223,7 +225,7 @@
"post_status_content_type": "Publicar lo tipe de contengut dels estatuts",
"stop_gifs": "Lançar los GIFs al subrevòl",
"streaming": "Activar lo cargament automatic dels novèls estatus en anar amont",
- "text": "Tèxt",
+ "text": "Tèxte",
"theme": "Tèma",
"theme_help_v2_1": "You can also override certain component's colors and opacity by toggling the checkbox, use \"Clear all\" button to clear all overrides.",
"theme_help_v2_2": "Icons underneath some entries are background/text contrast indicators, hover over for detailed info. Please keep in mind that when using transparency contrast indicators show the worst possible case.",
@@ -234,6 +236,117 @@
"values": {
"false": "non",
"true": "òc"
+ },
+ "notifications": "Notificacions",
+ "enable_web_push_notifications": "Activar las notificacions web push",
+ "style": {
+ "switcher": {
+ "keep_color": "Gardar las colors",
+ "keep_shadows": "Gardar las ombras",
+ "keep_opacity": "Gardar l’opacitat",
+ "keep_roundness": "Gardar la redondetat",
+ "keep_fonts": "Gardar las polissas",
+ "save_load_hint": "Las opcions « Gardar » permeton de servar las opcions configuradas actualament quand seleccionatz o cargatz un tèma, permeton tanben d’enregistrar aquelas opcions quand exportatz un tèma. Quand totas las casas son pas marcadas, l’exportacion de tèma o enregistrarà tot.",
+ "reset": "Restablir",
+ "clear_all": "O escafar tot",
+ "clear_opacity": "Escafar l’opacitat"
+ },
+ "common": {
+ "color": "Color",
+ "opacity": "Opacitat",
+ "contrast": {
+ "hint": "Lo coeficient de contraste es de {ratio}. Dòna {level} {context}",
+ "level": {
+ "aa": "un nivèl AA minimum recomandat",
+ "aaa": "un nivèl AAA recomandat",
+ "bad": "pas un nivèl d’accessibilitat recomandat"
+ },
+ "context": {
+ "18pt": "pel tèxte grand (18pt+)",
+ "text": "pel tèxte"
+ }
+ }
+ },
+ "common_colors": {
+ "_tab_label": "Comun",
+ "main": "Colors comunas",
+ "foreground_hint": "Vejatz « Avançat » per mai de paramètres detalhats",
+ "rgbo": "Icònas, accents, badges"
+ },
+ "advanced_colors": {
+ "_tab_label": "Avançat",
+ "alert": "Rèire plan d’alèrtas",
+ "alert_error": "Error",
+ "badge": "Rèire plan dels badges",
+ "badge_notification": "Notificacion",
+ "panel_header": "Bandièra del tablèu de bòrd",
+ "top_bar": "Barra amont",
+ "borders": "Caires",
+ "buttons": "Botons",
+ "inputs": "Camps tèxte",
+ "faint_text": "Tèxte descolorit"
+ },
+ "radii": {
+ "_tab_label": "Redondetat"
+ },
+ "shadows": {
+ "_tab_label": "Ombra e luminositat",
+ "component": "Compausant",
+ "override": "Subrecargar",
+ "shadow_id": "Ombra #{value}",
+ "blur": "Fosc",
+ "spread": "Espandiment",
+ "inset": "Incrustacion",
+ "hint": "Per las ombras podètz tanben utilizar --variable coma valor de color per emplegar una variable CSS3. Notatz que lo paramètre d’opacitat foncionarà pas dins aquel cas.",
+ "filter_hint": {
+ "always_drop_shadow": "Avertiment, aquel ombra utiliza totjorn {0} quand lo navigator es compatible.",
+ "drop_shadow_syntax": "{0} es pas compatible amb lo paramètre {1} e lo mot clau {2}.",
+ "avatar_inset": "Notatz que combinar d’ombras incrustadas e pas incrustadas pòt donar de resultats inesperats amb los avatars transparents.",
+ "spread_zero": "L’ombra amb un espandiment de > 0 apareisserà coma reglat a zèro",
+ "inset_classic": "L’ombra d’incrustacion utilizarà {0}"
+ },
+ "components": {
+ "panel": "Tablèu",
+ "panelHeader": "Bandièra del tablèu",
+ "topBar": "Barra amont",
+ "avatar": "Utilizar l’avatar (vista perfil)",
+ "avatarStatus": "Avatar de l’utilizaire (afichatge publicacion)",
+ "popup": "Fenèstras sorgissentas e astúcias",
+ "button": "Boton",
+ "buttonHover": "Boton (en passar la mirga)",
+ "buttonPressed": "Boton (en quichar)",
+ "buttonPressedHover": "Boton (en quichar e passar)",
+ "input": "Camp tèxte"
+ }
+ },
+ "fonts": {
+ "_tab_label": "Polissas",
+ "help": "Selecionatz la polissa d’utilizar pels elements de l’UI. Per « Personalizada » vos cal picar lo nom exacte tal coma apareis sul sistèma.",
+ "components": {
+ "interface": "Interfàcia",
+ "input": "Camps tèxte",
+ "post": "Tèxte de publicacion",
+ "postCode": "Tèxte Monospaced dins las publicacion (tèxte formatat)"
+ },
+ "family": "Nom de la polissa",
+ "size": "Talha (en px)",
+ "weight": "Largor (gras)",
+ "custom": "Personalizada"
+ },
+ "preview": {
+ "header": "Apercebut",
+ "content": "Contengut",
+ "error": "Error d’exemple",
+ "button": "Boton",
+ "text": "A tròç de mai de {0} e {1}",
+ "mono": "contengut",
+ "input": "arribada al país.",
+ "faint_link": "manual d’ajuda",
+ "fine_print": "Legissètz nòstre {0} per legir pas res d’util !",
+ "header_faint": "Va plan",
+ "checkbox": "Ai legit los tèrmes e condicions d’utilizacion",
+ "link": "un pichon ligam simpatic"
+ }
}
},
"timeline": {
@@ -241,19 +354,21 @@
"conversation": "Conversacion",
"error_fetching": "Error en cercant de mesas a jorn",
"load_older": "Ne veire mai",
+ "no_retweet_hint": "Las publicacions marcadas pels seguidors solament o dirèctas se pòdon pas repetir",
"repeated": "repetit",
"show_new": "Ne veire mai",
"up_to_date": "A jorn",
- "no_retweet_hint": "La publicacion marcada coma pels seguidors solament o dirècte pòt pas èsser repetida"
+ "no_more_statuses": "Pas mai d’estatuts",
+ "no_statuses": "Cap d’estatuts"
},
"status": {
- "reply_to": "Respondre à",
+ "reply_to": "Respond a",
"replies_list": "Responsas :"
},
"user_card": {
"approve": "Validar",
"block": "Blocar",
- "blocked": "Blocat !",
+ "blocked": "Blocat !",
"deny": "Refusar",
"favorites": "Favorits",
"follow": "Seguir",
@@ -263,8 +378,8 @@
"follow_unfollow": "Quitar de seguir",
"followees": "Abonaments",
"followers": "Seguidors",
- "following": "Seguit !",
- "follows_you": "Vos sèc !",
+ "following": "Seguit !",
+ "follows_you": "Vos sèc !",
"its_you": "Sètz vos !",
"media": "Mèdia",
"mute": "Amagar",
diff --git a/src/i18n/pt.json b/src/i18n/pt.json
index 29ab995b..41a34483 100644
--- a/src/i18n/pt.json
+++ b/src/i18n/pt.json
@@ -51,7 +51,7 @@
"public_tl": "Linha do tempo pública",
"timeline": "Linha do tempo",
"twkn": "Toda a rede conhecida",
- "user_search": "Busca de usuário",
+ "user_search": "Buscar usuários",
"who_to_follow": "Quem seguir",
"preferences": "Preferências"
},
@@ -67,8 +67,8 @@
},
"post_status": {
"new_status": "Postar novo status",
- "account_not_locked_warning": "Sua conta não está {0}. Qualquer pessoa pode te seguir para ver seus posts restritos.",
- "account_not_locked_warning_link": "fechada",
+ "account_not_locked_warning": "Sua conta não é {0}. Qualquer pessoa pode te seguir e ver seus posts privados (só para seguidores).",
+ "account_not_locked_warning_link": "restrita",
"attachments_sensitive": "Marcar anexos como sensíveis",
"content_type": {
"text/plain": "Texto puro"
@@ -115,7 +115,7 @@
"avatarRadius": "Avatares",
"background": "Pano de Fundo",
"bio": "Biografia",
- "blocks_tab": "Blocos",
+ "blocks_tab": "Bloqueios",
"btnRadius": "Botões",
"cBlue": "Azul (Responder, seguir)",
"cGreen": "Verde (Repetir)",
@@ -125,7 +125,7 @@
"change_password_error": "Houve um erro ao modificar sua senha.",
"changed_password": "Senha modificada com sucesso!",
"collapse_subject": "Esconder posts com assunto",
- "composing": "Escrevendo",
+ "composing": "Escrita",
"confirm_new_password": "Confirmar nova senha",
"current_avatar": "Seu avatar atual",
"current_password": "Sua senha atual",
@@ -139,7 +139,7 @@
"avatar_size_instruction": "O tamanho mínimo recomendado para imagens de avatar é 150x150 pixels.",
"export_theme": "Salvar predefinições",
"filtering": "Filtragem",
- "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas, uma por linha.",
+ "filtering_explanation": "Todas as postagens contendo estas palavras serão silenciadas; uma palavra por linha.",
"follow_export": "Exportar quem você segue",
"follow_export_button": "Exportar quem você segue para um arquivo CSV",
"follow_export_processing": "Processando. Em breve você receberá a solicitação de download do arquivo",
@@ -178,7 +178,7 @@
"name_bio": "Nome & Biografia",
"new_password": "Nova senha",
"notification_visibility": "Tipos de notificação para mostrar",
- "notification_visibility_follows": "Seguidos",
+ "notification_visibility_follows": "Seguidas",
"notification_visibility_likes": "Favoritos",
"notification_visibility_mentions": "Menções",
"notification_visibility_repeats": "Repetições",
@@ -187,7 +187,7 @@
"no_mutes": "Sem silenciados",
"hide_follows_description": "Não mostrar quem estou seguindo",
"hide_followers_description": "Não mostrar quem me segue",
- "show_admin_badge": "Mostrar distintivo de Administrador em meu perfil",
+ "show_admin_badge": "Mostrar título de Administrador em meu perfil",
"show_moderator_badge": "Mostrar título de Moderador em meu perfil",
"nsfw_clickthrough": "Habilitar clique para ocultar anexos sensíveis",
"oauth_tokens": "Token OAuth",
@@ -201,9 +201,9 @@
"profile_background": "Pano de fundo de perfil",
"profile_banner": "Capa de perfil",
"profile_tab": "Perfil",
- "radii_help": "Arredondar arestas da interface (em píxeis)",
+ "radii_help": "Arredondar arestas da interface (em pixel)",
"replies_in_timeline": "Respostas na linha do tempo",
- "reply_link_preview": "Habilitar a pré-visualização de link de respostas ao passar o mouse.",
+ "reply_link_preview": "Habilitar a pré-visualização de de respostas ao passar o mouse.",
"reply_visibility_all": "Mostrar todas as respostas",
"reply_visibility_following": "Só mostrar respostas direcionadas a mim ou a usuários que sigo",
"reply_visibility_self": "Só mostrar respostas direcionadas a mim",
@@ -212,7 +212,7 @@
"security_tab": "Segurança",
"scope_copy": "Copiar opções de privacidade ao responder (Mensagens diretas sempre copiam)",
"set_new_avatar": "Alterar avatar",
- "set_new_profile_background": "Alterar o plano de fundo de perfil",
+ "set_new_profile_background": "Alterar o pano de fundo de perfil",
"set_new_profile_banner": "Alterar capa de perfil",
"settings": "Configurações",
"subject_input_always_show": "Sempre mostrar campo de assunto",
@@ -220,9 +220,9 @@
"subject_line_email": "Como em email: \"re: assunto\"",
"subject_line_mastodon": "Como o Mastodon: copiar como está",
"subject_line_noop": "Não copiar",
- "post_status_content_type": "Postar tipo de conteúdo do status",
- "stop_gifs": "Reproduzir GIFs ao passar o cursor em cima",
- "streaming": "Habilitar o fluxo automático de postagens quando ao topo da página",
+ "post_status_content_type": "Tipo de conteúdo do status",
+ "stop_gifs": "Reproduzir GIFs ao passar o cursor",
+ "streaming": "Habilitar o fluxo automático de postagens no topo da página",
"text": "Texto",
"theme": "Tema",
"theme_help": "Use cores em código hexadecimal (#rrggbb) para personalizar seu esquema de cores.",
@@ -235,7 +235,7 @@
"false": "não",
"true": "sim"
},
- "notifications": "Notifications",
+ "notifications": "Notificações",
"enable_web_push_notifications": "Habilitar notificações web push",
"style": {
"switcher": {
@@ -245,7 +245,7 @@
"keep_roundness": "Manter arredondado",
"keep_fonts": "Manter fontes",
"save_load_hint": "Manter as opções preserva as opções atuais ao selecionar ou carregar temas; também salva as opções ao exportar um tempo. Quanto todos os campos estiverem desmarcados, tudo será salvo ao exportar o tema.",
- "reset": "Voltar ao padrão",
+ "reset": "Restaurar o padrão",
"clear_all": "Limpar tudo",
"clear_opacity": "Limpar opacidade"
},
@@ -319,7 +319,7 @@
},
"fonts": {
"_tab_label": "Fontes",
- "help": "Selecionar fonte dos elementos da interface. Para fonte \"personalizada\" você deve entrar exatamente o nome da fonte no sistema.",
+ "help": "Selecione as fontes dos elementos da interface. Para fonte \"personalizada\" você deve inserir o mesmo nome da fonte no sistema.",
"components": {
"interface": "Interface",
"input": "Campo de entrada",
@@ -383,7 +383,7 @@
"mute": "Silenciar",
"muted": "Silenciado",
"per_day": "por dia",
- "remote_follow": "Seguidor Remoto",
+ "remote_follow": "Seguir remotamente",
"statuses": "Postagens",
"unblock": "Desbloquear",
"unblock_progress": "Desbloqueando...",
diff --git a/src/modules/instance.js b/src/modules/instance.js
index 24c52f9c..155aa2eb 100644
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@@ -48,7 +48,11 @@ const defaultState = {
// Html stuff
instanceSpecificPanelContent: '',
- tos: ''
+ tos: '',
+
+ // Version Information
+ backendVersion: '',
+ frontendVersion: ''
}
const instance = {
diff --git a/src/services/version/version.service.js b/src/services/version/version.service.js
new file mode 100644
index 00000000..a750b0dd
--- /dev/null
+++ b/src/services/version/version.service.js
@@ -0,0 +1,6 @@
+
+export const extractCommit = versionString => {
+ const regex = /-g(\w+)$/i
+ const matches = versionString.match(regex)
+ return matches ? matches[1] : ''
+}
generated by cgit v1.2.3-70-g09d2 (git 2.49.0) at 2025-11-11 15:06:16 +0000