mirror of
https://github.com/Ocelot-Social-Community/Ocelot-Social.git
synced 2025-12-13 07:46:06 +00:00
Merge remote-tracking branch 'origin/master' into 801_reset_password
This commit is contained in:
Robert Schäfer
commit
217c905800
@ -45,14 +45,14 @@
|
||||
"activitystrea.ms": "~2.1.3",
|
||||
"apollo-cache-inmemory": "~1.6.2",
|
||||
"apollo-client": "~2.6.2",
|
||||
"apollo-link-context": "~1.0.14",
|
||||
"apollo-link-http": "~1.5.14",
|
||||
"apollo-link-context": "~1.0.18",
|
||||
"apollo-link-http": "~1.5.15",
|
||||
"apollo-server": "~2.6.3",
|
||||
"bcryptjs": "~2.4.3",
|
||||
"cheerio": "~1.0.0-rc.3",
|
||||
"cors": "~2.8.5",
|
||||
"cross-env": "~5.2.0",
|
||||
"date-fns": "2.0.0-alpha.33",
|
||||
"date-fns": "2.0.0-alpha.34",
|
||||
"debug": "~4.1.1",
|
||||
"dotenv": "~8.0.0",
|
||||
"express": "~4.17.1",
|
||||
@ -95,7 +95,7 @@
|
||||
"chai": "~4.2.0",
|
||||
"cucumber": "~5.1.0",
|
||||
"eslint": "~5.16.0",
|
||||
"eslint-config-prettier": "~4.3.0",
|
||||
"eslint-config-prettier": "~5.0.0",
|
||||
"eslint-config-standard": "~12.0.0",
|
||||
"eslint-plugin-import": "~2.17.3",
|
||||
"eslint-plugin-jest": "~22.6.4",
|
||||
|
||||
@ -1388,41 +1388,41 @@ apollo-graphql@^0.3.0:
|
||||
apollo-env "0.5.1"
|
||||
lodash.sortby "^4.7.0"
|
||||
|
||||
apollo-link-context@~1.0.14:
|
||||
version "1.0.17"
|
||||
resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.17.tgz#439272cfb43ec1891506dd175ed907845b7de36c"
|
||||
integrity sha512-W5UUfHcrrlP5uqJs5X1zbf84AMXhPZGAqX/7AQDgR6wY/7//sMGfJvm36KDkpIeSOElztGtM9z6zdPN1NbT41Q==
|
||||
apollo-link-context@~1.0.18:
|
||||
version "1.0.18"
|
||||
resolved "https://registry.yarnpkg.com/apollo-link-context/-/apollo-link-context-1.0.18.tgz#9e700e3314da8ded50057fee0a18af2bfcedbfc3"
|
||||
integrity sha512-aG5cbUp1zqOHHQjAJXG7n/izeMQ6LApd/whEF5z6qZp5ATvcyfSNkCfy3KRJMMZZ3iNfVTs6jF+IUA8Zvf+zeg==
|
||||
dependencies:
|
||||
apollo-link "^1.2.11"
|
||||
apollo-link "^1.2.12"
|
||||
tslib "^1.9.3"
|
||||
|
||||
apollo-link-http-common@^0.2.13:
|
||||
version "0.2.13"
|
||||
resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.13.tgz#c688f6baaffdc7b269b2db7ae89dae7c58b5b350"
|
||||
integrity sha512-Uyg1ECQpTTA691Fwx5e6Rc/6CPSu4TB4pQRTGIpwZ4l5JDOQ+812Wvi/e3IInmzOZpwx5YrrOfXrtN8BrsDXoA==
|
||||
apollo-link-http-common@^0.2.14:
|
||||
version "0.2.14"
|
||||
resolved "https://registry.yarnpkg.com/apollo-link-http-common/-/apollo-link-http-common-0.2.14.tgz#d3a195c12e00f4e311c417f121181dcc31f7d0c8"
|
||||
integrity sha512-v6mRU1oN6XuX8beVIRB6OpF4q1ULhSnmy7ScnHnuo1qV6GaFmDcbdvXqxIkAV1Q8SQCo2lsv4HeqJOWhFfApOg==
|
||||
dependencies:
|
||||
apollo-link "^1.2.11"
|
||||
ts-invariant "^0.3.2"
|
||||
apollo-link "^1.2.12"
|
||||
ts-invariant "^0.4.0"
|
||||
tslib "^1.9.3"
|
||||
|
||||
apollo-link-http@~1.5.14:
|
||||
version "1.5.14"
|
||||
resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.14.tgz#ed6292248d1819ccd16523e346d35203a1b31109"
|
||||
integrity sha512-XEoPXmGpxFG3wioovgAlPXIarWaW4oWzt8YzjTYZ87R4R7d1A3wKR/KcvkdMV1m5G7YSAHcNkDLe/8hF2nH6cg==
|
||||
apollo-link-http@~1.5.15:
|
||||
version "1.5.15"
|
||||
resolved "https://registry.yarnpkg.com/apollo-link-http/-/apollo-link-http-1.5.15.tgz#106ab23bb8997bd55965d05855736d33119652cf"
|
||||
integrity sha512-epZFhCKDjD7+oNTVK3P39pqWGn4LEhShAoA1Q9e2tDrBjItNfviiE33RmcLcCURDYyW5JA6SMgdODNI4Is8tvQ==
|
||||
dependencies:
|
||||
apollo-link "^1.2.11"
|
||||
apollo-link-http-common "^0.2.13"
|
||||
apollo-link "^1.2.12"
|
||||
apollo-link-http-common "^0.2.14"
|
||||
tslib "^1.9.3"
|
||||
|
||||
apollo-link@^1.0.0, apollo-link@^1.2.11, apollo-link@^1.2.3:
|
||||
version "1.2.11"
|
||||
resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.11.tgz#493293b747ad3237114ccd22e9f559e5e24a194d"
|
||||
integrity sha512-PQvRCg13VduLy3X/0L79M6uOpTh5iHdxnxYuo8yL7sJlWybKRJwsv4IcRBJpMFbChOOaHY7Og9wgPo6DLKDKDA==
|
||||
apollo-link@^1.0.0, apollo-link@^1.2.12, apollo-link@^1.2.3:
|
||||
version "1.2.12"
|
||||
resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.12.tgz#014b514fba95f1945c38ad4c216f31bcfee68429"
|
||||
integrity sha512-fsgIAXPKThyMVEMWQsUN22AoQI+J/pVXcjRGAShtk97h7D8O+SPskFinCGEkxPeQpE83uKaqafB2IyWdjN+J3Q==
|
||||
dependencies:
|
||||
apollo-utilities "^1.2.1"
|
||||
ts-invariant "^0.3.2"
|
||||
apollo-utilities "^1.3.0"
|
||||
ts-invariant "^0.4.0"
|
||||
tslib "^1.9.3"
|
||||
zen-observable-ts "^0.8.18"
|
||||
zen-observable-ts "^0.8.19"
|
||||
|
||||
apollo-server-caching@0.4.0:
|
||||
version "0.4.0"
|
||||
@ -1566,7 +1566,7 @@ apollo-upload-server@^7.0.0:
|
||||
http-errors "^1.7.0"
|
||||
object-path "^0.11.4"
|
||||
|
||||
apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.2.1, apollo-utilities@^1.3.2:
|
||||
apollo-utilities@1.3.2, apollo-utilities@^1.0.1, apollo-utilities@^1.3.0, apollo-utilities@^1.3.2:
|
||||
version "1.3.2"
|
||||
resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.2.tgz#8cbdcf8b012f664cd6cb5767f6130f5aed9115c9"
|
||||
integrity sha512-JWNHj8XChz7S4OZghV6yc9FNnzEXj285QYp/nLNh943iObycI5GTDO3NGR9Dth12LRrSFMeDOConPfPln+WGfg==
|
||||
@ -2586,10 +2586,10 @@ data-urls@^1.0.0:
|
||||
whatwg-mimetype "^2.2.0"
|
||||
whatwg-url "^7.0.0"
|
||||
|
||||
date-fns@2.0.0-alpha.33:
|
||||
version "2.0.0-alpha.33"
|
||||
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.33.tgz#c2f73c3cc50ac301c9217eb93603c9bc40e891bf"
|
||||
integrity sha512-tqUVEk3oxnJuNIvwAMKHAMo4uFRG0zXvjxZQll+BonoPt+m4NMcUgO14NDxbHuy7uYcrVErd2GdSsw02EDZQ7w==
|
||||
date-fns@2.0.0-alpha.34:
|
||||
version "2.0.0-alpha.34"
|
||||
resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.0.0-alpha.34.tgz#5d3ae7ca0d08915ccfc87a20545250af4e9c3cae"
|
||||
integrity sha512-yjSYUHASHvzOZl++cEms+Tw7oQOFA+7Z6/lL7L3lRO9j6pMfT48N6oEyvCGo/MVlH08XWmydgf8X9Y1eedf9sQ==
|
||||
|
||||
debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
|
||||
version "2.6.9"
|
||||
@ -2995,10 +2995,10 @@ escodegen@^1.9.1:
|
||||
optionalDependencies:
|
||||
source-map "~0.6.1"
|
||||
|
||||
eslint-config-prettier@~4.3.0:
|
||||
version "4.3.0"
|
||||
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-4.3.0.tgz#c55c1fcac8ce4518aeb77906984e134d9eb5a4f0"
|
||||
integrity sha512-sZwhSTHVVz78+kYD3t5pCWSYEdVSBR0PXnwjDRsUs8ytIrK8PLXw+6FKp8r3Z7rx4ZszdetWlXYKOHoUrrwPlA==
|
||||
eslint-config-prettier@~5.0.0:
|
||||
version "5.0.0"
|
||||
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-5.0.0.tgz#f7a94b2b8ae7cbf25842c36fa96c6d32cd0a697c"
|
||||
integrity sha512-c17Aqiz5e8LEqoc/QPmYnaxQFAHTx2KlCZBPxXXjEMmNchOLnV/7j0HoPZuC+rL/tDC9bazUYOKJW9bOhftI/w==
|
||||
dependencies:
|
||||
get-stdin "^6.0.0"
|
||||
|
||||
@ -7548,13 +7548,6 @@ trunc-text@1.0.1:
|
||||
resolved "https://registry.yarnpkg.com/trunc-text/-/trunc-text-1.0.1.tgz#58f876d8ac59b224b79834bb478b8656e69622b5"
|
||||
integrity sha1-WPh22KxZsiS3mDS7R4uGVuaWIrU=
|
||||
|
||||
ts-invariant@^0.3.2:
|
||||
version "0.3.2"
|
||||
resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.3.2.tgz#89a2ffeb70879b777258df1df1c59383c35209b0"
|
||||
integrity sha512-QsY8BCaRnHiB5T6iE4DPlJMAKEG3gzMiUco9FEt1jUXQf0XP6zi0idT0i0rMTu8A326JqNSDsmlkA9dRSh1TRg==
|
||||
dependencies:
|
||||
tslib "^1.9.3"
|
||||
|
||||
ts-invariant@^0.4.0:
|
||||
version "0.4.2"
|
||||
resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.2.tgz#8685131b8083e67c66d602540e78763408be9113"
|
||||
@ -8117,10 +8110,10 @@ yup@^0.27.0:
|
||||
synchronous-promise "^2.0.6"
|
||||
toposort "^2.0.2"
|
||||
|
||||
zen-observable-ts@^0.8.18:
|
||||
version "0.8.18"
|
||||
resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.18.tgz#ade44b1060cc4a800627856ec10b9c67f5f639c8"
|
||||
integrity sha512-q7d05s75Rn1j39U5Oapg3HI2wzriVwERVo4N7uFGpIYuHB9ff02P/E92P9B8T7QVC93jCMHpbXH7X0eVR5LA7A==
|
||||
zen-observable-ts@^0.8.19:
|
||||
version "0.8.19"
|
||||
resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.19.tgz#c094cd20e83ddb02a11144a6e2a89706946b5694"
|
||||
integrity sha512-u1a2rpE13G+jSzrg3aiCqXU5tN2kw41b+cBZGmnc+30YimdkKiDj9bTowcB41eL77/17RF/h+393AuVgShyheQ==
|
||||
dependencies:
|
||||
tslib "^1.9.3"
|
||||
zen-observable "^0.8.0"
|
||||
|
||||
@ -2,13 +2,16 @@
|
||||
<ds-card>
|
||||
<ds-flex>
|
||||
<ds-flex-item class="filter-menu-title">
|
||||
<ds-heading size="h3">
|
||||
{{ $t('filter-menu.title') }}
|
||||
</ds-heading>
|
||||
<ds-heading size="h3">{{ $t('filter-menu.title') }}</ds-heading>
|
||||
</ds-flex-item>
|
||||
<ds-flex-item>
|
||||
<div class="filter-menu-buttons">
|
||||
<ds-button
|
||||
v-tooltip="{
|
||||
content: this.$t('contribution.filterFollow'),
|
||||
placement: 'left',
|
||||
delay: { show: 500 },
|
||||
}"
|
||||
name="filter-by-followed-authors-only"
|
||||
icon="user-plus"
|
||||
:primary="!!filterAuthorIsFollowedById"
|
||||
|
||||
@ -86,7 +86,7 @@ describe('CommentList.vue', () => {
|
||||
})
|
||||
|
||||
it('displays comments when there are comments to display', () => {
|
||||
expect(wrapper.find('div#comments').text()).toEqual('this is a comment')
|
||||
expect(wrapper.find('div.comments').text()).toEqual('this is a comment')
|
||||
})
|
||||
|
||||
it("refetches a post's comments from the backend", () => {
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<div>
|
||||
<div id="comments">
|
||||
<h3 style="margin-top: -10px;">
|
||||
<span>
|
||||
<ds-icon name="comments" />
|
||||
@ -16,7 +16,7 @@
|
||||
</span>
|
||||
</h3>
|
||||
<ds-space margin-bottom="large" />
|
||||
<div v-if="comments && comments.length" id="comments" class="comments">
|
||||
<div v-if="comments && comments.length" class="comments">
|
||||
<comment
|
||||
v-for="(comment, index) in comments"
|
||||
:key="comment.id"
|
||||
|
||||
@ -40,9 +40,9 @@
|
||||
"profile": {
|
||||
"name": "Mein Profil",
|
||||
"memberSince": "Mitglied seit",
|
||||
"follow": "Folgen",
|
||||
"followers": "Folgen",
|
||||
"following": "Folgt",
|
||||
"follow": "abonnieren",
|
||||
"followers": "Abonnenten",
|
||||
"following": "abonniert",
|
||||
"shouted": "Empfohlen",
|
||||
"commented": "Kommentiert",
|
||||
"userAnonym": "Anonymus",
|
||||
@ -127,9 +127,9 @@
|
||||
}
|
||||
},
|
||||
"admin": {
|
||||
"name": "Systemverwaltung",
|
||||
"name": "Admin",
|
||||
"dashboard": {
|
||||
"name": "Startzentrale",
|
||||
"name": "Dashboard",
|
||||
"users": "Benutzer",
|
||||
"posts": "Beiträge",
|
||||
"comments": "Kommentare",
|
||||
@ -138,7 +138,7 @@
|
||||
"projects": "Projekte",
|
||||
"invites": "Einladungen",
|
||||
"follows": "Folgen",
|
||||
"shouts": "Shouts"
|
||||
"shouts": "Empfehlungen"
|
||||
},
|
||||
"organizations": {
|
||||
"name": "Organisationen"
|
||||
@ -296,7 +296,7 @@
|
||||
},
|
||||
"followButton": {
|
||||
"follow": "Folgen",
|
||||
"following": "Folge Ich"
|
||||
"following": "Folge ich"
|
||||
},
|
||||
"shoutButton": {
|
||||
"shouted": "empfohlen"
|
||||
@ -328,7 +328,11 @@
|
||||
}
|
||||
},
|
||||
"contribution": {
|
||||
"newPost": "Erstelle einen neuen Beitrag",
|
||||
"filterFollow": "Beiträge filtern von Usern denen ich folge",
|
||||
"filterALL": "Alle Beiträge anzeigen",
|
||||
"success": "Gespeichert!",
|
||||
"languageSelectLabel": "Sprache"
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -43,7 +43,7 @@
|
||||
"follow": "Follow",
|
||||
"followers": "Followers",
|
||||
"following": "Following",
|
||||
"shouted": "Shouted",
|
||||
"shouted": "Recommended",
|
||||
"commented": "Commented",
|
||||
"userAnonym": "Anonymous",
|
||||
"socialMedia": "Where else can I find",
|
||||
@ -59,7 +59,7 @@
|
||||
},
|
||||
"notifications": {
|
||||
"menu": {
|
||||
"mentioned": "has mentioned you in a post"
|
||||
"mentioned": "mentioned you in a post"
|
||||
}
|
||||
},
|
||||
"search": {
|
||||
@ -73,7 +73,7 @@
|
||||
"name": "Your data",
|
||||
"labelName": "Your Name",
|
||||
"namePlaceholder": "Femanon Funny",
|
||||
"labelCity": "Your City or Region",
|
||||
"labelCity": "Su ciudad o región",
|
||||
"labelBio": "About You",
|
||||
"success": "Your data was successfully updated!"
|
||||
},
|
||||
@ -138,7 +138,7 @@
|
||||
"projects": "Projects",
|
||||
"invites": "Invites",
|
||||
"follows": "Follows",
|
||||
"shouts": "Shouts"
|
||||
"shouts": "Recommended"
|
||||
},
|
||||
"organizations": {
|
||||
"name": "Organizations"
|
||||
@ -327,6 +327,9 @@
|
||||
}
|
||||
},
|
||||
"contribution": {
|
||||
"newPost": "Create a new Post",
|
||||
"filterFollow": "Filter contributions from users I follow",
|
||||
"filterALL": "View all contributions",
|
||||
"success": "Saved!",
|
||||
"languageSelectLabel": "Language"
|
||||
}
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{
|
||||
"filter-menu": {
|
||||
"title": "Su burbuja de filtro"
|
||||
},
|
||||
"login": {
|
||||
"copy": "Si ya tiene una cuenta de Human Connection, inicie sesión aquí.",
|
||||
"login": "Iniciar sesión",
|
||||
@ -6,39 +9,85 @@
|
||||
"email": "Tu correo electrónico",
|
||||
"password": "Tu contraseña",
|
||||
"moreInfo": "¿Qué es Human Connection?",
|
||||
"moreInfoURL": "https://human-connection.org/es/",
|
||||
"moreInfoHint": "a la página de presentación",
|
||||
"hello": "Hola"
|
||||
},
|
||||
"editor": {
|
||||
"placeholder": "Write something inspiring..."
|
||||
},
|
||||
"profile": {
|
||||
"name": "Mi perfil",
|
||||
"name": "Mi Perfil",
|
||||
"memberSince": "Miembro desde",
|
||||
"follow": "Seguir",
|
||||
"followers": "Seguidores",
|
||||
"following": "Siguiendo",
|
||||
"shouted": "Gritar",
|
||||
"commented": "Comentado"
|
||||
"shouted": "Recomendado",
|
||||
"commented": "Comentado",
|
||||
"userAnonym": "Anónimo",
|
||||
"socialMedia": "¿Dónde más puedo encontrar"
|
||||
},
|
||||
"notifications": {
|
||||
"menu": {
|
||||
"mentioned": "te ha mencionado en un post"
|
||||
}
|
||||
},
|
||||
"search": {
|
||||
"placeholder": "Buscar",
|
||||
"hint": "¿Qué estás buscando?",
|
||||
"failed": "no encontró nada"
|
||||
},
|
||||
"settings": {
|
||||
"name": "Configuración",
|
||||
"data": {
|
||||
"name": "Sus datos"
|
||||
"name": "Sus datos",
|
||||
"labelName": "Su nombre",
|
||||
"namePlaceholder": "Femanon Funny",
|
||||
"labelCity": "Your City or Region",
|
||||
"labelBio": "Acerca de usted",
|
||||
"success": "Sus datos han sido actualizados con éxito!"
|
||||
},
|
||||
"security": {
|
||||
"name": "Seguridad"
|
||||
"name": "Seguridad",
|
||||
"change-password": {
|
||||
"button": "Cambiar contraseña",
|
||||
"success": "Contraseña cambiada con éxito!",
|
||||
"label-old-password": "Su contraseña antigua",
|
||||
"label-new-password": "Su nueva contraseña",
|
||||
"label-new-password-confirm": "Confirm new password",
|
||||
"message-old-password-required": "Ingrese su contraseña anterior",
|
||||
"message-new-password-required": "Introduzca una nueva contraseña",
|
||||
"message-new-password-confirm-required": "Confirme su nueva contraseña",
|
||||
"message-new-password-missmatch": "Vuelva a escribir la misma contraseña",
|
||||
"passwordSecurity": "Seguridad de la contraseña",
|
||||
"passwordStrength0": "Contraseña muy insegura",
|
||||
"passwordStrength1": "Contraseña insegura",
|
||||
"passwordStrength2": "Contraseña mediocre",
|
||||
"passwordStrength3": "Contraseña segura",
|
||||
"passwordStrength4": "Contraseña muy sólida"
|
||||
}
|
||||
},
|
||||
"invites": {
|
||||
"name": "Invita"
|
||||
"name": "invitaciones"
|
||||
},
|
||||
"download": {
|
||||
"name": "Descargar datos"
|
||||
},
|
||||
"delete": {
|
||||
"name": "Borrar cuenta"
|
||||
"name": "Eliminar cuenta"
|
||||
},
|
||||
"organizations": {
|
||||
"name": "Mis organizaciones"
|
||||
},
|
||||
"languages": {
|
||||
"name": "Idiomas"
|
||||
"name": "idiomas"
|
||||
},
|
||||
"social-media": {
|
||||
"name": "Medios de comunicación social",
|
||||
"placeholder": "Agregar una URL de Social-Media",
|
||||
"submit": "Añadir enlace",
|
||||
"successAdd": "Social-Media agregó. Perfil actualizado!",
|
||||
"successDelete": "Social-Media borrado. Perfil actualizado!"
|
||||
}
|
||||
},
|
||||
"admin": {
|
||||
@ -53,7 +102,7 @@
|
||||
"projects": "Proyectos",
|
||||
"invites": "Invita",
|
||||
"follows": "Sigue",
|
||||
"shouts": "Gritos"
|
||||
"shouts": "Recomendado"
|
||||
},
|
||||
"organizations": {
|
||||
"name": "Organizaciones"
|
||||
@ -105,6 +154,11 @@
|
||||
}
|
||||
},
|
||||
"common": {
|
||||
"your": {
|
||||
"post": "Your Post ::: Your Posts",
|
||||
"comment": "Your Comment ::: Your Comments",
|
||||
"shout": "Your Shout ::: Your Shouts"
|
||||
},
|
||||
"post": "Mensaje ::: Mensajes",
|
||||
"comment": "Comentario ::: Comentarios",
|
||||
"letsTalk": "Hablemos",
|
||||
@ -119,6 +173,113 @@
|
||||
"tag": "Etiqueta ::: Etiquetas",
|
||||
"name": "Nombre",
|
||||
"loadMore": "cargar más",
|
||||
"loading": "cargando"
|
||||
"loading": "cargando",
|
||||
"reportContent": "Report"
|
||||
},
|
||||
"actions": {
|
||||
"loading": "cargamento",
|
||||
"loadMore": "cargar más",
|
||||
"create": "Crear",
|
||||
"save": "Guardar",
|
||||
"edit": "Edite",
|
||||
"delete": "Delete",
|
||||
"cancel": "Cancelar"
|
||||
},
|
||||
"moderation": {
|
||||
"name": "Moderación",
|
||||
"reports": {
|
||||
"empty": "Felicitaciones, nada que moderar.",
|
||||
"name": "Informes",
|
||||
"submitter": "comunicado por",
|
||||
"disabledBy": "desactivado por"
|
||||
}
|
||||
},
|
||||
"disable": {
|
||||
"submit": "Desactivar",
|
||||
"cancel": "Cancelar",
|
||||
"success": "Discapacitado con éxito",
|
||||
"user": {
|
||||
"title": "Desactivar usuario",
|
||||
"type": "Usuario",
|
||||
"message": "¿Realmente quieres deshabilitar el usuario \"<b>{name}</b>\"?"
|
||||
},
|
||||
"contribution": {
|
||||
"title": "Deshabilitar contribución",
|
||||
"type": "Contribución",
|
||||
"message": "¿Realmente quieres deshabilitar la contribución \"<b>{name}</b>\"?"
|
||||
},
|
||||
"comment": {
|
||||
"title": "Desactivar comentario",
|
||||
"type": "Comentario",
|
||||
"message": "¿Realmente quieres deshabilitar el comentario de \"<b>{name}</b>\"?"
|
||||
}
|
||||
},
|
||||
"delete": {
|
||||
"submit": "Borrar",
|
||||
"cancel": "Cancelar",
|
||||
"contribution": {
|
||||
"title": "Borrar contribución",
|
||||
"type": "Contribución",
|
||||
"message": "¿Realmente desea eliminar la Contribución \"<b>{name}</b>\" ?",
|
||||
"success": "Contribución eliminada con éxito!"
|
||||
},
|
||||
"comment": {
|
||||
"title": "Eliminar comentario",
|
||||
"type": "Comentario",
|
||||
"message": "¿Realmente quieres borrar el comentario de \"<b>{name}</b>\" ?",
|
||||
"success": "Comentario eliminado con éxito!"
|
||||
}
|
||||
},
|
||||
"report": {
|
||||
"submit": "Informe",
|
||||
"cancel": "Cancelar",
|
||||
"success": "Gracias por informarnos!",
|
||||
"user": {
|
||||
"title": "Usuario de informe",
|
||||
"type": "Usuario",
|
||||
"message": "¿Realmente quieres reportar al usuario \"<b>{name}</b>\"?"
|
||||
},
|
||||
"contribution": {
|
||||
"title": "Informe Contribución",
|
||||
"type": "Contribución",
|
||||
"message": "¿Realmente quieres informar al usuario de la contribución \"<b>{name}</b>\"?"
|
||||
},
|
||||
"comment": {
|
||||
"title": "Informe Comentario",
|
||||
"type": "Comentario",
|
||||
"message": "¿Realmente quieres reportar el comentario de \"<b>{name}</b>\"?"
|
||||
}
|
||||
},
|
||||
"followButton": {
|
||||
"follow": "Folgen",
|
||||
"following": "Folge Ich"
|
||||
},
|
||||
"shoutButton": {
|
||||
"shouted": "empfohlen"
|
||||
},
|
||||
"release": {
|
||||
"submit": "Liberación",
|
||||
"cancel": "Cancelar",
|
||||
"success": "Liberar con éxito!",
|
||||
"user": {
|
||||
"title": "Usuario de la versión ",
|
||||
"type": "Usuario",
|
||||
"message": "¿Realmente quieres liberar al usuario \"<b>{name}</b>\"?"
|
||||
},
|
||||
"contribution": {
|
||||
"title": "Contribución de la versión ",
|
||||
"type": "Contribución",
|
||||
"message": "¿Realmente quieres liberar la contribución \"<b>{name}</b>\"?"
|
||||
},
|
||||
"comment": {
|
||||
"title": "Comentario de la versión",
|
||||
"type": "Comentario",
|
||||
"message": "¿Realmente quieres liberar el comentario de \"<b>{name}</b>\"?"
|
||||
}
|
||||
},
|
||||
"user": {
|
||||
"avatar": {
|
||||
"submitted": "Carga con éxito"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,7 @@
|
||||
{
|
||||
"filter-menu": {
|
||||
"title": "Votre bulle de filtre"
|
||||
},
|
||||
"login": {
|
||||
"copy": "Si vous avez déjà un compte human-connection, connectez-vous ici.",
|
||||
"login": "Connexion",
|
||||
@ -6,25 +9,66 @@
|
||||
"email": "Votre courriel",
|
||||
"password": "Votre mot de passe",
|
||||
"moreInfo": "Qu'est-ce que Human Connection?",
|
||||
"moreInfoURL": "https://human-connection.org/fr/",
|
||||
"moreInfoHint": "à la page de présentation",
|
||||
"hello": "Bonjour"
|
||||
},
|
||||
"editor": {
|
||||
"placeholder": "Écrivez quelque chose d'inspirant..."
|
||||
},
|
||||
"profile": {
|
||||
"name": "Mon profil",
|
||||
"memberSince": "Membre depuis",
|
||||
"follow": "Suivre",
|
||||
"followers": "Suiveurs",
|
||||
"following": "Suivant"
|
||||
"following": "Suivant",
|
||||
"shouted": "Recommandé",
|
||||
"commented": "Comentado",
|
||||
"userAnonym": "Anónimo",
|
||||
"socialMedia": "Où d'autre puis-je trouver"
|
||||
},
|
||||
"notifications": {
|
||||
"menu": {
|
||||
"mentioned": "a parlé de vous dans un article"
|
||||
}
|
||||
},
|
||||
"search": {
|
||||
"placeholder": "Rechercher",
|
||||
"hint": "Qu'est-ce que vous cherchez ?",
|
||||
"failed": "Rien trouvé"
|
||||
},
|
||||
"settings": {
|
||||
"name": "Paramètres",
|
||||
"name": "Configurations",
|
||||
"data": {
|
||||
"name": "Vos données"
|
||||
"name": "Vos données",
|
||||
"labelName": "Votre nom",
|
||||
"namePlaceholder": "Fémanon Funny",
|
||||
"labelCity": "Votre ville ou région",
|
||||
"labelBio": "À propos de vous",
|
||||
"success": "Vos données ont été mises à jour avec succès !"
|
||||
},
|
||||
"security": {
|
||||
"name": "Sécurité"
|
||||
"name": "Sécurité",
|
||||
"change-password": {
|
||||
"button": "Modifier le mot de passe",
|
||||
"success": "Mot de passe modifié avec succès !",
|
||||
"label-old-password": "Votre ancien mot de passe",
|
||||
"label-new-password": "Votre nouveau mot de passe",
|
||||
"label-new-password-confirm": "Confirmez votre nouveau mot de passe",
|
||||
"message-old-password-required": "Entrez votre ancien mot de passe",
|
||||
"message-new-password-required": "Entrez un nouveau mot de passe",
|
||||
"message-new-password-confirm-required": "Confirmez votre nouveau mot de passe",
|
||||
"message-new-password-missmatch": "Tapez à nouveau le même mot de passe",
|
||||
"passwordSecurity": "Sécurité par mot de passe",
|
||||
"passwordStrength0": "Mot de passe très peu sûr",
|
||||
"passwordStrength1": "Mot de passe non sécurisé",
|
||||
"passwordStrength2": "Mot de passe médiocre",
|
||||
"passwordStrength3": "Mot de passe fort",
|
||||
"passwordStrength4": "Mot de passe très fort"
|
||||
}
|
||||
},
|
||||
"invites": {
|
||||
"name": "Invite"
|
||||
"name": "invitations"
|
||||
},
|
||||
"download": {
|
||||
"name": "Télécharger les données"
|
||||
@ -36,7 +80,14 @@
|
||||
"name": "Mes organisations"
|
||||
},
|
||||
"languages": {
|
||||
"name": "Langues"
|
||||
"name": "langues"
|
||||
},
|
||||
"social-media": {
|
||||
"name": "Médias sociaux",
|
||||
"placeholder": "Ajouter une URL pour les médias sociaux",
|
||||
"submit": "Ajouter un lien",
|
||||
"successAdd": "Les médias sociaux ont été ajoutés. Profil mis à jour !",
|
||||
"successDelete": "Médias sociaux supprimé. Profil mis à jour !"
|
||||
}
|
||||
},
|
||||
"admin": {
|
||||
@ -51,7 +102,7 @@
|
||||
"projects": "Projets",
|
||||
"invites": "Invite",
|
||||
"follows": "Suit",
|
||||
"shouts": "Cris"
|
||||
"shouts": "Recommandé"
|
||||
},
|
||||
"organizations": {
|
||||
"name": "Organisations"
|
||||
@ -95,13 +146,18 @@
|
||||
}
|
||||
},
|
||||
"common": {
|
||||
"your": {
|
||||
"post": "Votre message ::: Votre messages",
|
||||
"comment": "Votre Commentaire ::: Votre Commentaires ",
|
||||
"shout": "Votre Recommandation ::: Votre Recommandations"
|
||||
},
|
||||
"post": "Message ::: Messages",
|
||||
"comment": "Commentaire ::: Commentaires",
|
||||
"letsTalk": "Parlons-en",
|
||||
"versus": "Versus",
|
||||
"moreInfo": "Plus d'infos",
|
||||
"takeAction": "Passer à l'action",
|
||||
"shout": "Shout ::: Shouts",
|
||||
"shout": "Recommandation ::: Recommandations",
|
||||
"user": "Utilisateur ::: Utilisateurs",
|
||||
"category": "Catégorie ::: Catégories",
|
||||
"organization": "Organisation ::: Organisations",
|
||||
@ -112,33 +168,64 @@
|
||||
"loading": "chargement",
|
||||
"reportContent": "Signaler"
|
||||
},
|
||||
"actions": {
|
||||
"loading": "chargement",
|
||||
"loadMore": "charger plus",
|
||||
"create": "Créer",
|
||||
"save": "sauvegarde",
|
||||
"edit": "Modifier",
|
||||
"delete": "Supprimer",
|
||||
"cancel": "Annuler"
|
||||
},
|
||||
"moderation": {
|
||||
"name": "Modération",
|
||||
"reports": {
|
||||
"empty": "Félicitations, rien à modérer.",
|
||||
"name": "Signalisations",
|
||||
"reporter": "signalé par"
|
||||
"name": "Rapports",
|
||||
"submitter": "signalé par",
|
||||
"disabledBy": "ddésactivé par"
|
||||
}
|
||||
},
|
||||
"disable": {
|
||||
"submit": "Désactiver",
|
||||
"cancel": "Annuler",
|
||||
"success": "Désactivé avec succès",
|
||||
"user": {
|
||||
"title": "Désactiver l'utilisateur",
|
||||
"type": "Utilisateur",
|
||||
"message": "Souhaitez-vous vraiment désactiver l'utilisateur \" <b> {name} </b> \"?"
|
||||
"message": "Voulez-vous vraiment désactiver l'utilisateur \"<b>{name}</b>\"?"
|
||||
},
|
||||
"contribution": {
|
||||
"title": "Désactiver l'apport",
|
||||
"type": "apport",
|
||||
"message": "Souhaitez-vous vraiment signaler l'entrée\" <b> {name} </b> \"?"
|
||||
"title": "Cotisation d'invalidité",
|
||||
"type": "Contribution",
|
||||
"message": "Voulez-vous vraiment désactiver la contribution \"<b> {name} </b> \"?"
|
||||
},
|
||||
"comment": {
|
||||
"title": "Désactiver le commentaire",
|
||||
"title": "Désactiver commentaire",
|
||||
"type": "Commentaire",
|
||||
"message": "Souhaitez-vous vraiment désactiver le commentaire de \"<b>{name}</b>\" ?"
|
||||
"message": "Voulez-vous vraiment désactiver le commentaire de \"<b>{name}</b>\" ?"
|
||||
}
|
||||
},
|
||||
"delete": {
|
||||
"submit": "Supprimer",
|
||||
"cancel": "Annuler",
|
||||
"contribution": {
|
||||
"title": "Supprimer la contribution",
|
||||
"type": "Contribution",
|
||||
"message": "Voulez-vous vraiment supprimer la contribution \"<b>{name}</b>\" löschen möchtest?",
|
||||
"success": "Contribution supprimée avec succès !"
|
||||
},
|
||||
"comment": {
|
||||
"title": "Supprimer un commentaire",
|
||||
"type": "Commentaire",
|
||||
"message": "Voulez-vous vraiment supprimer le commentaire de \"<b>{name}</b>\" löschen möchtest?",
|
||||
"success": "Commentaire supprimé avec succès !"
|
||||
}
|
||||
},
|
||||
"report": {
|
||||
"submit": "Envoyer le rapport",
|
||||
"submit": "Rapport",
|
||||
"cancel": "Annuler",
|
||||
"success": "Merci de nous avoir fait part de vos commentaires!",
|
||||
"user": {
|
||||
"title": "Signaler l'utilisateur",
|
||||
"type": "Utilisateur",
|
||||
@ -155,15 +242,36 @@
|
||||
"message": "Souhaitez-vous vraiment signaler l'utilisateur \" <b> {name} </b> \"?"
|
||||
}
|
||||
},
|
||||
"actions": {
|
||||
"cancel": "Annuler"
|
||||
"followButton": {
|
||||
"follow": "découler",
|
||||
"following": "Je suis les"
|
||||
},
|
||||
"contribution": {
|
||||
"edit": "Rédiger l'apport",
|
||||
"delete": "Supprimer l'entrée"
|
||||
"shoutButton": {
|
||||
"shouted": "recommandé"
|
||||
},
|
||||
"comment": {
|
||||
"edit": "Rédiger un commentaire",
|
||||
"delete": "Supprimer le commentaire"
|
||||
"release": {
|
||||
"submit": "Relâchez",
|
||||
"cancel": "Annuler",
|
||||
"success": "Relâchez avec succès!",
|
||||
"user": {
|
||||
"title": "Validation par l'utilisateur",
|
||||
"type": "Utilisateur",
|
||||
"message": "Voulez-vous vraiment libérer l'utilisateur \"<b>{name}</b>\"?"
|
||||
},
|
||||
"contribution": {
|
||||
"title": "Versement de la contribution",
|
||||
"type": "Contribution",
|
||||
"message": "Voulez-vous vraiment débloquer la contribution \"<b>{name}</b>\"?"
|
||||
},
|
||||
"comment": {
|
||||
"title": "Publication des commentaires",
|
||||
"type": "Commentaire",
|
||||
"message": "Voulez-vous vraiment publier le commentaire de \"<b>{name}</b>\"?"
|
||||
}
|
||||
},
|
||||
"user": {
|
||||
"avatar": {
|
||||
"submitted": "Téléchargement réussi"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -90,7 +90,7 @@
|
||||
"babel-eslint": "~10.0.1",
|
||||
"babel-jest": "~24.8.0",
|
||||
"eslint": "~5.16.0",
|
||||
"eslint-config-prettier": "~4.3.0",
|
||||
"eslint-config-prettier": "~5.0.0",
|
||||
"eslint-config-standard": "~12.0.0",
|
||||
"eslint-loader": "~2.1.2",
|
||||
"eslint-plugin-import": "~2.17.3",
|
||||
|
||||
@ -77,6 +77,17 @@ export default {
|
||||
]
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
$route(to, from) {
|
||||
if (to.hash === '#comments') {
|
||||
window.scroll({
|
||||
top: document.getElementById('comments').offsetTop,
|
||||
left: 0,
|
||||
behavior: 'smooth',
|
||||
})
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
|
||||
@ -4236,10 +4236,10 @@ eslint-config-prettier@^3.3.0:
|
||||
dependencies:
|
||||
get-stdin "^6.0.0"
|
||||
|
||||
eslint-config-prettier@~4.3.0:
|
||||
version "4.3.0"
|
||||
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-4.3.0.tgz#c55c1fcac8ce4518aeb77906984e134d9eb5a4f0"
|
||||
integrity sha512-sZwhSTHVVz78+kYD3t5pCWSYEdVSBR0PXnwjDRsUs8ytIrK8PLXw+6FKp8r3Z7rx4ZszdetWlXYKOHoUrrwPlA==
|
||||
eslint-config-prettier@~5.0.0:
|
||||
version "5.0.0"
|
||||
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-5.0.0.tgz#f7a94b2b8ae7cbf25842c36fa96c6d32cd0a697c"
|
||||
integrity sha512-c17Aqiz5e8LEqoc/QPmYnaxQFAHTx2KlCZBPxXXjEMmNchOLnV/7j0HoPZuC+rL/tDC9bazUYOKJW9bOhftI/w==
|
||||
dependencies:
|
||||
get-stdin "^6.0.0"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user