Merge pull request #3934 from Ocelot-Social-Community/white-labeling

feat: 🍰 Rebranding And White-Labeling
This commit is contained in:
Wolfgang Huß 2020-12-03 11:30:25 +01:00 committed by GitHub
commit 982a324e20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
132 changed files with 6911 additions and 11314 deletions

46
.github/workflows/ci.yml vendored Normal file
View File

@ -0,0 +1,46 @@
name: CI
on: [push]
jobs:
build:
name: Continuous Integration
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Check translation files
run: |
scripts/translations/sort.sh
scripts/translations/missing-keys.sh
- name: Build neo4j image
uses: docker/build-push-action@v1.1.0
with:
repository: ocelotsocialnetwork/neo4j
tags: latest
path: neo4j/
push: false
- name: Build backend base image
uses: docker/build-push-action@v1.1.0
with:
repository: ocelotsocialnetwork/backend
tags: build-and-test
target: build-and-test
path: backend/
push: false
- name: Build webapp base image
uses: docker/build-push-action@v1.1.0
with:
repository: ocelotsocialnetwork/webapp
tags: build-and-test
target: build-and-test
path: webapp/
push: false
- name: Lint backend
run: docker run --rm ocelotsocialnetwork/backend:build-and-test yarn run lint
- name: Lint webapp
run: docker run --rm ocelotsocialnetwork/webapp:build-and-test yarn run lint

View File

@ -23,3 +23,6 @@ AWS_SECRET_ACCESS_KEY=
AWS_ENDPOINT= AWS_ENDPOINT=
AWS_REGION= AWS_REGION=
AWS_BUCKET= AWS_BUCKET=
EMAIL_DEFAULT_SENDER="devops@ocelot.social"
EMAIL_SUPPORT="devops@ocelot.social"

View File

@ -1,5 +1,5 @@
FROM node:15.3.0-alpine3.10 as base FROM node:12.19.0-alpine3.10 as base
LABEL Description="Backend of the Social Network Human-Connection.org" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)" LABEL Description="Backend of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)"
EXPOSE 4000 EXPOSE 4000
CMD ["yarn", "run", "start"] CMD ["yarn", "run", "start"]

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 130 KiB

View File

@ -1,7 +1,7 @@
{ {
"name": "human-connection-backend", "name": "ocelot-social-backend",
"version": "0.6.3", "version": "0.6.3",
"description": "GraphQL Backend for Human Connection", "description": "GraphQL Backend for ocelot.social",
"main": "src/index.js", "main": "src/index.js",
"scripts": { "scripts": {
"__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations", "__migrate": "migrate --compiler 'js:@babel/register' --migrations-dir ./src/db/migrations",
@ -18,7 +18,6 @@
"db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js", "db:migrate": "yarn run __migrate --store ./src/db/migrate/store.js",
"db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js --date-format 'yyyymmddHHmmss' create" "db:migrate:create": "yarn run __migrate --template-file ./src/db/migrate/template.js --date-format 'yyyymmddHHmmss' create"
}, },
"author": "Human Connection gGmbH",
"license": "MIT", "license": "MIT",
"jest": { "jest": {
"verbose": true, "verbose": true,

File diff suppressed because one or more lines are too long

File diff suppressed because it is too large Load Diff

View File

@ -14,7 +14,7 @@ import { InMemoryCache } from 'apollo-cache-inmemory'
import fetch from 'node-fetch' import fetch from 'node-fetch'
import { ApolloClient } from 'apollo-client' import { ApolloClient } from 'apollo-client'
import trunc from 'trunc-html' import trunc from 'trunc-html'
const debug = require('debug')('ea:nitro-datasource') const debug = require('debug')('ea:datasource')
export default class NitroDataSource { export default class NitroDataSource {
constructor(uri) { constructor(uri) {

View File

@ -45,7 +45,7 @@ export async function handler(req, res) {
} catch (error) { } catch (error) {
debug(error) debug(error)
return res.status(500).json({ return res.status(500).json({
error: 'Something went terribly wrong. Please contact support@human-connection.org', error: `Something went terribly wrong. Please visit ${CONFIG.SUPPORT_URL}`,
}) })
} finally { } finally {
session.close() session.close()

View File

@ -1,7 +1,15 @@
import dotenv from 'dotenv' import dotenv from 'dotenv'
import links from './links.js'
import metadata from './metadata.js'
if (require.resolve) { if (require.resolve) {
// are we in a nodejs environment? // are we in a nodejs environment?
dotenv.config({ path: require.resolve('../../.env') }) try {
dotenv.config({ path: require.resolve('../../.env') })
} catch (error) {
if (error.code !== 'MODULE_NOT_FOUND') throw error
console.log('WARN: No `.env` file found in /backend') // eslint-disable-line no-console
}
} }
// eslint-disable-next-line no-undef // eslint-disable-next-line no-undef
@ -31,6 +39,7 @@ const {
REDIS_DOMAIN, REDIS_DOMAIN,
REDIS_PORT, REDIS_PORT,
REDIS_PASSWORD, REDIS_PASSWORD,
EMAIL_DEFAULT_SENDER,
} = env } = env
export const requiredConfigs = { export const requiredConfigs = {
@ -83,6 +92,13 @@ export const s3Configs = {
S3_CONFIGURED, S3_CONFIGURED,
} }
export const customConfigs = {
EMAIL_DEFAULT_SENDER,
SUPPORT_URL: links.SUPPORT,
APPLICATION_NAME: metadata.APPLICATION_NAME,
ORGANIZATION_URL: links.ORGANIZATION,
}
export default { export default {
...requiredConfigs, ...requiredConfigs,
...smtpConfigs, ...smtpConfigs,
@ -92,4 +108,5 @@ export default {
...sentryConfigs, ...sentryConfigs,
...redisConfigs, ...redisConfigs,
...s3Configs, ...s3Configs,
...customConfigs,
} }

View File

@ -0,0 +1,6 @@
export default {
ORGANIZATION: 'https://ocelot.social',
DONATE: 'https://ocelot-social.herokuapp.com/donations',
FAQ: 'https://ocelot.social',
SUPPORT: 'https://ocelot.social',
}

View File

@ -0,0 +1,7 @@
export default {
APPLICATION_NAME: 'ocelot.social',
APPLICATION_SHORT_NAME: 'ocelot',
APPLICATION_DESCRIPTION: 'ocelot.social Community Network',
ORGANIZATION_NAME: 'ocelot.social Community',
ORGANIZATION_JURISDICTION: 'City of Angels',
}

View File

@ -3,11 +3,18 @@ import CONFIG from '../../config'
import * as templates from './templates' import * as templates from './templates'
const from = '"Human Connection" <info@human-connection.org>' const from = CONFIG.EMAIL_DEFAULT_SENDER
const supportUrl = 'https://human-connection.org/en/contact' const welcomeImageUrl = new URL(`/img/custom/welcome.svg`, CONFIG.CLIENT_URI)
const defaultParams = {
supportUrl: CONFIG.SUPPORT_URL,
APPLICATION_NAME: CONFIG.APPLICATION_NAME,
ORGANIZATION_URL: CONFIG.ORGANIZATION_URL,
welcomeImageUrl,
}
export const signupTemplate = ({ email, nonce }) => { export const signupTemplate = ({ email, nonce }) => {
const subject = 'Willkommen, Bienvenue, Welcome to Human Connection!' const subject = `Willkommen, Bienvenue, Welcome to ${CONFIG.APPLICATION_NAME}!`
const actionUrl = new URL('/registration/create-user-account', CONFIG.CLIENT_URI) const actionUrl = new URL('/registration/create-user-account', CONFIG.CLIENT_URI)
actionUrl.searchParams.set('nonce', nonce) actionUrl.searchParams.set('nonce', nonce)
actionUrl.searchParams.set('email', email) actionUrl.searchParams.set('email', email)
@ -18,7 +25,7 @@ export const signupTemplate = ({ email, nonce }) => {
subject, subject,
html: mustache.render( html: mustache.render(
templates.layout, templates.layout,
{ actionUrl, nonce, supportUrl, subject }, { ...defaultParams, actionUrl, nonce, subject },
{ content: templates.signup }, { content: templates.signup },
), ),
} }
@ -36,7 +43,7 @@ export const emailVerificationTemplate = ({ email, nonce, name }) => {
subject, subject,
html: mustache.render( html: mustache.render(
templates.layout, templates.layout,
{ actionUrl, name, nonce, supportUrl, subject }, { ...defaultParams, actionUrl, name, nonce, subject },
{ content: templates.emailVerification }, { content: templates.emailVerification },
), ),
} }
@ -54,7 +61,7 @@ export const resetPasswordTemplate = ({ email, nonce, name }) => {
subject, subject,
html: mustache.render( html: mustache.render(
templates.layout, templates.layout,
{ actionUrl, name, nonce, supportUrl, subject }, { ...defaultParams, actionUrl, name, nonce, subject },
{ content: templates.passwordReset }, { content: templates.passwordReset },
), ),
} }
@ -70,7 +77,7 @@ export const wrongAccountTemplate = ({ email }) => {
subject, subject,
html: mustache.render( html: mustache.render(
templates.layout, templates.layout,
{ actionUrl, supportUrl }, { actionUrl, supportUrl: CONFIG.SUPPORT_URL, welcomeImageUrl },
{ content: templates.wrongAccount }, { content: templates.wrongAccount },
), ),
} }

View File

@ -6,8 +6,8 @@
<tr> <tr>
<td style="background-color: #ffffff;"> <td style="background-color: #ffffff;">
<img <img
src="https://firebasestorage.googleapis.com/v0/b/gitbook-28427.appspot.com/o/assets%2F-LcGvGRsW6DrZn7FWRzF%2F-LcGv6EiVcsjYLfQ_2YE%2F-LcGv8UtmAWc61fxGveg%2Flets_get_together.png?generation=1555078880410873&alt=media" src="{{{ welcomeImageUrl }}}"
width="600" height="" alt="Human Connection community logo" border="0" width="600" height="" alt="Welcome image" border="0"
style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;" style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
class="g-img"> class="g-img">
</td> </td>
@ -74,9 +74,9 @@
<td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in <p style="margin: 0;">Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in
Dein Browserfenster kopieren: <span style="color: #17b53e;">{{{ nonce }}}</span></p> Dein Browserfenster kopieren: <span style="color: #17b53e;">{{{ nonce }}}</span></p>
<p style="margin: 0; margin-top: 10px;">Bis bald bei <a href="https://human-connection.org" <p style="margin: 0; margin-top: 10px;">Bis bald bei <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a>!</p> style="color: #17b53e;">{{{APPLICATION_NAME}}}</a>!</p>
<p style="margin: 0; margin-bottom: 10px;"> Dein Human Connection Team</p> <p style="margin: 0; margin-bottom: 10px;"> Dein {{APPLICATION_NAME}} Team</p>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -104,8 +104,8 @@
<tr> <tr>
<td style="background-color: #ffffff;"> <td style="background-color: #ffffff;">
<img <img
src="https://firebasestorage.googleapis.com/v0/b/gitbook-28427.appspot.com/o/assets%2F-LcGvGRsW6DrZn7FWRzF%2F-LcGv6EiVcsjYLfQ_2YE%2F-LcGv8UtmAWc61fxGveg%2Flets_get_together.png?generation=1555078880410873&alt=media" src="{{{ welcomeImageUrl }}}"
width="600" height="" alt="Human Connection community logo" border="0" width="600" height="" alt="Welcome image" border="0"
style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;" style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
class="g-img"> class="g-img">
</td> </td>
@ -172,9 +172,9 @@
<td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">If the above button doesn't work you can also copy the following code into your <p style="margin: 0;">If the above button doesn't work you can also copy the following code into your
browser window: <span style="color: #17b53e;">{{{ nonce }}}</span></p> browser window: <span style="color: #17b53e;">{{{ nonce }}}</span></p>
<p style="margin: 0; margin-top: 10px;">See you soon on <a href="https://human-connection.org" <p style="margin: 0; margin-top: 10px;">See you soon on <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a>!</p> style="color: #17b53e;">{{{APPLICATION_NAME}}}</a>!</p>
<p style="margin: 0; margin-bottom: 10px;"> The Human Connection Team</p> <p style="margin: 0; margin-bottom: 10px;"> The {{APPLICATION_NAME}} Team</p>
</td> </td>
</tr> </tr>
</table> </table>

View File

@ -170,8 +170,8 @@
<td <td
style="padding: 20px; font-family: Lato, sans-serif; font-size: 12px; line-height: 15px; text-align: center; color: #888888;"> style="padding: 20px; font-family: Lato, sans-serif; font-size: 12px; line-height: 15px; text-align: center; color: #888888;">
<br><br> <br><br>
Human Connection gGmbH<br><span class="unstyle-auto-detected-links">Bahnhofstraße 11, 73235 Weilheim / {{ORGANIZATION_NAME}}
Teck<br>Germany</span> <br>{{ORGANIZATION_URL}}<br>
<br><br> <br><br>
</td> </td>
</tr> </tr>

View File

@ -6,8 +6,8 @@
<tr> <tr>
<td style="background-color: #ffffff;"> <td style="background-color: #ffffff;">
<img <img
src="https://firebasestorage.googleapis.com/v0/b/gitbook-28427.appspot.com/o/assets%2F-LcGvGRsW6DrZn7FWRzF%2F-LcGv6EiVcsjYLfQ_2YE%2F-LcGv8UtmAWc61fxGveg%2Flets_get_together.png?generation=1555078880410873&alt=media" src="{{{ welcomeImageUrl }}}"
width="600" height="" alt="Human Connection community logo" border="0" width="600" height="" alt="Welcome image" border="0"
style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;" style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
class="g-img"> class="g-img">
</td> </td>
@ -74,9 +74,9 @@
<td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in <p style="margin: 0;">Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in
Dein Browserfenster kopieren: <span style="color: #17b53e;">{{{ nonce }}}</span></p> Dein Browserfenster kopieren: <span style="color: #17b53e;">{{{ nonce }}}</span></p>
<p style="margin: 0; margin-top: 10px;">Bis bald bei <a href="https://human-connection.org" <p style="margin: 0; margin-top: 10px;">Bis bald bei <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a>!</p> style="color: #17b53e;">{{APPLICATION_NAME}}</a>!</p>
<p style="margin: 0; margin-bottom: 10px;"> Dein Human Connection Team</p> <p style="margin: 0; margin-bottom: 10px;"> Dein {{APPLICATION_NAME}} Team</p>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -104,8 +104,8 @@
<tr> <tr>
<td style="background-color: #ffffff;"> <td style="background-color: #ffffff;">
<img <img
src="https://firebasestorage.googleapis.com/v0/b/gitbook-28427.appspot.com/o/assets%2F-LcGvGRsW6DrZn7FWRzF%2F-LcGv6EiVcsjYLfQ_2YE%2F-LcGv8UtmAWc61fxGveg%2Flets_get_together.png?generation=1555078880410873&alt=media" src="{{{ welcomeImageUrl }}}"
width="600" height="" alt="Human Connection community logo" border="0" width="600" height="" alt="Welcome image" border="0"
style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;" style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
class="g-img"> class="g-img">
</td> </td>
@ -171,9 +171,9 @@
<td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">If the above button doesn't work you can also copy the following code into your <p style="margin: 0;">If the above button doesn't work you can also copy the following code into your
browser window: <span style="color: #17b53e;">{{{ nonce }}}</span></p> browser window: <span style="color: #17b53e;">{{{ nonce }}}</span></p>
<p style="margin: 0; margin-top: 10px;">See you soon on <a href="https://human-connection.org" <p style="margin: 0; margin-top: 10px;">See you soon on <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a>!</p> style="color: #17b53e;">{{APPLICATION_NAME}}</a>!</p>
<p style="margin: 0; margin-bottom: 10px;"> The Human Connection Team</p> <p style="margin: 0; margin-bottom: 10px;"> The {{APPLICATION_NAME}} Team</p>
</td> </td>
</tr> </tr>
</table> </table>

View File

@ -6,8 +6,8 @@
<tr> <tr>
<td style="background-color: #ffffff;"> <td style="background-color: #ffffff;">
<img <img
src="https://firebasestorage.googleapis.com/v0/b/gitbook-28427.appspot.com/o/assets%2F-LcGvGRsW6DrZn7FWRzF%2F-LcGv6EiVcsjYLfQ_2YE%2F-LcGv8UtmAWc61fxGveg%2Flets_get_together.png?generation=1555078880410873&alt=media" src="{{{ welcomeImageUrl }}}"
width="600" height="" alt="Human Connection community logo" border="0" width="600" height="" alt="Welcome image" border="0"
style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;" style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
class="g-img"> class="g-img">
</td> </td>
@ -23,7 +23,7 @@
style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<h1 <h1
style="margin: 0 0 10px 0; font-family: Lato, sans-serif; font-size: 25px; line-height: 30px; color: #333333; font-weight: normal;"> style="margin: 0 0 10px 0; font-family: Lato, sans-serif; font-size: 25px; line-height: 30px; color: #333333; font-weight: normal;">
Willkommen bei Human Connection!</h1> Willkommen bei {{APPLICATION_NAME}}!</h1>
<p style="margin: 0;">Danke, dass Du dich angemeldet hast wir freuen uns, Dich dabei zu haben. Jetzt <p style="margin: 0;">Danke, dass Du dich angemeldet hast wir freuen uns, Dich dabei zu haben. Jetzt
fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können ... Bitte bestätige fehlt nur noch eine Kleinigkeit, bevor wir gemeinsam die Welt verbessern können ... Bitte bestätige
Deine E-Mail Adresse:</p> Deine E-Mail Adresse:</p>
@ -62,8 +62,8 @@
<td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: <span style="color: #17b53e;">{{{ nonce }}}</span></p> <p style="margin: 0;">Sollte der Button für Dich nicht funktionieren, kannst Du auch folgenden Code in Dein Browserfenster kopieren: <span style="color: #17b53e;">{{{ nonce }}}</span></p>
<p style="margin: 0;">Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert hast.</p> <p style="margin: 0;">Das funktioniert allerdings nur, wenn du Dich über unsere Website registriert hast.</p>
<p style="margin: 0; margin-top: 10px;">Falls Du Dich nicht selbst bei <a href="https://human-connection.org" <p style="margin: 0; margin-top: 10px;">Falls Du Dich nicht selbst bei <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a> angemeldet hast, schau doch mal vorbei! style="color: #17b53e;">{{APPLICATION_NAME}}</a> angemeldet hast, schau doch mal vorbei!
Wir sind ein gemeinnütziges Aktionsnetzwerk von Menschen für Menschen.</p> Wir sind ein gemeinnütziges Aktionsnetzwerk von Menschen für Menschen.</p>
<p style="margin: 0; margin-top: 10px;">PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese <p style="margin: 0; margin-top: 10px;">PS: Wenn Du keinen Account bei uns möchtest, kannst Du diese
E-Mail einfach ignorieren. ;)</p> E-Mail einfach ignorieren. ;)</p>
@ -87,9 +87,9 @@
<td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">Melde Dich gerne <a href="{{{ supportUrl }}}" style="color: #17b53e;">bei <p style="margin: 0;">Melde Dich gerne <a href="{{{ supportUrl }}}" style="color: #17b53e;">bei
unserem Support Team</a>, wenn Du Fragen hast.</p> unserem Support Team</a>, wenn Du Fragen hast.</p>
<p style="margin: 0; margin-top: 10px;">Bis bald bei <a href="https://human-connection.org" <p style="margin: 0; margin-top: 10px;">Bis bald bei <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a>!</p> style="color: #17b53e;">{{APPLICATION_NAME}}</a>!</p>
<p style="margin: 0; margin-bottom: 10px;"> Dein Human Connection Team</p> <p style="margin: 0; margin-bottom: 10px;"> Dein {{APPLICATION_NAME}} Team</p>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -117,8 +117,8 @@
<tr> <tr>
<td style="background-color: #ffffff;"> <td style="background-color: #ffffff;">
<img <img
src="https://firebasestorage.googleapis.com/v0/b/gitbook-28427.appspot.com/o/assets%2F-LcGvGRsW6DrZn7FWRzF%2F-LcGv6EiVcsjYLfQ_2YE%2F-LcGv8UtmAWc61fxGveg%2Flets_get_together.png?generation=1555078880410873&alt=media" src="{{{ welcomeImageUrl }}}"
width="600" height="" alt="Human Connection community logo" border="0" width="600" height="" alt="Welcome image" border="0"
style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;" style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
class="g-img"> class="g-img">
</td> </td>
@ -134,7 +134,7 @@
style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<h1 <h1
style="margin: 0 0 10px 0; font-family: Lato, sans-serif; font-size: 25px; line-height: 30px; color: #333333; font-weight: normal;"> style="margin: 0 0 10px 0; font-family: Lato, sans-serif; font-size: 25px; line-height: 30px; color: #333333; font-weight: normal;">
Welcome to Human Connection!</h1> Welcome to {{APPLICATION_NAME}}!</h1>
<p style="margin: 0;">Thank you for joining our cause it's awesome to have you on board. There's <p style="margin: 0;">Thank you for joining our cause it's awesome to have you on board. There's
just one tiny step missing before we can start shaping the world together ... Please confirm your just one tiny step missing before we can start shaping the world together ... Please confirm your
e-mail address by clicking the button below:</p> e-mail address by clicking the button below:</p>
@ -173,8 +173,8 @@
<td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">If the above button doesn't work, you can also copy the following code into your browser window: <span style="color: #17b53e;">{{{ nonce }}}</span></p> <p style="margin: 0;">If the above button doesn't work, you can also copy the following code into your browser window: <span style="color: #17b53e;">{{{ nonce }}}</span></p>
<p style="margin: 0;">However, this only works if you have registered through our website.</p> <p style="margin: 0;">However, this only works if you have registered through our website.</p>
<p style="margin: 0; margin-top: 10px;">If you didn't sign up for <a href="https://human-connection.org" <p style="margin: 0; margin-top: 10px;">If you didn't sign up for <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a> we recommend you to check it out! style="color: #17b53e;">{{APPLICATION_NAME}}</a> we recommend you to check it out!
It's a social network from people for people who want to connect and change the world together.</p> It's a social network from people for people who want to connect and change the world together.</p>
<p style="margin: 0; margin-top: 10px;">PS: If you ignore this e-mail we will not create an account <p style="margin: 0; margin-top: 10px;">PS: If you ignore this e-mail we will not create an account
for for
@ -200,9 +200,9 @@
<p style="margin: 0;">Feel free to <a href="{{{ supportUrl }}}" style="color: #17b53e;">contact our <p style="margin: 0;">Feel free to <a href="{{{ supportUrl }}}" style="color: #17b53e;">contact our
support team</a> with any support team</a> with any
questions you have.</p> questions you have.</p>
<p style="margin: 0; margin-top: 10px;">See you soon on <a href="https://human-connection.org" <p style="margin: 0; margin-top: 10px;">See you soon on <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a>!</p> style="color: #17b53e;">{{APPLICATION_NAME}}</a>!</p>
<p style="margin: 0; margin-bottom: 10px;"> The Human Connection Team</p> <p style="margin: 0; margin-bottom: 10px;"> The {{APPLICATION_NAME}} Team</p>
</td> </td>
</tr> </tr>
</table> </table>

View File

@ -6,8 +6,8 @@
<tr> <tr>
<td style="background-color: #ffffff;"> <td style="background-color: #ffffff;">
<img <img
src="https://firebasestorage.googleapis.com/v0/b/gitbook-28427.appspot.com/o/assets%2F-LcGvGRsW6DrZn7FWRzF%2F-LcGv6EiVcsjYLfQ_2YE%2F-LcGv8UtmAWc61fxGveg%2Flets_get_together.png?generation=1555078880410873&alt=media" src="{{{ welcomeImageUrl }}}"
width="600" height="" alt="Human Connection community logo" border="0" width="600" height="" alt="Welcome image" border="0"
style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;" style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
class="g-img"> class="g-img">
</td> </td>
@ -55,8 +55,8 @@
<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"> <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
<tr> <tr>
<td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">Wenn Du noch keinen Account bei <a href="https://human-connection.org" <p style="margin: 0;">Wenn Du noch keinen Account bei <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a> hast oder Dein Password gar nicht ändern willst, style="color: #17b53e;">{{APPLICATION_NAME}}</a> hast oder Dein Password gar nicht ändern willst,
kannst Du diese E-Mail einfach ignorieren!</p> kannst Du diese E-Mail einfach ignorieren!</p>
</td> </td>
</tr> </tr>
@ -74,9 +74,9 @@
style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">Ansonsten hilft Dir <a href="{{{ supportUrl }}}" style="color: #17b53e;">unser <p style="margin: 0;">Ansonsten hilft Dir <a href="{{{ supportUrl }}}" style="color: #17b53e;">unser
Support Team</a> gerne weiter.</p> Support Team</a> gerne weiter.</p>
<p style="margin: 0; margin-top: 10px;">Bis bald bei <a href="https://human-connection.org" <p style="margin: 0; margin-top: 10px;">Bis bald bei <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a>!</p> style="color: #17b53e;">{{APPLICATION_NAME}}</a>!</p>
<p style="margin: 0; margin-bottom: 10px;"> Dein Human Connection Team</p> <p style="margin: 0; margin-bottom: 10px;"> Dein {{APPLICATION_NAME}} Team</p>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -104,8 +104,8 @@
<tr> <tr>
<td style="background-color: #ffffff;"> <td style="background-color: #ffffff;">
<img <img
src="https://firebasestorage.googleapis.com/v0/b/gitbook-28427.appspot.com/o/assets%2F-LcGvGRsW6DrZn7FWRzF%2F-LcGv6EiVcsjYLfQ_2YE%2F-LcGv8UtmAWc61fxGveg%2Flets_get_together.png?generation=1555078880410873&alt=media" src="{{{ welcomeImageUrl }}}"
width="600" height="" alt="Human Connection community logo" border="0" width="600" height="" alt="Welcome image" border="0"
style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;" style="width: 100%; max-width: 600px; height: auto; background: #ffffff; font-family: Lato, sans-serif; font-size: 16px; line-height: 15px; color: #555555; margin: auto; display: block;"
class="g-img"> class="g-img">
</td> </td>
@ -152,8 +152,8 @@
<table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%"> <table role="presentation" cellspacing="0" cellpadding="0" border="0" width="100%">
<tr> <tr>
<td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> <td style="padding: 20px; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">If you don't have an account at <a href="https://human-connection.org" <p style="margin: 0;">If you don't have an account at <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a> yet or if you didn't want to reset your password, style="color: #17b53e;">{{APPLICATION_NAME}}</a> yet or if you didn't want to reset your password,
please ignore this e-mail.</p> please ignore this e-mail.</p>
</td> </td>
</tr> </tr>
@ -171,9 +171,9 @@
style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;"> style="padding: 20px; padding-top: 0; font-family: Lato, sans-serif; font-size: 16px; line-height: 22px; color: #555555;">
<p style="margin: 0;">Otherwise <a href="{{{ supportUrl }}}" style="color: #17b53e;">our <p style="margin: 0;">Otherwise <a href="{{{ supportUrl }}}" style="color: #17b53e;">our
support team</a> will be happy to help you out.</p> support team</a> will be happy to help you out.</p>
<p style="margin: 0; margin-top: 10px;">See you soon on <a href="https://human-connection.org" <p style="margin: 0; margin-top: 10px;">See you soon on <a href="{{{ ORGANIZATION_URL }}}"
style="color: #17b53e;">Human Connection</a>!</p> style="color: #17b53e;">{{APPLICATION_NAME}}</a>!</p>
<p style="margin: 0; margin-bottom: 10px;"> The Human Connection Team</p> <p style="margin: 0; margin-bottom: 10px;"> The {{APPLICATION_NAME}} Team</p>
</td> </td>
</tr> </tr>
</table> </table>

View File

@ -18,7 +18,10 @@ const HumanConnectionOrg = fs.readFileSync(
path.join(__dirname, '../../../snapshots/embeds/HumanConnectionOrg.html'), path.join(__dirname, '../../../snapshots/embeds/HumanConnectionOrg.html'),
'utf8', 'utf8',
) )
const pr960 = fs.readFileSync(path.join(__dirname, '../../../snapshots/embeds/pr960.html'), 'utf8') const pr3934 = fs.readFileSync(
path.join(__dirname, '../../../snapshots/embeds/pr3934.html'),
'utf8',
)
const babyLovesCat = fs.readFileSync( const babyLovesCat = fs.readFileSync(
path.join(__dirname, '../../../snapshots/embeds/babyLovesCat.html'), path.join(__dirname, '../../../snapshots/embeds/babyLovesCat.html'),
'utf8', 'utf8',
@ -145,7 +148,7 @@ describe('Query', () => {
describe('given a Github link', () => { describe('given a Github link', () => {
beforeEach(() => { beforeEach(() => {
fetch fetch
.mockReturnValueOnce(Promise.resolve(new Response(pr960))) .mockReturnValueOnce(Promise.resolve(new Response(pr3934)))
.mockReturnValueOnce(Promise.resolve(JSON.stringify({}))) .mockReturnValueOnce(Promise.resolve(JSON.stringify({})))
variables = { url: 'https://github.com/Human-Connection/Human-Connection/pull/960' } variables = { url: 'https://github.com/Human-Connection/Human-Connection/pull/960' }
}) })
@ -156,14 +159,14 @@ describe('Query', () => {
embed: { embed: {
type: 'link', type: 'link',
title: title:
'Editor embeds merge in nitro embed by mattwr18 · Pull Request #960 · Human-Connection/Human-Connection', 'feat: [WIP] 🍰 Rebranding And White-Labeling by Mogge · Pull Request #3934 · Ocelot-Social-Community/Ocelot-Social',
author: 'Human-Connection', author: 'Ocelot-Social-Community',
publisher: 'GitHub', publisher: 'GitHub',
date: expect.any(String), date: expect.any(String),
description: '🍰 Pullrequest Issues fixes #256', description: `🍰 Pullrequest
url: 'https://github.com/Human-Connection/Human-Connection/pull/960', Have all the information for the brand in separate config files. Set these defaults to ocelot.social`,
image: url: 'https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/3934',
'https://repository-images.githubusercontent.com/112590397/52c9a000-7e11-11e9-899d-aaa55f3a3d72', image: 'https://avatars3.githubusercontent.com/u/67983243?s=400&v=4',
audio: null, audio: null,
video: null, video: null,
lang: 'en', lang: 'en',

View File

@ -1,5 +1,5 @@
# domain is the user-facing domain. # domain is the user-facing domain.
domain: develop.human-connection.org domain: develop-docker.ocelot.social
# commit is the latest github commit deployed. # commit is the latest github commit deployed.
commit: 889a7cdd24dda04a139b2b77d626e984d6db6781 commit: 889a7cdd24dda04a139b2b77d626e984d6db6781
# dbInitialization runs the database initializations in a post-install hook. # dbInitialization runs the database initializations in a post-install hook.
@ -37,9 +37,9 @@ neo4jResourceLimitsMemory: "2G"
# neo4jResourceLimitsMemory configures the memory available for requests. # neo4jResourceLimitsMemory configures the memory available for requests.
neo4jResourceRequestsMemory: "1G" neo4jResourceRequestsMemory: "1G"
# supportEmail is used for letsencrypt certs. # supportEmail is used for letsencrypt certs.
supportEmail: "devcom@human-connection.org" supportEmail: "devops@ocelot.social"
# smtpHost is the host for the mailserver. # smtpHost is the host for the mailserver.
smtpHost: "mailserver.human-connection.org" smtpHost: "mail.ocelot.social"
# smtpPort is the port to be used for the mailserver. # smtpPort is the port to be used for the mailserver.
smtpPort: \"25\" smtpPort: \"25\"
# jwtSecret is used to encode/decode a user's JWT for authentication # jwtSecret is used to encode/decode a user's JWT for authentication
@ -50,4 +50,4 @@ privateKeyPassphrase: "YTdkc2Y3OHNhZGc4N2FkODdzZmFnc2FkZzc4"
mapboxToken: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1E=" mapboxToken: "cGsuZXlKMUlqb2lhSFZ0WVc0dFkyOXVibVZqZEdsdmJpSXNJbUVpT2lKamFqbDBjbkJ1Ykdvd2VUVmxNM1Z3WjJsek5UTnVkM1p0SW4wLktaOEtLOWw3MG9talhiRWtrYkhHc1E="
uploadsStorage: "25Gi" uploadsStorage: "25Gi"
neo4jStorage: "5Gi" neo4jStorage: "5Gi"
developmentMailserverDomain: nitro-mailserver.human-connection.org developmentMailserverDomain: mail.ocelot.social

View File

@ -18,8 +18,8 @@ minikube dashboard, expose the services you want on your host system.
For example: For example:
```text ```text
$ minikube service develop-webapp --namespace=human-connection $ minikube service develop-webapp --namespace=ocelotsocialnetwork
# optionally # optionally
$ minikube service develop-backend --namespace=human-connection $ minikube service develop-backend --namespace=ocelotsocialnetwork
``` ```

View File

@ -56,4 +56,4 @@ $ kubectl --namespace=human-connection exec -it <POD-ID> bash
> exit > exit
``` ```
Revert your changes to deployment `develop-neo4j` which will restart the database. Revert your changes to deployment `develop-neo4j` which will restart the database.

View File

@ -1,13 +1,8 @@
version: "3.4" version: "3.4"
services: services:
mailserver:
image: djfarrelly/maildev
ports:
- 1080:80
networks:
- hc-network
webapp: webapp:
image: schoolsinmotion/webapp:build-and-test
build: build:
context: webapp context: webapp
target: build-and-test target: build-and-test
@ -15,9 +10,12 @@ services:
- ./webapp:/develop-webapp - ./webapp:/develop-webapp
environment: environment:
- NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/` - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/`
- PUBLIC_REGISTRATION=false - PUBLIC_REGISTRATION=true
command: yarn run dev command: yarn run dev
volumes:
- webapp_node_modules:/nitro-web/node_modules
backend: backend:
image: schoolsinmotion/backend:build-and-test
build: build:
context: backend context: backend
target: build-and-test target: build-and-test
@ -30,6 +28,12 @@ services:
- SMTP_IGNORE_TLS=true - SMTP_IGNORE_TLS=true
- "DEBUG=${DEBUG}" - "DEBUG=${DEBUG}"
- PUBLIC_REGISTRATION=false - PUBLIC_REGISTRATION=false
volumes:
- backend_node_modules:/nitro-backend/node_modules
- uploads:/nitro-backend/public/uploads
neo4j:
volumes:
- neo4j_data:/data
maintenance: maintenance:
image: ocelotsocialnetwork/develop-maintenance:latest image: ocelotsocialnetwork/develop-maintenance:latest
build: build:
@ -39,6 +43,17 @@ services:
- hc-network - hc-network
ports: ports:
- 3503:80 - 3503:80
mailserver:
image: djfarrelly/maildev
ports:
- 1080:80
networks:
- hc-network
networks: networks:
hc-network: hc-network:
volumes:
webapp_node_modules:
backend_node_modules:
neo4j_data:
uploads:

View File

@ -0,0 +1,20 @@
version: "3.4"
services:
webapp:
build:
context: webapp
target: production
args:
- "BUILD_COMMIT=${TRAVIS_COMMIT}"
backend:
build:
context: backend
target: production
args:
- "BUILD_COMMIT=${TRAVIS_COMMIT}"
neo4j:
build:
context: neo4j
args:
- "BUILD_COMMIT=${TRAVIS_COMMIT}"

View File

@ -45,6 +45,7 @@ services:
- MAPBOX_TOKEN=pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g - MAPBOX_TOKEN=pk.eyJ1IjoiYnVzZmFrdG9yIiwiYSI6ImNraDNiM3JxcDBhaWQydG1uczhpZWtpOW4ifQ.7TNRTO-o9aK1Y6MyW_Nd4g
- PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78 - PRIVATE_KEY_PASSPHRASE=a7dsf78sadg87ad87sfagsadg78
- "DEBUG=${DEBUG}" - "DEBUG=${DEBUG}"
- EMAIL_DEFAULT_SENDER=devops@ocelot.social
neo4j: neo4j:
image: ocelotsocialnetwork/develop-neo4j:latest image: ocelotsocialnetwork/develop-neo4j:latest
build: build:
@ -68,4 +69,4 @@ volumes:
webapp_node_modules: webapp_node_modules:
backend_node_modules: backend_node_modules:
neo4j_data: neo4j_data:
uploads: uploads:

View File

@ -1,7 +1,7 @@
FROM neo4j:3.5.14 FROM neo4j:3.5.14
LABEL Description="Neo4J database of the Social Network ocelot.social with preinstalled database constraints and indices" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)"
# community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment # community edition 👆🏼, because we have no enterprise licence 👇🏼 at the moment
# FROM neo4j:3.5.14-enterprise # FROM neo4j:3.5.14-enterprise
LABEL Description="Neo4J database of the Social Network Human-Connection.org with preinstalled database constraints and indices" Vendor="Human Connection gGmbH" Version="0.0.1" Maintainer="Human Connection gGmbH (developer@human-connection.org)"
ARG BUILD_COMMIT ARG BUILD_COMMIT
ENV BUILD_COMMIT=$BUILD_COMMIT ENV BUILD_COMMIT=$BUILD_COMMIT

View File

@ -13,8 +13,6 @@ scripts/
cypress/ cypress/
README.md README.md
screenshot*.png
lokalise.png
.editorconfig .editorconfig
maintenance/node_modules/ maintenance/node_modules/

View File

@ -1,5 +1,5 @@
FROM node:15.3.0-alpine3.10 as base FROM node:12.19.0-alpine3.10 as base
LABEL Description="Web Frontend of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" LABEL Description="Web Frontend of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)"
EXPOSE 3000 EXPOSE 3000
CMD ["yarn", "run", "start"] CMD ["yarn", "run", "start"]

View File

@ -1,5 +1,5 @@
FROM node:15.3.0-alpine3.10 as build FROM node:12.19.0-alpine3.10 as build
LABEL Description="Maintenance page of the Social Network Human-Connection.org" Vendor="Human-Connection gGmbH" Version="0.0.1" Maintainer="Human-Connection gGmbH (developer@human-connection.org)" LABEL Description="Maintenance page of the Social Network ocelot.social" Vendor="ocelot.social Community" Version="0.0.1" Maintainer="ocelot.social Community (devops@ocelot.social)"
EXPOSE 3000 EXPOSE 3000
CMD ["yarn", "run", "start"] CMD ["yarn", "run", "start"]
@ -25,6 +25,7 @@ COPY locales locales
COPY mixins mixins COPY mixins mixins
COPY plugins/i18n.js plugins/v-tooltip.js plugins/styleguide.js plugins/ COPY plugins/i18n.js plugins/v-tooltip.js plugins/styleguide.js plugins/
COPY static static COPY static static
COPY constants constants
COPY nuxt.config.js nuxt.config.js COPY nuxt.config.js nuxt.config.js
# this will also ovewrite the existing package.json # this will also ovewrite the existing package.json

View File

@ -98,7 +98,7 @@ You can then visit the Storybook playground on `http://localhost:3002`
## Styleguide Migration ## Styleguide Migration
We are currently in the process of migrating our styleguide components and design tokens from the [Nitro Styleguide](https://github.com/Human-Connection/Nitro-Styleguide) into the main [Human Connection repository](https://github.com/Human-Connection/Human-Connection) and refactoring our components in the process. During this migration, our new components will live in a `_new/` folder to separate them from the old, yet untouched components. We are currently in the process of migrating our styleguide components and design tokens from the [Nitro Styleguide](https://github.com/Ocelot-Social-Community/HC-Styleguide-20201003) into the main [ocelot.social repository](https://github.com/Ocelot-Social-Community/Ocelot-Social) and refactoring our components in the process. During this migration, our new components will live in a `_new/` folder to separate them from the old, yet untouched components.
### Folder Structure ### Folder Structure

View File

@ -20,7 +20,7 @@
{{ $t('login.hello') }} {{ $t('login.hello') }}
<b>{{ userName }}</b> <b>{{ userName }}</b>
<template v-if="user.role !== 'user'"> <template v-if="user.role !== 'user'">
<ds-text color="softer" size="small" style="margin-bottom: 0;"> <ds-text color="softer" size="small" style="margin-bottom: 0">
{{ user.role | camelCase }} {{ user.role | camelCase }}
</ds-text> </ds-text>
</template> </template>

View File

@ -24,11 +24,7 @@
<div v-if="formData.image" class="blur-toggle"> <div v-if="formData.image" class="blur-toggle">
<label for="blur-img">{{ $t('contribution.inappropriatePicture') }}</label> <label for="blur-img">{{ $t('contribution.inappropriatePicture') }}</label>
<input type="checkbox" id="blur-img" v-model="formData.imageBlurred" /> <input type="checkbox" id="blur-img" v-model="formData.imageBlurred" />
<a <a :href="links.FAQ" target="_blank" class="link">
href="https://support.human-connection.org/kb/faq.php?id=113"
target="_blank"
class="link"
>
{{ $t('contribution.inappropriatePictureText') }} {{ $t('contribution.inappropriatePictureText') }}
<base-icon name="question-circle" /> <base-icon name="question-circle" />
</a> </a>
@ -92,6 +88,7 @@ import locales from '~/locales'
import PostMutations from '~/graphql/PostMutations.js' import PostMutations from '~/graphql/PostMutations.js'
import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect' import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
import ImageUploader from '~/components/ImageUploader/ImageUploader' import ImageUploader from '~/components/ImageUploader/ImageUploader'
import links from '~/constants/links.js'
export default { export default {
components: { components: {
@ -114,6 +111,7 @@ export default {
const { sensitive: imageBlurred = false, aspectRatio: imageAspectRatio = null } = image || {} const { sensitive: imageBlurred = false, aspectRatio: imageAspectRatio = null } = image || {}
return { return {
links,
formData: { formData: {
title: title || '', title: title || '',
content: content || '', content: content || '',

View File

@ -21,8 +21,10 @@ describe('DonationInfo.vue', () => {
const Wrapper = () => mount(DonationInfo, { mocks, localVue }) const Wrapper = () => mount(DonationInfo, { mocks, localVue })
it('includes a link to the Human Connection donations website', () => { it('includes a link to the ocelot.social donations website', () => {
expect(Wrapper().find('a').attributes('href')).toBe('https://human-connection.org/spenden/') expect(Wrapper().find('a').attributes('href')).toBe(
'https://ocelot-social.herokuapp.com/donations',
)
}) })
it('displays a call to action button', () => { it('displays a call to action button', () => {

View File

@ -1,13 +1,14 @@
<template> <template>
<div class="donation-info"> <div class="donation-info">
<progress-bar :title="title" :label="label" :goal="goal" :progress="progress" /> <progress-bar :title="title" :label="label" :goal="goal" :progress="progress" />
<a target="_blank" href="https://human-connection.org/spenden/"> <a target="_blank" :href="links.DONATE">
<base-button filled>{{ $t('donations.donate-now') }}</base-button> <base-button filled>{{ $t('donations.donate-now') }}</base-button>
</a> </a>
</div> </div>
</template> </template>
<script> <script>
import links from '~/constants/links.js'
import { DonationsQuery } from '~/graphql/Donations' import { DonationsQuery } from '~/graphql/Donations'
import ProgressBar from '~/components/ProgressBar/ProgressBar.vue' import ProgressBar from '~/components/ProgressBar/ProgressBar.vue'
@ -17,6 +18,7 @@ export default {
}, },
data() { data() {
return { return {
links,
goal: 15000, goal: 15000,
progress: 0, progress: 0,
} }

View File

@ -25,7 +25,7 @@ export default {
interactive: true, interactive: true,
placement, placement,
showOnInit, showOnInit,
theme: 'human-connection', theme: 'ocelot-social',
trigger, trigger,
onMount(instance) { onMount(instance) {
const input = instance.popper.querySelector('input') const input = instance.popper.querySelector('input')
@ -65,7 +65,7 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
.tippy-tooltip.human-connection-theme { .tippy-tooltip.ocelot-social-theme {
background-color: $color-primary; background-color: $color-primary;
padding: 0; padding: 0;
font-size: 1rem; font-size: 1rem;

View File

@ -65,7 +65,7 @@ storiesOf('Editor', module)
<p> <p>
Here is some <em>italic</em>, <b>bold</b> and <u>underline</u> text. Here is some <em>italic</em>, <b>bold</b> and <u>underline</u> text.
<br/> <br/>
Also do we have some <a href="https://human-connection.org">inline links</a> here. Also do we have some <a href="https://ocelot.social">inline links</a> here.
</p> </p>
<h3>Heading 3</h3> <h3>Heading 3</h3>
<p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p> <p>At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.</p>
@ -115,7 +115,7 @@ storiesOf('Editor', module)
users, users,
content: ` content: `
<p> <p>
This text contains <a href="#" class="hashtag">#hashtags</a> for projects like <a href="https://human-connection.org" class="hashtag">#human-connection</a> This text contains <a href="#" class="hashtag">#hashtags</a> for projects like <a href="https://ocelot.social" class="hashtag">#ocelot-social</a>
Try to add more by typing #. Try to add more by typing #.
</p> </p>
`, `,

View File

@ -22,7 +22,7 @@ export default class Hashtag extends TipTapMention {
...super.schema, ...super.schema,
toDOM: (node) => { toDOM: (node) => {
// use a dummy domain because URL cannot handle relative urls // use a dummy domain because URL cannot handle relative urls
const url = new URL('/', 'https://human-connection.org') const url = new URL('/', 'https://example.org')
url.searchParams.append('hashtag', node.attrs.id) url.searchParams.append('hashtag', node.attrs.id)
return [ return [

View File

@ -5,7 +5,7 @@
:src="iconPath" :src="iconPath"
width="80" width="80"
class="hc-empty-icon" class="hc-empty-icon"
style="margin-bottom: 5px;" style="margin-bottom: 5px"
alt="Empty" alt="Empty"
/> />
<br /> <br />

View File

@ -6,8 +6,8 @@
</blockquote> </blockquote>
<base-card> <base-card>
<template #imageColumn> <template #imageColumn>
<a :href="$t('login.moreInfoURL')" :title="$t('login.moreInfo')" target="_blank"> <a :href="links.ORGANIZATION" :title="$t('login.moreInfo', metadata)" target="_blank">
<img class="image" alt="Human Connection" src="/img/sign-up/humanconnection.svg" /> <img class="image" alt="Welcome" src="/img/custom/welcome.svg" />
</a> </a>
</template> </template>
<h2 class="title">{{ $t('login.login') }}</h2> <h2 class="title">{{ $t('login.login') }}</h2>
@ -57,15 +57,17 @@
<script> <script>
import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch' import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
import BaseIcon from '../_new/generic/BaseIcon/BaseIcon' import links from '~/constants/links.js'
import metadata from '~/constants/metadata.js'
export default { export default {
components: { components: {
LocaleSwitch, LocaleSwitch,
BaseIcon,
}, },
data() { data() {
return { return {
metadata,
links,
form: { form: {
email: '', email: '',
password: '', password: '',
@ -116,6 +118,9 @@ export default {
margin-top: $space-large; margin-top: $space-large;
margin-bottom: $space-small; margin-bottom: $space-small;
} }
.image {
width: 100%;
}
} }
.password-wrapper { .password-wrapper {

View File

@ -1,79 +0,0 @@
<template>
<div class="VueToNuxtLogo">
<div class="Triangle Triangle--two" />
<div class="Triangle Triangle--one" />
<div class="Triangle Triangle--three" />
<div class="Triangle Triangle--four" />
</div>
</template>
<style>
.VueToNuxtLogo {
display: inline-block;
animation: turn 2s linear forwards 1s;
transform: rotateX(180deg);
position: relative;
overflow: hidden;
height: 180px;
width: 245px;
}
.Triangle {
position: absolute;
top: 0;
left: 0;
width: 0;
height: 0;
}
.Triangle--one {
border-left: 105px solid transparent;
border-right: 105px solid transparent;
border-bottom: 180px solid #41b883;
}
.Triangle--two {
top: 30px;
left: 35px;
animation: goright 0.5s linear forwards 3.5s;
border-left: 87.5px solid transparent;
border-right: 87.5px solid transparent;
border-bottom: 150px solid #3b8070;
}
.Triangle--three {
top: 60px;
left: 35px;
animation: goright 0.5s linear forwards 3.5s;
border-left: 70px solid transparent;
border-right: 70px solid transparent;
border-bottom: 120px solid #35495e;
}
.Triangle--four {
top: 120px;
left: 70px;
animation: godown 0.5s linear forwards 3s;
border-left: 35px solid transparent;
border-right: 35px solid transparent;
border-bottom: 60px solid #fff;
}
@keyframes turn {
100% {
transform: rotateX(0deg);
}
}
@keyframes godown {
100% {
top: 180px;
}
}
@keyframes goright {
100% {
left: 70px;
}
}
</style>

View File

@ -0,0 +1,60 @@
<template>
<component :is="tag" class="ds-logo" :class="[inverse && 'ds-logo-inverse']">
<svg-logo v-if="!inverse" class="ds-logo-svg" />
<svg-logo-inverse v-else class="ds-logo-svg" />
</component>
</template>
<script>
import svgLogo from '~/static/img/custom/Logo-Horizontal.svg'
import svgLogoInverse from '~/static/img/custom/Logo-Horizontal-Dark.svg'
/**
* This component displays the brand's logo.
* @version 1.0.0
*/
export default {
name: 'Logo',
components: {
svgLogo,
svgLogoInverse,
},
props: {
/**
* Inverse the logo
*/
inverse: {
type: Boolean,
default: false,
},
/**
* The html element name used for the logo.
*/
tag: {
type: String,
default: 'div',
},
},
}
</script>
<style lang="scss">
.ds-logo {
@include reset;
display: inline-flex;
justify-content: center;
align-items: center;
color: $text-color-primary;
}
.ds-logo-inverse {
color: $text-color-primary-inverse;
}
.ds-logo-svg {
width: 130px;
height: auto;
fill: currentColor;
}
</style>
<docs src="./demo.md"></docs>

View File

@ -0,0 +1,15 @@
# Basic usage
```
<ds-section>
<ds-logo></ds-logo>
</ds-section>
```
# Inverse Logo
```
<ds-section secondary>
<ds-logo inverse></ds-logo>
</ds-section>
```

View File

@ -0,0 +1,17 @@
.ds-logo {
@include reset;
display: inline-flex;
justify-content: center;
align-items: center;
color: $text-color-primary;
}
.ds-logo-inverse {
color: $text-color-primary-inverse;
}
.ds-logo-svg {
width: 130px;
height: auto;
fill: currentColor;
}

View File

@ -1,25 +1,25 @@
<template> <template>
<div id="footer" class="ds-footer"> <div id="footer" class="ds-footer">
<a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a> <a :href="links.ORGANIZATION" target="_blank" v-html="$t('site.made')"></a>
<span>-</span> <span>-</span>
<a href="https://human-connection.org/impressum/" target="_blank"> <nuxt-link to="/imprint">
{{ $t('site.imprint') }} {{ $t('site.imprint') }}
</a> </nuxt-link>
<span>-</span> <span>-</span>
<nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link> <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>
<span>-</span> <span>-</span>
<nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link> <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>
<span>-</span> <span>-</span>
<a href="https://human-connection.org/datenschutz/" target="_blank"> <nuxt-link to="/data-privacy">
{{ $t('site.data-privacy') }} {{ $t('site.data-privacy') }}
</a> </nuxt-link>
<span>-</span> <span>-</span>
<a href="https://faq.human-connection.org/" target="_blank"> <a :href="links.FAQ" target="_blank">
{{ $t('site.faq') }} {{ $t('site.faq') }}
</a> </a>
<span>-</span> <span>-</span>
<a <a
href="https://github.com/Human-Connection/Human-Connection/blob/master/CHANGELOG.md" href="https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/CHANGELOG.md"
target="_blank" target="_blank"
> >
{{ version }} {{ version }}
@ -28,9 +28,10 @@
</template> </template>
<script> <script>
import links from '~/constants/links.js'
export default { export default {
data() { data() {
return { version: `v${process.env.release}` } return { links, version: `v${process.env.release}` }
}, },
} }
</script> </script>

View File

@ -49,8 +49,9 @@
</p> </p>
<p> <p>
{{ $t('components.password-reset.change-password.help') }} {{ $t('components.password-reset.change-password.help') }}
<br /> </p>
<a href="mailto:support@human-connection.org">support@human-connection.org</a> <p>
<a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>
</p> </p>
</ds-text> </ds-text>
</template> </template>
@ -60,6 +61,7 @@
</template> </template>
<script> <script>
import emails from '../../constants/emails.js'
import PasswordStrength from '../Password/Strength' import PasswordStrength from '../Password/Strength'
import gql from 'graphql-tag' import gql from 'graphql-tag'
import { SweetalertIcon } from 'vue-sweetalert-icons' import { SweetalertIcon } from 'vue-sweetalert-icons'
@ -77,6 +79,7 @@ export default {
data() { data() {
const passwordForm = PasswordForm({ translate: this.$t }) const passwordForm = PasswordForm({ translate: this.$t })
return { return {
supportEmail: emails.SUPPORT,
formData: { formData: {
...passwordForm.formData, ...passwordForm.formData,
}, },

View File

@ -16,7 +16,7 @@
</ds-text> </ds-text>
<ds-text align="center"> <ds-text align="center">
{{ $t('components.registration.create-user-account.help') }} {{ $t('components.registration.create-user-account.help') }}
<a :href="supportEmail.href">{{ supportEmail.label }}</a> <a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>
</ds-text> </ds-text>
<ds-space centered> <ds-space centered>
<nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link> <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
@ -69,17 +69,21 @@
v-model="termsAndConditionsConfirmed" v-model="termsAndConditionsConfirmed"
:checked="termsAndConditionsConfirmed" :checked="termsAndConditionsConfirmed"
/> />
<label <label for="checkbox0">
for="checkbox0" {{ $t('termsAndConditions.termsAndConditionsConfirmed') }}
v-html="$t('termsAndConditions.termsAndConditionsConfirmed')" <br />
></label> <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>
</label>
</ds-text> </ds-text>
<ds-text> <ds-text>
<input id="checkbox1" type="checkbox" v-model="dataPrivacy" :checked="dataPrivacy" /> <input id="checkbox1" type="checkbox" v-model="dataPrivacy" :checked="dataPrivacy" />
<label <label for="checkbox1">
for="checkbox1" {{ $t('components.registration.signup.form.data-privacy') }}
v-html="$t('components.registration.signup.form.data-privacy')" <br />
></label> <nuxt-link to="/data-privacy">
{{ $t('site.data-privacy') }}
</nuxt-link>
</label>
</ds-text> </ds-text>
<ds-text> <ds-text>
<input id="checkbox2" type="checkbox" v-model="minimumAge" :checked="minimumAge" /> <input id="checkbox2" type="checkbox" v-model="minimumAge" :checked="minimumAge" />
@ -103,7 +107,7 @@
></label> ></label>
</ds-text> </ds-text>
<base-button <base-button
style="float: right;" style="float: right"
icon="check" icon="check"
type="submit" type="submit"
filled filled
@ -125,12 +129,13 @@
</template> </template>
<script> <script>
import links from '~/constants/links'
import PasswordStrength from '../Password/Strength' import PasswordStrength from '../Password/Strength'
import { SweetalertIcon } from 'vue-sweetalert-icons' import { SweetalertIcon } from 'vue-sweetalert-icons'
import PasswordForm from '~/components/utils/PasswordFormHelper' import PasswordForm from '~/components/utils/PasswordFormHelper'
import { SUPPORT_EMAIL } from '~/constants/emails.js'
import { VERSION } from '~/constants/terms-and-conditions-version.js' import { VERSION } from '~/constants/terms-and-conditions-version.js'
import { SignupVerificationMutation } from '~/graphql/Registration.js' import { SignupVerificationMutation } from '~/graphql/Registration.js'
import emails from '~/constants/emails'
export default { export default {
components: { components: {
@ -140,7 +145,8 @@ export default {
data() { data() {
const passwordForm = PasswordForm({ translate: this.$t }) const passwordForm = PasswordForm({ translate: this.$t })
return { return {
supportEmail: SUPPORT_EMAIL, links,
supportEmail: emails.SUPPORT,
formData: { formData: {
name: '', name: '',
about: '', about: '',

View File

@ -8,7 +8,11 @@
@submit="handleSubmit" @submit="handleSubmit"
> >
<h1> <h1>
{{ invitation ? $t('profile.invites.title') : $t('components.registration.signup.title') }} {{
invitation
? $t('profile.invites.title', metadata)
: $t('components.registration.signup.title', metadata)
}}
</h1> </h1>
<ds-space v-if="token" margin-botton="large"> <ds-space v-if="token" margin-botton="large">
<ds-text v-html="$t('registration.signup.form.invitation-code', { code: token })" /> <ds-text v-html="$t('registration.signup.form.invitation-code', { code: token })" />
@ -64,6 +68,7 @@
<script> <script>
import gql from 'graphql-tag' import gql from 'graphql-tag'
import metadata from '~/constants/metadata'
import { SweetalertIcon } from 'vue-sweetalert-icons' import { SweetalertIcon } from 'vue-sweetalert-icons'
export const SignupMutation = gql` export const SignupMutation = gql`
@ -91,6 +96,7 @@ export default {
}, },
data() { data() {
return { return {
metadata,
formData: { formData: {
email: '', email: '',
}, },

View File

@ -10,7 +10,7 @@
/> />
<ds-space margin-bottom="xx-small" /> <ds-space margin-bottom="xx-small" />
<ds-text color="soft" class="shout-button-text"> <ds-text color="soft" class="shout-button-text">
<ds-heading style="display: inline;" tag="h3">{{ shoutedCount }}x</ds-heading> <ds-heading style="display: inline" tag="h3">{{ shoutedCount }}x</ds-heading>
{{ $t('shoutButton.shouted') }} {{ $t('shoutButton.shouted') }}
</ds-text> </ds-text>
</ds-space> </ds-space>

View File

@ -33,7 +33,7 @@ storiesOf('Generic/BaseCard', module)
template: ` template: `
<base-card style="width: 600px;"> <base-card style="width: 600px;">
<template #imageColumn> <template #imageColumn>
<img class="image" src="/img/sign-up/humanconnection.svg" /> <img class="image" alt="Example image" src="/img/custom/welcome.svg" />
</template> </template>
<h2 class="title">I am a card heading</h2> <h2 class="title">I am a card heading</h2>
<p>And I am a paragraph.</p> <p>And I am a paragraph.</p>
@ -46,7 +46,7 @@ storiesOf('Generic/BaseCard', module)
template: ` template: `
<base-card style="width: 600px;"> <base-card style="width: 600px;">
<template #imageColumn> <template #imageColumn>
<img class="image" src="/img/sign-up/humanconnection.svg" /> <img class="image" alt="Example image" src="/img/custom/welcome.svg" />
</template> </template>
<h2 class="title">I am a card heading</h2> <h2 class="title">I am a card heading</h2>
<p>And I am a paragraph.</p> <p>And I am a paragraph.</p>

View File

@ -1,4 +1,4 @@
export const SUPPORT_EMAIL = { export default {
href: 'mailto:support@human-connection.org', SUPPORT: 'devops@ocelot.social',
label: 'support@human-connection.org', MODERATION: 'devops@ocelot.social',
} }

View File

@ -0,0 +1,6 @@
export default {
ORGANIZATION: 'https://ocelot.social',
DONATE: 'https://ocelot-social.herokuapp.com/donations',
FAQ: 'https://ocelot.social',
SUPPORT: 'https://ocelot.social',
}

View File

@ -0,0 +1,9 @@
import metadata from './metadata.js'
const { APPLICATION_NAME, APPLICATION_SHORT_NAME, APPLICATION_DESCRIPTION } = metadata
export default {
name: APPLICATION_NAME,
short_name: APPLICATION_SHORT_NAME,
description: APPLICATION_DESCRIPTION,
theme_color: '#17b53f',
lang: 'en',
}

View File

@ -0,0 +1,7 @@
export default {
APPLICATION_NAME: 'ocelot.social',
APPLICATION_SHORT_NAME: 'ocelot',
APPLICATION_DESCRIPTION: 'ocelot.social Community Network',
ORGANIZATION_NAME: 'ocelot.social Community',
ORGANIZATION_JURISDICTION: 'City of Angels',
}

View File

@ -1,22 +1,22 @@
<template> <template>
<div class="layout-blank"> <div class="layout-blank">
<div class="main-navigation"> <div class="main-navigation">
<ds-container width="x-large" class="main-navigation-container" style="padding: 10px 10px;"> <ds-container width="x-large" class="main-navigation-container" style="padding: 10px 10px">
<ds-flex class="main-navigation-flex" centered> <ds-flex class="main-navigation-flex" centered>
<ds-flex-item width="5.5%" /> <ds-flex-item width="5.5%" />
<ds-flex-item style="flex-grow: 1;" width="20%"> <ds-flex-item style="flex-grow: 1" width="20%">
<a @click="redirectToRoot"> <a @click="redirectToRoot">
<ds-logo /> <logo />
</a> </a>
</ds-flex-item> </ds-flex-item>
<ds-flex-item width="20%" style="flex-grow: 0;"> <ds-flex-item width="20%" style="flex-grow: 0">
<locale-switch class="topbar-locale-switch" placement="top" offset="16" /> <locale-switch class="topbar-locale-switch" placement="top" offset="16" />
</ds-flex-item> </ds-flex-item>
</ds-flex> </ds-flex>
</ds-container> </ds-container>
</div> </div>
<ds-container> <ds-container>
<div style="padding: 5rem 2rem;"> <div style="padding: 5rem 2rem">
<nuxt /> <nuxt />
</div> </div>
</ds-container> </ds-container>
@ -26,12 +26,14 @@
</template> </template>
<script> <script>
import Logo from '~/components/Logo/Logo'
import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch' import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
import seo from '~/mixins/seo' import seo from '~/mixins/seo'
import PageFooter from '~/components/PageFooter/PageFooter' import PageFooter from '~/components/PageFooter/PageFooter'
export default { export default {
components: { components: {
Logo,
LocaleSwitch, LocaleSwitch,
PageFooter, PageFooter,
}, },

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="layout-blank"> <div class="layout-blank">
<ds-container> <ds-container>
<div style="padding: 5rem 2rem;"> <div style="padding: 5rem 2rem">
<nuxt /> <nuxt />
</div> </div>
</ds-container> </ds-container>

View File

@ -1,12 +1,12 @@
<template> <template>
<div class="layout-default"> <div class="layout-default">
<div class="main-navigation"> <div class="main-navigation">
<ds-container class="main-navigation-container" style="padding: 10px 10px;"> <ds-container class="main-navigation-container" style="padding: 10px 10px">
<div> <div>
<ds-flex class="main-navigation-flex"> <ds-flex class="main-navigation-flex">
<ds-flex-item :width="{ base: '142px' }"> <ds-flex-item :width="{ base: '142px' }">
<nuxt-link :to="{ name: 'index' }" v-scroll-to="'.main-navigation'"> <nuxt-link :to="{ name: 'index' }" v-scroll-to="'.main-navigation'">
<ds-logo /> <logo />
</nuxt-link> </nuxt-link>
</ds-flex-item> </ds-flex-item>
<ds-flex-item <ds-flex-item
@ -18,7 +18,7 @@
<ds-flex-item <ds-flex-item
:width="{ base: '45%', sm: '45%', md: '45%', lg: '50%' }" :width="{ base: '45%', sm: '45%', md: '45%', lg: '50%' }"
:class="{ 'hide-mobile-menu': !toggleMobileMenu }" :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
style="flex-shrink: 0; flex-grow: 1;" style="flex-shrink: 0; flex-grow: 1"
id="nav-search-box" id="nav-search-box"
v-if="isLoggedIn" v-if="isLoggedIn"
> >
@ -27,14 +27,14 @@
<ds-flex-item <ds-flex-item
v-if="isLoggedIn" v-if="isLoggedIn"
:class="{ 'hide-mobile-menu': !toggleMobileMenu }" :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
style="flex-grow: 0; flex-basis: auto;" style="flex-grow: 0; flex-basis: auto"
> >
<client-only> <client-only>
<filter-menu v-show="showFilterMenuDropdown" /> <filter-menu v-show="showFilterMenuDropdown" />
</client-only> </client-only>
</ds-flex-item> </ds-flex-item>
<ds-flex-item <ds-flex-item
style="background-color: white; flex-basis: auto;" style="background-color: white; flex-basis: auto"
:class="{ 'hide-mobile-menu': !toggleMobileMenu }" :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
> >
<div <div
@ -43,7 +43,7 @@
'desktop-view': !toggleMobileMenu, 'desktop-view': !toggleMobileMenu,
'hide-mobile-menu': !toggleMobileMenu, 'hide-mobile-menu': !toggleMobileMenu,
}" }"
style="flex-basis: auto;" style="flex-basis: auto"
> >
<locale-switch class="topbar-locale-switch" placement="top" offset="8" /> <locale-switch class="topbar-locale-switch" placement="top" offset="8" />
<template v-if="isLoggedIn"> <template v-if="isLoggedIn">
@ -74,6 +74,7 @@
</template> </template>
<script> <script>
import Logo from '~/components/Logo/Logo'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch' import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
import SearchField from '~/components/features/SearchField/SearchField.vue' import SearchField from '~/components/features/SearchField/SearchField.vue'
@ -86,6 +87,7 @@ import AvatarMenu from '~/components/AvatarMenu/AvatarMenu'
export default { export default {
components: { components: {
Logo,
LocaleSwitch, LocaleSwitch,
SearchField, SearchField,
Modal, Modal,

View File

@ -1,7 +1,7 @@
<template> <template>
<div class="layout-blank"> <div class="layout-blank">
<ds-container> <ds-container>
<div style="padding: 5rem 2rem;"> <div style="padding: 5rem 2rem">
<nuxt /> <nuxt />
</div> </div>
</ds-container> </ds-container>

View File

@ -76,54 +76,7 @@
} }
}, },
"code-of-conduct": { "code-of-conduct": {
"consequences": { "subheader": "für das Soziale Netzwerk von {ORGANIZATION_NAME}"
"description": "Wenn ein Gemeinschaftsmitglied inakzeptables Verhalten an den Tag legt, können die verantwortlichen Betreiber, Moderatoren und Administratoren des Netzwerks angemessene Maßnahmen ergreifen, u.a.:",
"list": {
"0": "Aufforderung zum sofortigen Abstellen des inakzeptablen Verhaltens",
"1": "Sperren oder Löschen von Kommentaren",
"2": "Vorübergehender Ausschluss aus dem jeweiligen Beitrag",
"3": "Sperren bzw. Löschen von Inhalten",
"4": "Vorübergehender Entzug von Schreibrechten",
"5": "Vorübergehender Ausschluss aus dem Netzwerk",
"6": "Endgültiger Ausschluss aus dem Netzwerk",
"7": "Verstöße gegen deutsches Recht können zur Anzeige gebracht werden."
},
"title": "Konsequenzen inakzeptablen Verhaltens"
},
"expected-behaviour": {
"description": "Die folgenden Verhaltensweisen werden von allen Community-Mitgliedern erwartet und gefordert:",
"list": {
"0": "Sei rücksichtsvoll und respektvoll, bei dem, was Du schreibst und tust.",
"1": "Versuche auf andere zuzugehen, bevor ein Konflikt entsteht.",
"2": "Vermeide erniedrigende, diskriminierende oder belästigende Verhaltensweisen und Ausdrücke.",
"3": "Achte Dein Umfeld und Deine Mitmenschen. Warne die Verantwortlichen der Community, falls Du eine gefährliche Situation, jemanden in Not oder Verstöße gegen diesen Verhaltenskodex bemerkst, auch wenn diese unbedeutend erscheinen."
},
"title": "Erwartetes Verhalten"
},
"get-help": "Wenn Du einem inakzeptablen Verhalten ausgesetzt bist, es miterlebst oder andere Bedenken hast, benachrichtige bitte so schnell wie möglich einen Organisator der Gemeinschaft und verlinke oder verweise auf den entsprechenden Inhalt:",
"preamble": {
"description": "Human Connection ist ein gemeinnütziges soziales Wissens- und Aktionsnetzwerk der nächsten Generation. Von Menschen für Menschen. Open Source, fair und transparent. Für positiven lokalen und globalen Wandel in allen Lebensbereichen. Wir gestalten den öffentlichen Austausch von Wissen, Ideen und Projekten völlig neu. Die Funktionen von Human Connection bringen die Menschen zusammen offline und online so dass wir die Welt zu einem besseren Ort machen können.",
"title": "Präambel"
},
"purpose": {
"description": "Mit diesen Verhaltensregeln regeln wir die wesentlichen Grundsätze für das Verhalten in unserem Sozialen Netzwerk. Dabei ist die Menschenrechtscharta der Vereinten Nationen unsere Orientierung und bildet das Herz unseres Werteverständnisses. Die Verhaltensregeln dienen als Leitsätze für den persönlichen Auftritt und den Umgang untereinander. Wer als Nutzer im Human Connection Netzwerk aktiv ist, Beiträge verfasst, kommentiert oder mit anderen Nutzern, auch außerhalb des Netzwerkes, Kontakt aufnimmt, erkennt diese Verhaltensregeln als verbindlich an.",
"title": "Zweck"
},
"subheader": "für das Soziale Netzwerk der Human Connection gGmbH",
"unacceptable-behaviour": {
"description": "Die folgenden Verhaltensweisen sind in unserer Community inakzeptabel:",
"list": {
"0": "Diskriminierende Beiträge, Kommentare, Äußerungen oder Beleidigungen, insbesondere solche, die sich auf Geschlecht, sexuelle Orientierung, Rasse, Religion, politische oder weltanschauliche Ausrichtung oder Behinderung beziehen.",
"1": "Das Senden oder Verlinken eindeutig pornografischen Materials.",
"2": "Verherrlichung oder Verharmlosung grausamer oder unmenschlicher Gewalttätigkeiten.",
"3": "Das Veröffentlichen von personenbezogenen Daten anderer ohne deren Einverständnis oder das Androhen dessen („Doxing“).",
"4": "Absichtliche Einschüchterung, Stalking oder Verfolgung.",
"5": "Bewerben von Produkten und Dienstleistungen mit kommerzieller Absicht.",
"6": "Strafbares Verhalten bzw. Verstoß gegen deutsches Recht.",
"7": "Befürwortung oder Ermutigung zu diesen Verhaltensweisen."
},
"title": "Nichtakzeptables Verhalten"
}
}, },
"comment": { "comment": {
"content": { "content": {
@ -197,7 +150,7 @@
}, },
"signup": { "signup": {
"form": { "form": {
"data-privacy": "Ich habe die <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Datenschutzerklärung</ds-text></a> gelesen und verstanden", "data-privacy": "Ich habe die <a href=\"/data-privacy\" target=\"_blank\"><ds-text bold color=\"primary\">Datenschutzerklärung</ds-text></a> gelesen und verstanden",
"description": "Um loszulegen, kannst Du Dich hier kostenfrei registrieren:", "description": "Um loszulegen, kannst Du Dich hier kostenfrei registrieren:",
"errors": { "errors": {
"email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail-Adresse!", "email-exists": "Es gibt schon ein Benutzerkonto mit dieser E-Mail-Adresse!",
@ -209,9 +162,9 @@
"no-political": "Ich bin nicht im Auftrag einer Partei oder politischen Organisation im Netzwerk.", "no-political": "Ich bin nicht im Auftrag einer Partei oder politischen Organisation im Netzwerk.",
"submit": "Konto erstellen", "submit": "Konto erstellen",
"success": "Eine E-Mail mit einem Link zum Abschließen Deiner Registrierung wurde an <b>{email}</b> geschickt", "success": "Eine E-Mail mit einem Link zum Abschließen Deiner Registrierung wurde an <b>{email}</b> geschickt",
"terms-and-condition": "Ich stimme den <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" >Nutzungsbedingungen</ds-text></a> zu." "terms-and-condition": "Ich stimme den <a href=\"/terms-and-conditions\" target=\"_blank\"><ds-text bold color=\"primary\">Nutzungsbedingungen</ds-text></a> zu."
}, },
"title": "Mach mit bei Human Connection!", "title": "Mach mit bei {APPLICATION_NAME}!",
"unavailable": "Leider ist die öffentliche Registrierung von Benutzerkonten auf diesem Server derzeit nicht möglich." "unavailable": "Leider ist die öffentliche Registrierung von Benutzerkonten auf diesem Server derzeit nicht möglich."
} }
} }
@ -252,7 +205,6 @@
"filterALL": "Alle Beiträge anzeigen", "filterALL": "Alle Beiträge anzeigen",
"filterFollow": "Beiträge von Benutzern filtern, denen ich folge", "filterFollow": "Beiträge von Benutzern filtern, denen ich folge",
"inappropriatePicture": "Dieses Bild kann für einige Menschen unangemessen sein.", "inappropriatePicture": "Dieses Bild kann für einige Menschen unangemessen sein.",
"inappropriatePictureText": "Wann sollte mein Beitragsbild verschwommen sein?",
"languageSelectLabel": "Sprache Deines Beitrags", "languageSelectLabel": "Sprache Deines Beitrags",
"languageSelectText": "Sprache wählen", "languageSelectText": "Sprache wählen",
"newPost": "Erstelle einen neuen Beitrag", "newPost": "Erstelle einen neuen Beitrag",
@ -354,16 +306,14 @@
"no-results": "Keine Beiträge gefunden." "no-results": "Keine Beiträge gefunden."
}, },
"login": { "login": {
"copy": "Falls Du bereits ein Konto bei Human Connection hast, melde Dich bitte hier an.",
"email": "Deine E-Mail", "email": "Deine E-Mail",
"failure": "Fehlerhafte E-Mail-Adresse oder Passwort.", "failure": "Fehlerhafte E-Mail-Adresse oder Passwort.",
"forgotPassword": "Passwort vergessen?", "forgotPassword": "Passwort vergessen?",
"hello": "Hallo", "hello": "Hallo",
"login": "Anmelden", "login": "Anmelden",
"logout": "Abmelden", "logout": "Abmelden",
"moreInfo": "Was ist Human Connection?", "moreInfo": "Was ist {APPLICATION_NAME}?",
"moreInfoHint": "zur Präsentationsseite", "moreInfoHint": "zur Präsentationsseite",
"moreInfoURL": "https://human-connection.org",
"no-account": "Du hast noch kein Benutzerkonto?", "no-account": "Du hast noch kein Benutzerkonto?",
"password": "Dein Passwort", "password": "Dein Passwort",
"register": "Benutzerkonto erstellen", "register": "Benutzerkonto erstellen",
@ -372,7 +322,7 @@
"maintenance": { "maintenance": {
"explanation": "Derzeit führen wir einige geplante Wartungsarbeiten durch, bitte versuche es später erneut.", "explanation": "Derzeit führen wir einige geplante Wartungsarbeiten durch, bitte versuche es später erneut.",
"questions": "Bei Fragen oder Problemen erreichst Du uns per E-Mail an", "questions": "Bei Fragen oder Problemen erreichst Du uns per E-Mail an",
"title": "Human Connection befindet sich in der Wartung" "title": "{APPLICATION_NAME} befindet sich in der Wartung"
}, },
"modals": { "modals": {
"deleteUser": { "deleteUser": {
@ -504,7 +454,7 @@
"invites": { "invites": {
"description": "Zur Einladung die E-Mail-Adresse hier eintragen.", "description": "Zur Einladung die E-Mail-Adresse hier eintragen.",
"emailPlaceholder": "E-Mail-Adresse für die Einladung", "emailPlaceholder": "E-Mail-Adresse für die Einladung",
"title": "Lade jemanden zu Human Connection ein!" "title": "Lade jemanden zu {APPLICATION_NAME} ein!"
}, },
"memberSince": "Mitglied seit", "memberSince": "Mitglied seit",
"name": "Mein Profil", "name": "Mein Profil",
@ -793,51 +743,11 @@
} }
}, },
"termsAndConditions": { "termsAndConditions": {
"addition": {
"description": "<a href=\"https://human-connection.org/veranstaltungen/\" target=\"_blank\" > https://human-connection.org/veranstaltungen/ </a>",
"title": "Zusätzlich veranstalten wir regelmäßig Ereignisse, wo Du auch Eindrücke teilen und Fragen stellen kannst. Du findest eine aktuelle Übersicht hier:"
},
"agree": "Ich stimme zu!", "agree": "Ich stimme zu!",
"code-of-conduct": {
"description": "Unser Verhaltenskodex dient als Leitfaden für das persönliche Auftreten und den Umgang miteinander. Wer als Nutzer im Human Connection-Netzwerk aktiv ist, Beiträge verfasst, kommentiert oder mit anderen Nutzern, auch außerhalb des Netzwerkes, Kontakt aufnimmt, erkennt diese Verhaltensregeln als verbindlich an. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\">https://alpha.human-connection.org/code-of-conduct</a>",
"title": "Verhaltenscodex"
},
"errors-and-feedback": {
"description": "Wir sind sehr bemüht, unser Netzwerk und unsere Daten sicher und abrufbar zu erhalten. Jede neue Version der Software durchläuft sowohl automatisierte als auch manuelle Tests. Es können jedoch unvorhergesehene Fehler auftreten. Deshalb sind wir dankbar für jeden gemeldeten Fehler. Du kannst gerne jeden von Dir entdeckten Fehler dem Support/der Hilfe-Assistenz mitteilen: support@human-connection.org",
"title": "Fehler und Rückmeldungen"
},
"help-and-questions": {
"description": "Für Hilfe und Fragen haben wir Dir eine umfassende Sammlung an häufig gestellten Fragen und Antworten (FAQ) zusammengestellt; Du findest diese auf <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > support.human-connection.org/kb/ </a>",
"title": "Hilfe und Fragen"
},
"moderation": {
"description": "Bis unsere finanziellen Möglichkeiten uns erlauben, das Community-Moderationssystem zu implementieren, moderieren wir mit einem vereinfachten System und eigenen bzw. ggf. ehrenamtlichen Mitarbeitern. Wir schulen diese Moderatoren und aus diesem Grund treffen auch nur diese entsprechende Entscheidungen. Diese Moderatoren führen Ihre Tätigkeit anonym aus. Du kannst uns Beiträge, Kommentare und auch Nutzer melden (wenn diese zum Beispiel in ihrem Profil Angaben machen oder Bilder haben, die diese Nutzungsbedingungen verletzen). Wenn Du uns etwas meldest, kannst Du einen Meldegrund angeben und noch eine kurze Erläuterung mitgeben. Wir schauen uns dann das Gemeldete an und sanktionieren ggf., z.B. indem wir Beiträge, Kommentare oder Nutzer sperren. Du und auch der Betroffene erhält derzeitig von uns leider noch keine Rückmeldung, das ist aber in Planung. Unabhängig davon behalten wir uns prinzipiell Sanktionen vor aus Gründen, die unter Umständen nicht oder noch nicht in unserem Verhaltenscodex oder diesen Nutzungsbedingungen aufgeführt sind.",
"title": "Moderation"
},
"newTermsAndConditions": "Neue Nutzungsbedingungen", "newTermsAndConditions": "Neue Nutzungsbedingungen",
"no-commercial-use": { "termsAndConditionsConfirmed": "Ich habe die Nutzungsbedingungen durchgelesen und stimme ihnen zu.",
"description": "Die Nutzung des Human Connection Netzwerkes ist nicht gestattet für kommerzielle Nutzung. Darunter fällt unter anderem das Bewerben von Produkten mit kommerzieller Absicht, das Einstellen von Affiliate-Links (Geschäftspartner-Links), direkter Aufruf zu Spenden oder finanzieller Unterstützung für Zwecke, die steuerlich nicht als gemeinnützig anerkannt sind.",
"title": "Keine kommerzielle Nutzung"
},
"no-parties": {
"description": "Nutzerkonten von politischen Parteien oder offizielle Nutzerkonten eines politischen Vertreters sind unzulässig.",
"title": "Keine politische Nutzung"
},
"privacy-statement": {
"description": "Unser Netzwerk ist ein soziales Wissens- und Aktionsnetzwerk. Daher ist es uns besonders wichtig, dass möglichst viele Inhalte öffentlich zugänglich sind. Im Laufe der Entwicklung unseres Netzwerkes wird es mehr und mehr die Möglichkeit geben, über die Sichtbarkeit der selbst angegebenen bzw. persönlichen Daten zu entscheiden. Über diese neuen Funktionen werden wir Euch informieren. Ansonsten gilt, dass Du immer darüber nachdenken solltest, welche persönlichen Daten Du über Dich (oder andere) preisgibst. Dies gilt insbesondere für Inhalte von Beiträgen und Kommentaren, da diese einen weitgehend öffentlichen Charakter haben. Später wird es Möglichkeiten geben, die Sichtbarkeit Deines Profils einzuschränken. Teil der Nutzungsbedingungen ist unsere Datenschutzerklärung, die Dich über die einzelnen Datenverarbeitungen in unserem Netzwerk informiert: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\">https://human-connection.org/datenschutz/#netzwerk</a> bzw. <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a>. Unsere Datenschutzerklärung ist an die Gesetzeslage und die Charakteristika unseres Netzwerks angepasst und gilt immer in der aktuellsten Version.",
"title": "Datenschutz"
},
"terms-of-service": {
"description": "Die folgenden Nutzungsbedingungen sind Basis für die Nutzung unseres Netzwerkes. Beim Registrieren musst Du sie anerkennen und wir werden Dich auch später über ggf. stattfindende Änderungen informieren. Das Human Connection Netzwerk wird in Deutschland betrieben und unterliegt daher deutschem Recht. Gerichtsstand ist Kirchheim / Teck. Zu Details schau in unser Impressum: <a href=\"https://human-connection.org/impressum/\" target=\"_blank\" >https://human-connection.org/impressum/</a>",
"title": "Nutzungsbedingungen"
},
"termsAndConditionsConfirmed": "Ich habe die <a href=\"/terms-and-conditions\" target=\"_blank\">Nutzungsbedingungen</a> durchgelesen und stimme ihnen zu.",
"termsAndConditionsNewConfirm": "Ich habe die neuen Nutzungsbedingungen durchgelesen und stimme zu.", "termsAndConditionsNewConfirm": "Ich habe die neuen Nutzungsbedingungen durchgelesen und stimme zu.",
"termsAndConditionsNewConfirmText": "Bitte lies Dir die neuen Nutzungsbedingungen jetzt durch!", "termsAndConditionsNewConfirmText": "Bitte lies Dir die neuen Nutzungsbedingungen jetzt durch!"
"use-and-license": {
"description": "Sind Inhalte, die Du bei uns einstellst, durch Rechte am geistigen Eigentum geschützt, erteilst Du uns eine nicht-exklusive, übertragbare, unterlizenzierbare und weltweite Lizenz für die Nutzung dieser Inhalte für die Bereitstellung in unserem Netzwerk. Diese Lizenz endet, sobald Du Deine Inhalte oder Deinen ganzen Account löscht. Bedenke, dass andere Deine Inhalte weiter teilen können und wir diese nicht löschen können.",
"title": "Nutzung und Lizenz"
}
}, },
"user": { "user": {
"avatar": { "avatar": {

View File

@ -76,54 +76,7 @@
} }
}, },
"code-of-conduct": { "code-of-conduct": {
"consequences": { "subheader": "for the social network of {ORGANIZATION_NAME}"
"description": "If a community member exhibits unacceptable behaviour, the responsible operators, moderators and administrators of the network may take appropriate measures, including but not limited to:",
"list": {
"0": "Request for immediate cessation of unacceptable conduct",
"1": "Locking or deleting comments",
"2": "Temporary exclusion from the respective post or contribution",
"3": "Blocking or deleting of content",
"4": "Temporary withdrawal of write permissions",
"5": "Temporary exclusion from the network",
"6": "Final exclusion from the network",
"7": "Violations of German law can be reported."
},
"title": "Consequences of Unacceptable Behavior"
},
"expected-behaviour": {
"description": "The following behaviors are expected and requested of all community members:",
"list": {
"0": "Exercise consideration and respect in your speech and actions.",
"1": "Attempt collaboration before conflict.",
"2": "Refrain from demeaning, discriminatory, or harassing behavior and speech.",
"3": "Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice a dangerous situation, someone in distress, or violations of this Code of Conduct, even if they seem inconsequential."
},
"title": "Expected Behaviour"
},
"get-help": "If you are subject to or witness unacceptable behavior, or have any other concerns, please notify a community organizer as soon as possible and link or refer to the corresponding content:",
"preamble": {
"description": "Human Connection is a non-profit social knowledge and action network of the next generation. By people - for people. Open Source, fair and transparent. For positive local and global change in all areas of life. We completely redesign the public exchange of knowledge, ideas and projects. The functions of Human Connection bring people together - offline and online - so that we can make the world a better place.",
"title": "Preamble"
},
"purpose": {
"description": "With these code of conduct we regulate the essential principles for behavior in our social network. The United Nations Charter of Human Rights is our orientation and forms the heart of our understanding of values. The code of conduct serves as guiding principles for our personal appearance and interaction with one another. Anyone who is active as a user in the Human Connection Network, writes articles, comments or contacts other users, including those outside the network,acknowledges these rules of conduct as binding.",
"title": "Purpose"
},
"subheader": "for the social network of the Human Connection gGmbH",
"unacceptable-behaviour": {
"description": "The following behaviors are unacceptable within our community:",
"list": {
"0": "Discriminatory posts, comments, utterances or insults, particularly those relating to gender, sexual orientation, race, religion, political or philosophical orientation or disability.",
"1": "Posting or linking of clearly pornographic material.",
"2": "Glorification or trivialization of cruel or inhuman acts of violence.",
"3": "The disclosure of others' personal information without their consent or threat there of (\"doxing\").",
"4": "Intentional intimidation, stalking or persecution.",
"5": "Advertising products and services with commercial intent.",
"6": "Criminal behavior or violation of German law.",
"7": "Endorse or encourage such conduct."
},
"title": "Unacceptable Behavior"
}
}, },
"comment": { "comment": {
"content": { "content": {
@ -197,7 +150,7 @@
}, },
"signup": { "signup": {
"form": { "form": {
"data-privacy": " I have read and understood the <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Privacy Statement</ds-text></a> ", "data-privacy": "I have read and understood the <a href=\"/data-privacy\" target=\"_blank\"><ds-text bold color=\"primary\">Privacy Statement</ds-text></a>.",
"description": "To get started, you can register here for free:", "description": "To get started, you can register here for free:",
"errors": { "errors": {
"email-exists": "There is already a user account with this e-mail address!", "email-exists": "There is already a user account with this e-mail address!",
@ -209,9 +162,9 @@
"no-political": "I am not on behalf of a party or political organization in the network.", "no-political": "I am not on behalf of a party or political organization in the network.",
"submit": "Create an account", "submit": "Create an account",
"success": "A mail with a link to complete your registration has been sent to <b>{email}</b>", "success": "A mail with a link to complete your registration has been sent to <b>{email}</b>",
"terms-and-condition": "I confirm to the <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Terms and conditions</ds-text></a>." "terms-and-condition": "I confirm to the <a href=\"/terms-and-conditions\" target=\"_blank\"><ds-text bold color=\"primary\">Terms and conditions</ds-text></a>."
}, },
"title": "Join Human Connection!", "title": "Join {APPLICATION_NAME}!",
"unavailable": "Unfortunately, public registration of user accounts is not available right now on this server." "unavailable": "Unfortunately, public registration of user accounts is not available right now on this server."
} }
} }
@ -252,7 +205,6 @@
"filterALL": "View all contributions", "filterALL": "View all contributions",
"filterFollow": "Filter contributions from users I follow", "filterFollow": "Filter contributions from users I follow",
"inappropriatePicture": "This image may be inappropriate for some people.", "inappropriatePicture": "This image may be inappropriate for some people.",
"inappropriatePictureText": "When should my picture be blurred",
"languageSelectLabel": "Language of your contribution", "languageSelectLabel": "Language of your contribution",
"languageSelectText": "Select Language", "languageSelectText": "Select Language",
"newPost": "Create a new Post", "newPost": "Create a new Post",
@ -354,16 +306,14 @@
"no-results": "No contributions found." "no-results": "No contributions found."
}, },
"login": { "login": {
"copy": "If you already have a human-connection account, please login.",
"email": "Your E-mail", "email": "Your E-mail",
"failure": "Incorrect email address or password.", "failure": "Incorrect email address or password.",
"forgotPassword": "Forgot Password?", "forgotPassword": "Forgot Password?",
"hello": "Hello", "hello": "Hello",
"login": "Login", "login": "Login",
"logout": "Logout", "logout": "Logout",
"moreInfo": "What is Human Connection?", "moreInfo": "What is {APPLICATION_NAME}?",
"moreInfoHint": "to the presentation page", "moreInfoHint": "to the presentation page",
"moreInfoURL": "https://human-connection.org/en/",
"no-account": "Don't have an account?", "no-account": "Don't have an account?",
"password": "Your Password", "password": "Your Password",
"register": "Sign up", "register": "Sign up",
@ -372,7 +322,7 @@
"maintenance": { "maintenance": {
"explanation": "At the moment we are doing some scheduled maintenance, please try again later.", "explanation": "At the moment we are doing some scheduled maintenance, please try again later.",
"questions": "Any Questions or concerns, send an e-mail to", "questions": "Any Questions or concerns, send an e-mail to",
"title": "Human Connection is under maintenance" "title": "{APPLICATION_NAME} is under maintenance"
}, },
"modals": { "modals": {
"deleteUser": { "deleteUser": {
@ -504,7 +454,7 @@
"invites": { "invites": {
"description": "Enter their e-mail address for invitation.", "description": "Enter their e-mail address for invitation.",
"emailPlaceholder": "E-mail to invite", "emailPlaceholder": "E-mail to invite",
"title": "Invite somebody to Human Connection!" "title": "Invite somebody to {APPLICATION_NAME}!"
}, },
"memberSince": "Member since", "memberSince": "Member since",
"name": "My Profile", "name": "My Profile",
@ -793,51 +743,11 @@
} }
}, },
"termsAndConditions": { "termsAndConditions": {
"addition": {
"description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>",
"title": "In addition, we regularly hold events where you can also share your impressions and ask questions. You can find a current overview here:"
},
"agree": "I agree!", "agree": "I agree!",
"code-of-conduct": {
"description": "Our code of conduct serves as a handbook for personal appearance and interaction with each other. Whoever is active as a user in the Human Connection network, writes articles, comments or makes contact with other users, even outside the network, acknowledges these rules of conduct as binding. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct</a>",
"title": "Code of Conduct"
},
"errors-and-feedback": {
"description": "We make every effort to keep our network and data secure and available. Each new release of the software goes through both automated and manual testing. However, unforeseen errors may occur. Therefore, we are grateful for any reported bugs. You are welcome to report any bugs you discover by emailing Support at support@human-connection.org",
"title": "Errors and Feedback"
},
"help-and-questions": {
"description": "For help and questions we have compiled a comprehensive collection of frequently asked questions and answers (FAQ) for you. You can find them here: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > https://support.human-connection.org/kb/ </a>",
"title": "Help and Questions"
},
"moderation": {
"description": "Until our financial possibilities allow us to implement the community moderation system, we moderate with a simplified system and with our own or possibly volunteer staff. We train these moderators and for this reason only they make the appropriate decisions. These moderators carry out their work anonymously. You can report posts, comments and users to us (for example, if they provide information in their profile or have images that violate these Terms of Use). If you report something to us, you can give us a reason and a short explanation. We will then take a look at what you have reported and sanction you if necessary, e.g. by blocking contributions, comments or users. Unfortunately, you and the person concerned will not receive any feedback from us at this time, but this is in the planning stage. Irrespective of this, we reserve the right to impose sanctions in principle for reasons that may not or not yet be listed in our Code of Conduct or these terms of service.",
"title": "Moderation"
},
"newTermsAndConditions": "New Terms and Conditions", "newTermsAndConditions": "New Terms and Conditions",
"no-commercial-use": { "termsAndConditionsConfirmed": "I have read and confirmed the Terms and Conditions.",
"description": "The use of the Human Connection Network is not permitted for commercial purposes. This includes, but is not limited to, advertising products with commercial intent, posting affiliate links, directly soliciting donations, or providing financial support for purposes that are not recognized as charitable for tax purposes.",
"title": "No Commercial Use"
},
"no-parties": {
"description": "User accounts of political parties or official user accounts of a political representative are not permitted.",
"title": "No Political Use"
},
"privacy-statement": {
"description": "Our network is a social knowledge and action network. It is therefore particularly important to us that as much content as possible is publicly accessible. In the course of the development of our network there will be more and more the possibility to decide about the visibility of the personal data. We will inform you about these new features. Otherwise, you should always think about which personal data you disclose about yourself (or others). This applies in particular to the content of posts and comments, as these have a largely public character. Later there will be possibilities to limit the visibility of your profile. Part of the terms of service is our privacy statement, which informs you about the individual data processing operations in our network: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\"> https://human-connection.org/datenschutz/#netzwerk</a> bzw. <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a> Our privacy statement is adapted to the legal situation and characteristics of our network and is always valid in the most current version.",
"title": "Privacy Statement"
},
"terms-of-service": {
"description": "The following terms of use form the basis for the use of our network. When you register, you must accept them and we will inform you later about any changes that may take place. The Human Connection Network is operated in Germany and is therefore subject to German law. Place of jurisdiction is Kirchheim / Teck. For details see our imprint: <a href=\"https://human-connection.org/imprint\" target=\"_blank\" >https://human-connection.org/imprint</a> ",
"title": "Terms of Service"
},
"termsAndConditionsConfirmed": "I have read and confirmed the <a href=\"/terms-and-conditions\" target=\"_blank\">Terms and Conditions</a>.",
"termsAndConditionsNewConfirm": "I have read and agree to the new terms of conditions.", "termsAndConditionsNewConfirm": "I have read and agree to the new terms of conditions.",
"termsAndConditionsNewConfirmText": "Please read the new terms of use now!", "termsAndConditionsNewConfirmText": "Please read the new terms of use now!"
"use-and-license": {
"description": "If any content you post to us is protected by intellectual property rights, you grant us a non-exclusive, transferable, sublicensable, worldwide license to use such content for posting to our network. This license expires when you delete your content or your entire account. Remember that others may share your content and we cannot delete it.",
"title": "Use and License"
}
}, },
"user": { "user": {
"avatar": { "avatar": {

View File

@ -76,54 +76,7 @@
} }
}, },
"code-of-conduct": { "code-of-conduct": {
"consequences": { "subheader": "para la red social de {ORGANIZATION_NAME}"
"description": "Si un miembro de la comunidad muestra un comportamiento inaceptable, los operadores, moderadores y administradores responsables de la red pueden tomar las medidas apropiadas, incluyendo pero no limitándose a:",
"list": {
"0": "Solicitud de cese inmediato de conducta inaceptable",
"1": "Bloquear o eliminar comentarios",
"2": "Exclusión temporal de la contribución respectiva",
"3": "Bloqueo o eliminación de contenido",
"4": "Retirada temporal de permisos de escritura",
"5": "Exclusión temporal de la red.",
"6": "Exclusión definitiva de la red",
"7": "Las violaciones de la ley alemana pueden ser denunciadas."
},
"title": "Consecuencias de Comportamiento Inaceptable"
},
"expected-behaviour": {
"description": "Los siguientes comportamientos son esperados y solicitados de todos los miembros de la comunidad:",
"list": {
"0": "Ejercite la consideración y el respeto en su discurso y en sus acciones.",
"1": "Intento de colaboración antes del conflicto.",
"2": "Abstenerse de denigrar, discriminar o acosar la conducta y el habla.",
"3": "Tenga en cuenta su entorno y sus compañeros participantes. Alerte a los líderes de la comunidad si nota una situación peligrosa, alguien en apuros o violaciones de este Código de Conducta, incluso si parecen no tener consecuencias."
},
"title": "Comportamiento esperado"
},
"get-help": "Si usted está sujeto a un comportamiento inaceptable, lo experimenta o tiene otras preocupaciones, por favor notifique a un organizador de la comunidad tan pronto como sea posible y enlace o apunte el contenido relevante:",
"preamble": {
"description": "Human Connection es una red de conocimiento y acción social sin fines de lucro de la próxima generación. Por la gente - para la gente. Código Abierto, justo y transparente. Por un cambio positivo a nivel local y global en todas las áreas de la vida. Rediseñamos completamente el intercambio público de conocimientos, ideas y proyectos. Las funciones de Human Connection unen a las personas - fuera de línea y en línea - para que podamos hacer del mundo un lugar mejor.",
"title": "Preámbulo"
},
"purpose": {
"description": "Con este código de conducta regulamos los principios esenciales de comportamiento en nuestra red social. La Carta de Derechos Humanos de las Naciones Unidas es nuestra orientación y constituye el núcleo de nuestra comprensión de los valores. El código de conducta sirve como principios rectores para nuestra apariencia personal y la interacción entre nosotros. Cualquiera que esté activo como usuario de la Red de Human Connection, escriba artículos, comentarios o se ponga en contacto con otros usuarios, incluidos los que están fuera de la red, reconoce que estas normas de conducta son vinculantes.",
"title": "Propósito"
},
"subheader": "para la red social de Human Connection gGmbH",
"unacceptable-behaviour": {
"description": "Los siguientes comportamientos son inaceptables dentro de nuestra comunidad:",
"list": {
"0": "Publicaciones, comentarios, expresiones o insultos discriminatorios, particularmente aquellos relacionados con género, orientación sexual, raza, religión, orientación política o filosófica o discapacidad.",
"1": "Publicación o enlace de material claramente pornográfico.",
"2": "Glorificación o trivialización de actos de violencia crueles o inhumanos.",
"3": "La divulgación de información personal de otros sin su consentimiento o amenaza de (\"doxing\").",
"4": "Intimidación intencional, acoso o persecución.",
"5": "Publicidad de productos y servicios con fines comerciales.",
"6": "Comportamiento criminal o violación de la ley alemana.",
"7": "Apoyar o alentar dicha conducta."
},
"title": "Comportamiento Inaceptable"
}
}, },
"comment": { "comment": {
"content": { "content": {
@ -197,7 +150,7 @@
}, },
"signup": { "signup": {
"form": { "form": {
"data-privacy": "He leido y entendido la <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >declaración de protección de datos</ds-text></a>", "data-privacy": "He leido y entendido la declaración de protección de datos.",
"description": "Para empezar, introduzca su dirección de correo electrónico:", "description": "Para empezar, introduzca su dirección de correo electrónico:",
"errors": { "errors": {
"email-exists": "¡Ya hay una cuenta de usuario con esta dirección de correo electrónico!", "email-exists": "¡Ya hay una cuenta de usuario con esta dirección de correo electrónico!",
@ -209,9 +162,9 @@
"no-political": "No estoy en la red en nombre de un partido o una organización política.", "no-political": "No estoy en la red en nombre de un partido o una organización política.",
"submit": "Crear una cuenta", "submit": "Crear una cuenta",
"success": "Se ha enviado un correo electrónico con un enlace de confirmación para el registro a <b>{email}</b>.", "success": "Se ha enviado un correo electrónico con un enlace de confirmación para el registro a <b>{email}</b>.",
"terms-and-condition": "Estoy de acuerdo con los <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" >términos de uso</ds-text></a>." "terms-and-condition": "Estoy de acuerdo con los términos de uso."
}, },
"title": "¡Únete a Human Connection!", "title": "¡Únete a {APPLICATION_NAME}!",
"unavailable": "Desafortunadamente, el registro público de cuentas de usuario en este servidor actualmente no es posible." "unavailable": "Desafortunadamente, el registro público de cuentas de usuario en este servidor actualmente no es posible."
} }
} }
@ -250,7 +203,6 @@
"filterALL": "Ver todas las contribuciones", "filterALL": "Ver todas las contribuciones",
"filterFollow": "Filtrar las contribuciones de los usuarios que sigo", "filterFollow": "Filtrar las contribuciones de los usuarios que sigo",
"inappropriatePicture": "Esta imagen puede ser inapropiada para algunas personas.", "inappropriatePicture": "Esta imagen puede ser inapropiada para algunas personas.",
"inappropriatePictureText": "¿Cuándo debería estar borrosa mi foto?",
"languageSelectLabel": "Idioma", "languageSelectLabel": "Idioma",
"languageSelectText": "Seleccione el idioma", "languageSelectText": "Seleccione el idioma",
"newPost": "Crear una nueva contribución", "newPost": "Crear una nueva contribución",
@ -352,16 +304,14 @@
"no-results": "No se han encontrado contribuciones." "no-results": "No se han encontrado contribuciones."
}, },
"login": { "login": {
"copy": "Si ya tiene una cuenta de Human Connection, inicie sesión aquí.",
"email": "Su correo electrónico", "email": "Su correo electrónico",
"failure": "Dirección de correo electrónico o contraseña incorrecta.", "failure": "Dirección de correo electrónico o contraseña incorrecta.",
"forgotPassword": "¿Olvidó su contraseña?", "forgotPassword": "¿Olvidó su contraseña?",
"hello": "Hola", "hello": "Hola",
"login": "Iniciar sesión", "login": "Iniciar sesión",
"logout": "Cierre de sesión", "logout": "Cierre de sesión",
"moreInfo": "¿Qué es Human Connection?", "moreInfo": "¿Qué es {APPLICATION_NAME}?",
"moreInfoHint": "a la página de presentación", "moreInfoHint": "a la página de presentación",
"moreInfoURL": "https://human-connection.org/es/",
"no-account": "¿No tiene una cuenta?", "no-account": "¿No tiene una cuenta?",
"password": "Su contraseña", "password": "Su contraseña",
"register": "Regístrese", "register": "Regístrese",
@ -370,7 +320,7 @@
"maintenance": { "maintenance": {
"explanation": "Actualmente estamos llevando a cabo algunos trabajos de mantenimiento planificados, por favor, inténtelo de nuevo más tarde.", "explanation": "Actualmente estamos llevando a cabo algunos trabajos de mantenimiento planificados, por favor, inténtelo de nuevo más tarde.",
"questions": "Si tiene alguna pregunta o problema, por favor contáctenos por correo electrónico a", "questions": "Si tiene alguna pregunta o problema, por favor contáctenos por correo electrónico a",
"title": "Human Connection está en mantenimiento" "title": "{APPLICATION_NAME} está en mantenimiento"
}, },
"moderation": { "moderation": {
"name": "Moderación", "name": "Moderación",
@ -497,7 +447,7 @@
"invites": { "invites": {
"description": "Introduzca la dirección de correo electrónico para la invitación.", "description": "Introduzca la dirección de correo electrónico para la invitación.",
"emailPlaceholder": "Correo electrónico para invitar", "emailPlaceholder": "Correo electrónico para invitar",
"title": "¡Invite a alguien a Human Connection!" "title": "¡Invite a alguien a {APPLICATION_NAME}!"
}, },
"memberSince": "Miembro desde", "memberSince": "Miembro desde",
"name": "Mi perfil", "name": "Mi perfil",
@ -779,51 +729,11 @@
} }
}, },
"termsAndConditions": { "termsAndConditions": {
"addition": {
"description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>",
"title": "Además, regularmente celebramos eventos donde también puede dar impresiones y hacer preguntas. Puede encontrar un resumen actualizado aquí:"
},
"agree": "¡Estoy de acuerdo!", "agree": "¡Estoy de acuerdo!",
"code-of-conduct": {
"description": "Nuestro código de conducta sirve como un manual para la apariencia personal y la interacción entre nosotros. Quien esté activo como usuario en la red de Human Connection, escriba artículos, haga comentarios o se ponga en contacto con otros usuarios, incluso fuera de la red, reconoce que estas normas de conducta son vinculantes. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\">https://alpha.human-connection.org/code-of-conduct</a>",
"title": "Código de conducta"
},
"errors-and-feedback": {
"description": "Hacemos todo lo posible para mantener nuestra red y los datos seguros y disponibles. Cada nueva versión del software pasa por pruebas automáticas y manuales. No obstante, pueden producirse errores imprevistos. Por lo tanto, estamos agradecidos por cualquier error reportado. Le invitamos a informar de cualquier error que haya descubierto enviando un correo electrónico a Soporte: support@human-connection.org",
"title": "Errores y comentarios"
},
"help-and-questions": {
"description": "Para ayuda y preguntas hemos compilado una colección completa de preguntas y respuestas frecuentes (FAQ) para usted. Puede encontrarlos aquí: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" >https://support.human-connection.org/kb/</a>",
"title": "Ayuda y preguntas"
},
"moderation": {
"description": "Hasta que nuestras posibilidades financieras nos permitan implementar el sistema de moderación comunitaria, moderaremos con un sistema simplificado y con personal propio o posiblemente voluntario. Formamos a estos moderadores y por eso sólo ellos toman las decisiones adecuadas. Estos moderadores realizan su trabajo de forma anónima. Usted puede reportarnos contribuciones, comentarios y usuarios (por ejemplo, si proporcionan información en su perfil o tienen imágenes que violan estos Términos de Uso). Si nos informa de algo, puede darnos una razón y una breve explicación. A continuación, examinaremos su denuncia y le sancionaremos si es necesario, por ejemplo, bloqueando las contribuciones, los comentarios o los usuarios. Desafortunadamente, usted y la persona en cuestión no recibirán ninguna respuesta de nuestra parte en este momento, pero esto se encuentra en la fase de planificación. Independientemente de esto, nos reservamos el derecho de imponer sanciones en principio por razones que pueden no estar incluidas o no estar incluidas en nuestro Código de Conducta o en estas condiciones de servicio.",
"title": "Moderación"
},
"newTermsAndConditions": "Nuevos términos de uso", "newTermsAndConditions": "Nuevos términos de uso",
"no-commercial-use": { "termsAndConditionsConfirmed": "He leído y acepto los términos de uso.",
"description": "El uso de la red Human Connection no está permitido para fines comerciales. Esto incluye, pero no se limita a, publicitar productos con intención comercial, publicar enlaces de afiliados, solicitar donaciones directamente o brindar apoyo financiero para fines que no se reconocen como caritativos para fines fiscales.",
"title": "Sin uso comercial"
},
"no-parties": {
"description": "No se permiten las cuentas de usuario de los partidos políticos ni las cuentas de usuario oficiales de un representante político.",
"title": "No tiene uso político"
},
"privacy-statement": {
"description": "Nuestra red es una red de conocimiento y acción social. Por lo tanto, es especialmente importante para nosotros que el mayor número posible de contenidos sea accesible al público. En el curso del desarrollo de nuestra red habrá cada vez más la posibilidad de decidir sobre la visibilidad de los datos personales. Le informaremos sobre estas nuevas características. De lo contrario, siempre debe pensar en los datos personales que revela sobre usted (u otros). Esto se aplica en particular al contenido de los mensajes y comentarios, ya que éstos tienen un carácter ampliamente público. Más tarde habrá posibilidades de limitar la visibilidad de su perfil. Parte de los términos del servicio es nuestra declaración de privacidad, que le informa sobre las operaciones individuales de procesamiento de datos en nuestra red: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\">https://human-connection.org/datenschutz/#netzwerk</a> o <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a> Nuestra declaración de privacidad está adaptada a la situación legal y a las características de nuestra red y es siempre válida en la versión más actualizada.",
"title": "Protección de datos"
},
"terms-of-service": {
"description": "Las siguientes condiciones de uso constituyen la base para el uso de nuestra red. Cuando se registre, deberá aceptarlos y le informaremos más adelante de cualquier cambio que se produzca. La Red de Human Connection es operada en Alemania y por lo tanto está sujeta a la ley alemana. El fuero competente es Kirchheim / Teck. Para más detalles, consulte nuestro pie de imprenta: <a href=\"https://human-connection.org/en/imprint\" target=\"_blank\" >https://human-connection.org/en/imprint</a> ",
"title": "Términos de uso"
},
"termsAndConditionsConfirmed": "He leído y acepto los <a href=\"/terms-and-conditions\" target=\"_blank\">términos de uso</a>.",
"termsAndConditionsNewConfirm": "He leído y acepto los nuevos términos de uso.", "termsAndConditionsNewConfirm": "He leído y acepto los nuevos términos de uso.",
"termsAndConditionsNewConfirmText": "¡Por favor, lea los nuevos términos de uso ahora!", "termsAndConditionsNewConfirmText": "¡Por favor, lea los nuevos términos de uso ahora!"
"use-and-license": {
"description": "Si cualquier contenido que nos envíe está protegido por derechos de propiedad intelectual, nos concede una licencia mundial no exclusiva, transferible, sublicenciable y no exclusiva para utilizar dicho contenido para su publicación en nuestra red. Esta licencia caduca cuando usted elimina su contenido o toda su cuenta. Recuerde que otros pueden compartir su contenido y que nosotros no podemos eliminarlo.",
"title": "Uso y Licencia"
}
}, },
"user": { "user": {
"avatar": { "avatar": {

View File

@ -76,54 +76,7 @@
} }
}, },
"code-of-conduct": { "code-of-conduct": {
"consequences": { "subheader": "pour le réseau social de {ORGANIZATION_NAME}"
"description": "Si un membre de la communauté présente un comportement inacceptable, les opérateurs, modérateurs et administrateurs responsables du réseau peuvent prendre les mesures appropriées, notamment:",
"list": {
"0": "Veuillez cesser immédiatement tout comportement inacceptable",
"1": "Verrouillage ou suppression des commentaires",
"2": "Exclusion temporaire du poste ou de la contribution en question",
"3": "Blocage ou suppression de contenu",
"4": "Retrait temporaire des droits d'écriture",
"5": "Exclusion temporaire du réseau",
"6": "Exclusion définitive du réseau",
"7": "Des violations du droit allemand peuvent être signalées."
},
"title": "Conséquences d'un comportement inacceptable"
},
"expected-behaviour": {
"description": "Les comportements suivants sont attendus et exigés de tous les membres de la communauté :",
"list": {
"0": "Faites preuve de considération et de respect dans votre discours et vos actions.",
"1": "Tenter de collaborer avant le conflit.",
"2": "S'abstenir de tout comportement ou discours dégradant, discriminatoire ou harcelant.",
"3": "Soyez attentif à votre environnement et aux autres participants. Alertez les leaders de la communauté si vous remarquez une situation dangereuse, une personne en détresse ou une violation du Code de Conduite, même si elle vous semble sans importance."
},
"title": "Comportement attendu"
},
"get-help": "Si vous êtes victime ou témoin d'un comportement inacceptable, ou si vous avez d'autres préoccupations, veuillez en aviser un organisateur communautaire dès que possible et établir un lien ou vous référer au contenu correspondant:",
"preamble": {
"description": "Human Connection est un réseau de connaissances et d'action sociale à but non lucratif de la prochaine génération. Par les gens - pour les gens. Open Source, équitable et transparent. Pour un changement local et global positif dans tous les domaines de la vie. Nous redessinons complètement l'échange public de connaissances, d'idées et de projets. Les fonctions de Human Connection rassemblent les gens - hors ligne et en ligne - afin que nous puissions rendre le monde meilleur.",
"title": "Préambule"
},
"purpose": {
"description": "Avec ce code de conduite, nous réglementons les principes essentiels de comportement dans notre réseau social. Nous nous orientons à la Charte des Droits de l'Homme, elle est le cœur de notre compréhension des valeurs. Le code de conduite sert de fil conducteur pour notre apparence personnelle et notre interaction les uns avec les autres. Toute personne active comme utilisateur sur le réseau Human Connection, écrit des articles, commente ou contacte d'autres utilisateurs, y compris ceux qui ne font pas partie du réseau, reconnaît ces règles comme contractuel.",
"title": "Objectif"
},
"subheader": "pour le réseau social de la Human Connection gGmbH",
"unacceptable-behaviour": {
"description": "Les comportements suivants sont inacceptables dans notre communauté:",
"list": {
"0": "Les messages, commentaires, déclarations ou insultes discriminatoires, en particulier ceux relatifs au sexe, à l'orientation sexuelle, à la race, à la religion, à l'orientation politique ou philosophique ou au handicap.",
"1": "Publication ou partage de matériel clairement pornographique.",
"2": "Glorification ou banalisation d'actes de violence cruels ou inhumains.",
"3": "La divulgation de renseignements personnels sans le consentement ou la menace d' (\"doxing\").",
"4": "L'intimidation, le harcèlement ou la persécution intentionnelle.",
"5": "Publicité de produits et de services à des fins commerciaux.",
"6": "Comportement criminel ou violation du droit allemand.",
"7": "Cautionner ou encourager de tels comportements."
},
"title": "Comportement inacceptable"
}
}, },
"comment": { "comment": {
"content": { "content": {
@ -197,7 +150,7 @@
}, },
"signup": { "signup": {
"form": { "form": {
"data-privacy": "J'ai lu et compris la <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"> <ds-text bold color=\"primary\" > Déclaration de confidentialité </ds-text> </a> ", "data-privacy": "J'ai lu et compris la Déclaration de confidentialité.",
"description": "Pour commencer, entrez votre adresse mail :", "description": "Pour commencer, entrez votre adresse mail :",
"errors": { "errors": {
"email-exists": "Il existe déjà un compte utilisateur avec cette adresse mail!", "email-exists": "Il existe déjà un compte utilisateur avec cette adresse mail!",
@ -209,9 +162,9 @@
"no-political": "Je ne parle pas au nom d'un parti ou d'une organisation politique sur le réseau.", "no-political": "Je ne parle pas au nom d'un parti ou d'une organisation politique sur le réseau.",
"submit": "Créer un compte", "submit": "Créer un compte",
"success": "Un mail avec un lien pour compléter votre inscription a été envoyé à <b>{email}</b>", "success": "Un mail avec un lien pour compléter votre inscription a été envoyé à <b>{email}</b>",
"terms-and-condition": "Je confirme les <a href=\"/terms-and-conditions\"> <ds-text bold color=\"primary\" > Conditions générales </ds-text> </a>." "terms-and-condition": "Je confirme les Conditions générales."
}, },
"title": "Rejoignez Human Connection!", "title": "Rejoignez {APPLICATION_NAME}!",
"unavailable": "Malheureusement, l'enregistrement public des comptes utilisateurs n'est pas encore disponible sur ce serveur." "unavailable": "Malheureusement, l'enregistrement public des comptes utilisateurs n'est pas encore disponible sur ce serveur."
} }
} }
@ -250,7 +203,6 @@
"filterALL": "Voir toutes les contributions", "filterALL": "Voir toutes les contributions",
"filterFollow": "Filtrer les contributions des utilisateurs que je suis", "filterFollow": "Filtrer les contributions des utilisateurs que je suis",
"inappropriatePicture": "Cette image peut être inappropriée pour certaines personnes.", "inappropriatePicture": "Cette image peut être inappropriée pour certaines personnes.",
"inappropriatePictureText": "Quand est ce que ma photo doit-elle être floue",
"languageSelectLabel": "Langue", "languageSelectLabel": "Langue",
"languageSelectText": "Sélectionner une langue", "languageSelectText": "Sélectionner une langue",
"newPost": "Créer un nouveau Post", "newPost": "Créer un nouveau Post",
@ -341,16 +293,14 @@
"no-results": "Pas de contribution trouvée." "no-results": "Pas de contribution trouvée."
}, },
"login": { "login": {
"copy": "Si vous avez déjà un compte human-connection, connectez-vous ici.",
"email": "Votre mail", "email": "Votre mail",
"failure": "Adresse mail ou mot de passe incorrect.", "failure": "Adresse mail ou mot de passe incorrect.",
"forgotPassword": "Mot de passe oublié?", "forgotPassword": "Mot de passe oublié?",
"hello": "Bonjour", "hello": "Bonjour",
"login": "Connexion", "login": "Connexion",
"logout": "Déconnexion", "logout": "Déconnexion",
"moreInfo": "Qu'est-ce que Human Connection?", "moreInfo": "Qu'est-ce que {APPLICATION_NAME}?",
"moreInfoHint": "à la page de présentation", "moreInfoHint": "à la page de présentation",
"moreInfoURL": "https://human-connection.org/fr/",
"no-account": "Vous n'avez pas de compte?", "no-account": "Vous n'avez pas de compte?",
"password": "Votre mot de passe", "password": "Votre mot de passe",
"register": "S'inscrire", "register": "S'inscrire",
@ -359,7 +309,7 @@
"maintenance": { "maintenance": {
"explanation": "Pour l'instant, nous faisons de la maintenance programmée, veuillez réessayer plus tard.", "explanation": "Pour l'instant, nous faisons de la maintenance programmée, veuillez réessayer plus tard.",
"questions": "Des questions ou des préoccupations, envoyez un mail à", "questions": "Des questions ou des préoccupations, envoyez un mail à",
"title": "Human Connection est en maintenance" "title": "{APPLICATION_NAME} est en maintenance"
}, },
"moderation": { "moderation": {
"name": "Modération", "name": "Modération",
@ -485,7 +435,7 @@
"invites": { "invites": {
"description": "Entrez leur adresse mail pour l'invitation.", "description": "Entrez leur adresse mail pour l'invitation.",
"emailPlaceholder": "Mail d'invitation", "emailPlaceholder": "Mail d'invitation",
"title": "Invitez quelqu'un à Human Connection!" "title": "Invitez quelqu'un à {APPLICATION_NAME}!"
}, },
"memberSince": "Membre depuis", "memberSince": "Membre depuis",
"name": "Mon profil", "name": "Mon profil",
@ -747,47 +697,11 @@
} }
}, },
"termsAndConditions": { "termsAndConditions": {
"addition": {
"description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>",
"title": "De plus, nous organisons régulièrement des événements où vous pouvez également partager vos impressions et poser vos questions. Ici, vous trouverez un aperçu actuel:"
},
"agree": "J'accepte!", "agree": "J'accepte!",
"code-of-conduct": {
"description": "Notre code de conduite sert de manuel pour l'apparence personnelle et l'interaction les uns avec les autres. Quiconque est actif en tant qu'utilisateur sur le réseau Human Connection, écrit des articles, commente ou établit des contacts avec d'autres utilisateurs, même en dehors du réseau, reconnaît que ces règles de conduite sont contractuel. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct </a>",
"title": "Code de conduite"
},
"errors-and-feedback": {
"description": "Nous mettons tout en œuvre pour que notre réseau et nos données soient sécurisés et disponibles. Chaque nouvelle version du logiciel passe par des tests automatisés et manuels. Cependant, des erreurs imprévues peuvent survenir. Par conséquent, nous sommes reconnaissants pour tous les bugs signalés. Nous vous invitons à signaler les bugs que vous avez découverts en envoyant un mail à support@human-connection.org.",
"title": "Erreurs et Feedback"
},
"help-and-questions": {
"description": "Pour obtenir de l'aide et des questions, nous avons compilé une foire aux questions (FAQ) complète pour vous. Vous pouvez les trouver ici: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" >https://support.human-connection.org/kb/ </a>",
"title": "Aide et questions"
},
"moderation": {
"description": "Jusqu'à ce que nos possibilités financières nous permettent de mettre en œuvre le système de modération communautaire, nous modérons avec un système simplifié et avec notre propre personnel ou éventuellement des bénévoles. Nous formons ces modérateurs et c'est pour cette raison qu'ils sont les seuls à prendre les décisions appropriées. Ces modérateurs effectuent leur travail de manière anonyme. Vous pouvez nous signaler des postes, commentaires et utilisateurs (par exemple, s'ils fournissent des informations dans leur profil ou s'ils ont des images qui violent ces Conditions d'utilisation). Si vous nous signalez quelque chose, vous pouvez nous donner une raison et une brève explication. Nous examinerons ensuite ce que vous nous avez signalé et vous sanctionnerons si nécessaire, par exemple en bloquant des contributions, des commentaires ou des utilisateurs. Malheureusement, vous et la personne concernée ne recevrez pas de commentaires de notre part pour le moment, mais c'est à l'étape de la planification. Indépendamment de cela, nous nous réservons le droit d'imposer des sanctions de principe pour des raisons qui ne figurent pas ou pas encore dans notre Code de conduite ou dans les présentes conditions de service.",
"title": "Modération"
},
"newTermsAndConditions": "Nouvelles conditions générales", "newTermsAndConditions": "Nouvelles conditions générales",
"no-commercial-use": { "termsAndConditionsConfirmed": "J'ai lu et accepte les conditions générales.",
"description": "L'utilisation du réseau Human Connetion à fin commercial n'est pas autorisée. Cela comprend, sans s'y limiter, la publicité de produits à des fins commerciales, la publication de liens d'affiliation, la sollicitation directe de dons ou l'octroi d'un soutien financier à des fins qui ne sont pas reconnues comme organismes de bienfaisance aux fins de l'impôt.",
"title": "Pas d'utilisation commerciale"
},
"privacy-statement": {
"description": "Notre réseau est un réseau de connaissances et d'action sociale. Il est donc particulièrement important pour nous qu'autant de contenu que possible soit accessible au public. Au cours du développement de notre réseau, il y aura de plus en plus la possibilité de décider de la visibilité des données personnelles. Nous vous informerons de ces nouvelles fonctionnalités. Sinon, vous devriez toujours penser aux données personnelles que vous divulguez à votre sujet (ou à celui d'autres personnes). Cela vaut en particulier pour le contenu des messages et des commentaires, qui ont un caractère largement public. Plus tard, il y aura des possibilités de limiter la visibilité de votre profil. Une partie des conditions d'utilisation est notre déclaration de confidentialité, qui vous informe sur les différentes opérations de traitement des données dans notre réseau: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\"> https://human-connection.org/datenschutz/#netzwerk</a> ex: <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a> Notre déclaration de confidentialité est adaptée à la situation juridique et aux caractéristiques de notre réseau et est toujours valable dans la version la plus récente.",
"title": "Déclaration de confidentialité"
},
"terms-of-service": {
"description": "Les conditions d'utilisation suivantes constituent la base de l'utilisation de notre réseau. Lorsque vous vous inscrivez, vous devez les accepter et nous vous informerons ultérieurement de tout changement qui pourrait survenir. Le réseau Human Connection Network est exploité en Allemagne et est donc soumis au droit allemand. Le tribunal compétent est celui de Kirchheim / Teck. Pour plus de détails, consultez notre site Internet: <a href=\"https://human-connection.org/en/imprint\" target=\"_blank\" >https://human-connection.org/en/imprint</a> ",
"title": "Conditions d'utilisation"
},
"termsAndConditionsConfirmed": "J'ai lu et accepte les <a href=\"/terms-and-conditions\" target=\"_blank\">conditions générales</a>.",
"termsAndConditionsNewConfirm": "J'ai lu et accepté les nouvelles conditions générales.", "termsAndConditionsNewConfirm": "J'ai lu et accepté les nouvelles conditions générales.",
"termsAndConditionsNewConfirmText": "Veuillez lire les nouvelles conditions d'utilisation dès maintenant !", "termsAndConditionsNewConfirmText": "Veuillez lire les nouvelles conditions d'utilisation dès maintenant !"
"use-and-license": {
"description": "Si un contenu que vous nous publiez est protégé par des droits de propriété intellectuelle, vous nous accordez une licence mondiale non exclusive, transférable, transférable et pouvant faire l'objet d'une sous-licence pour utiliser ce contenu à des fins de publication sur notre réseau. Cette licence expire lorsque vous supprimez votre contenu ou l'ensemble de votre compte. Rappelez-vous que d'autres personnes peuvent partager votre contenu et que nous ne pouvons pas le supprimer.",
"title": "Utilisation et licence"
}
}, },
"user": { "user": {
"avatar": { "avatar": {

View File

@ -0,0 +1 @@
<p>Ich bin der Inhalt vom Verhaltenskodex</p>

View File

@ -0,0 +1 @@
<p>Das hier wäre der Inhalt der Datenschutzbestimmungen</p>

View File

@ -0,0 +1 @@
<p>Ich bin das Impressum</p>

View File

@ -0,0 +1,11 @@
import termsAndConditions from './terms-and-conditions.html'
import codeOfConduct from './code-of-conduct.html'
import dataPrivacy from './data-privacy.html'
import imprint from './imprint.html'
export default {
termsAndConditions,
codeOfConduct,
dataPrivacy,
imprint,
}

View File

@ -0,0 +1 @@
<p>Ich bin der Inhalt der Seite "Nutzungsbedingungen"</p>

View File

@ -0,0 +1 @@
<p>I am the content of the code of conduct</p>

View File

@ -0,0 +1 @@
<p>This would be our data privacy section</p>

View File

@ -0,0 +1 @@
<p>I am the imprint</p>

View File

@ -0,0 +1,11 @@
import termsAndConditions from './terms-and-conditions.html'
import codeOfConduct from './code-of-conduct.html'
import dataPrivacy from './data-privacy.html'
import imprint from './imprint.html'
export default {
termsAndConditions,
codeOfConduct,
dataPrivacy,
imprint,
}

View File

@ -0,0 +1 @@
<p>I am the content of the page "terms and conditions"<p>

View File

@ -0,0 +1,7 @@
import de from './de'
import en from './en'
export default {
de,
en,
}

View File

@ -1,6 +1,6 @@
{ {
"actions": { "actions": {
"cancel": "", "cancel": null,
"create": "Crea", "create": "Crea",
"delete": "Cancella", "delete": "Cancella",
"edit": "Modifica", "edit": "Modifica",
@ -33,16 +33,16 @@
"successfulUpdate": "Informazioni sulle donazioni aggiornate con successo!" "successfulUpdate": "Informazioni sulle donazioni aggiornate con successo!"
}, },
"hashtags": { "hashtags": {
"name": "", "name": null,
"nameOfHashtag": "", "nameOfHashtag": null,
"number": "", "number": null,
"tagCount": "", "tagCount": null,
"tagCountUnique": "" "tagCountUnique": null
}, },
"invites": { "invites": {
"description": "", "description": null,
"name": "", "name": null,
"title": "" "title": null
}, },
"name": "Admin", "name": "Admin",
"notifications": { "notifications": {
@ -63,87 +63,40 @@
"tagCountUnique": "Utenti" "tagCountUnique": "Utenti"
}, },
"users": { "users": {
"empty": "", "empty": null,
"form": { "form": {
"placeholder": "" "placeholder": null
}, },
"name": "Utenti", "name": "Utenti",
"table": { "table": {
"columns": { "columns": {
"createdAt": "", "createdAt": null,
"email": "", "email": null,
"name": "", "name": null,
"number": "", "number": null,
"role": "", "role": null,
"slug": "" "slug": null
} }
} }
} }
}, },
"code-of-conduct": { "code-of-conduct": {
"consequences": { "subheader": null
"description": "Se un membro della comunità manifesta comportamenti inaccettabili, gli operatori, i moderatori e gli amministratori responsabili della rete possono adottare le misure appropriate, inclusi ma non limitati a:",
"list": {
"0": "Richiesta di cessazione immediata di comportamenti inaccettabili",
"1": "Blocco o eliminazione di commenti",
"2": "Esclusione temporanea dal rispettivo posto o contributo",
"3": "Blocco o eliminazione di contenuti",
"4": "Revoca temporanea delle autorizzazioni di scrittura",
"5": "Esclusione temporanea dalla rete",
"6": "Esclusione definitiva dalla rete",
"7": "Violazioni della legge tedesca possono essere segnalate."
},
"title": "Conseguenze di comportamenti inaccettabilil"
},
"expected-behaviour": {
"description": "",
"list": {
"0": "",
"1": "",
"2": "",
"3": "Fai attenzione a ciò che ti circonda e ai tuoi compagni partecipanti. Avvisare i leader della comunità se si nota una situazione pericolosa, qualcuno in difficoltà o violazioni del presente Codice di condotta, anche se sembrano insignificanti."
},
"title": ""
},
"get-help": "Se sei soggetto o testimone di un comportamento inaccettabile, o se hai altre preoccupazioni, ti preghiamo di avvisare al più presto un organizzatore della comunità e di fare riferimento al contenuto corrispondente:",
"preamble": {
"description": "Human Connection è una rete di conoscenza e azione sociale senza scopo di lucro della prossima generazione. Dalle persone - per le persone. Open Source, equo e trasparente. Per un cambiamento locale e globale positivo in tutte le aree della vita. Ridisegniamo completamente lo scambio pubblico di conoscenze, idee e progetti. Le funzioni di Human Connection riuniscono le persone - offline e online - in modo che possiamo rendere il mondo un posto migliore.",
"title": ""
},
"purpose": {
"description": "Con questo codice di condotta regoliamo i principi essenziali di comportamento nel nostro social network. La Carta dei diritti umani delle Nazioni Unite è il nostro orientamento e costituisce il cuore della nostra comprensione dei valori. Il codice di condotta funge da principio guida per il nostro aspetto personale e l'interazione reciproca. Chiunque sia attivo come utente nella rete di connessione umana, scrive articoli, commenti o contatta altri utenti, compresi quelli esterni alla rete, riconosce queste regole di condotta come vincolanti.",
"title": ""
},
"subheader": "",
"unacceptable-behaviour": {
"description": "",
"list": {
"0": "Posti discriminatori, commenti, dichiarazioni o insulti, in particolare quelli relativi a genere, orientamento sessuale, razza, religione, orientamento politico o filosofico o disabilità.",
"1": "Pubblicazione o collegamento di materiale chiaramente pornografico.",
"2": "Glorificazione o banalizzazione di atti di violenza crudele o disumana.",
"3": "La divulgazione di informazioni personali altrui senza il loro consenso o minaccia di (\"doxing\").",
"4": "Intimidazione intenzionale, stalking o persecuzione.",
"5": "Pubblicità di prodotti e servizi a fini commerciali.",
"6": "Comportamento criminale o violazione della legge tedesca.",
"7": "Sostenere o incoraggiare tale condotta."
},
"title": ""
}
}, },
"comment": { "comment": {
"content": { "content": {
"unavailable-placeholder": "" "unavailable-placeholder": null
}, },
"delete": "", "delete": null,
"edit": "", "edit": null,
"edited": "", "edited": null,
"menu": { "menu": {
"delete": "", "delete": null,
"edit": "" "edit": null
}, },
"show": { "show": {
"less": "", "less": null,
"more": "" "more": null
} }
}, },
"common": { "common": {
@ -157,149 +110,149 @@
"organization": "Organizzazione ::: Organizzazioni", "organization": "Organizzazione ::: Organizzazioni",
"post": "Messaggio ::: Messaggi", "post": "Messaggio ::: Messaggi",
"project": "Progetto ::: Progetti", "project": "Progetto ::: Progetti",
"reportContent": "", "reportContent": null,
"shout": "Grido ::: Gridi", "shout": "Grido ::: Gridi",
"tag": "Tag ::: Tag", "tag": "Tag ::: Tag",
"takeAction": "Agire", "takeAction": "Agire",
"user": "Utente ::: Utenti", "user": "Utente ::: Utenti",
"validations": { "validations": {
"categories": "", "categories": null,
"email": "", "email": null,
"url": "" "url": null
}, },
"versus": "Verso" "versus": "Verso"
}, },
"components": { "components": {
"enter-nonce": { "enter-nonce": {
"form": { "form": {
"description": "", "description": null,
"next": "", "next": null,
"nonce": "", "nonce": null,
"validations": { "validations": {
"length": "" "length": null
} }
} }
}, },
"password-reset": { "password-reset": {
"change-password": { "change-password": {
"error": "Modifica della password non riuscita. Forse il codice di sicurezza non era corretto?", "error": "Modifica della password non riuscita. Forse il codice di sicurezza non era corretto?",
"help": "", "help": null,
"success": "" "success": null
}, },
"request": { "request": {
"form": { "form": {
"description": "", "description": null,
"submit": "", "submit": null,
"submitted": "" "submitted": null
}, },
"title": "" "title": null
} }
}, },
"registration": { "registration": {
"create-user-account": { "create-user-account": {
"error": "", "error": null,
"help": "", "help": null,
"success": "", "success": null,
"title": "" "title": null
}, },
"signup": { "signup": {
"form": { "form": {
"data-privacy": "", "data-privacy": null,
"description": "", "description": null,
"errors": { "errors": {
"email-exists": "", "email-exists": null,
"invalid-invitation-token": "Sembra che l'invito sia già stato utilizzato. I link di invito possono essere utilizzati una sola volta." "invalid-invitation-token": "Sembra che l'invito sia già stato utilizzato. I link di invito possono essere utilizzati una sola volta."
}, },
"invitation-code": "", "invitation-code": null,
"minimum-age": "", "minimum-age": null,
"submit": "", "submit": null,
"success": "", "success": null,
"terms-and-condition": "" "terms-and-condition": null
}, },
"title": "", "title": null,
"unavailable": "" "unavailable": null
} }
} }
}, },
"contribution": { "contribution": {
"categories": { "categories": {
"infoSelectedNoOfMaxCategories": "" "infoSelectedNoOfMaxCategories": null
}, },
"category": { "category": {
"name": { "name": {
"animal-protection": "", "animal-protection": null,
"art-culture-sport": "", "art-culture-sport": null,
"consumption-sustainability": "", "consumption-sustainability": null,
"cooperation-development": "", "cooperation-development": null,
"democracy-politics": "", "democracy-politics": null,
"economy-finances": "", "economy-finances": null,
"education-sciences": "", "education-sciences": null,
"energy-technology": "", "energy-technology": null,
"environment-nature": "", "environment-nature": null,
"freedom-of-speech": "", "freedom-of-speech": null,
"global-peace-nonviolence": "", "global-peace-nonviolence": null,
"happiness-values": "", "happiness-values": null,
"health-wellbeing": "", "health-wellbeing": null,
"human-rights-justice": "", "human-rights-justice": null,
"it-internet-data-privacy": "", "it-internet-data-privacy": null,
"just-for-fun": "" "just-for-fun": null
} }
}, },
"delete": "", "delete": null,
"edit": "", "edit": null,
"emotions-label": { "emotions-label": {
"angry": "", "angry": null,
"cry": "", "cry": null,
"funny": "", "funny": null,
"happy": "", "happy": null,
"surprised": "" "surprised": null
}, },
"filterALL": "", "filterALL": null,
"filterFollow": "", "filterFollow": null,
"languageSelectLabel": "", "languageSelectLabel": null,
"languageSelectText": "", "languageSelectText": null,
"newPost": "", "newPost": null,
"success": "", "success": null,
"teaserImage": { "teaserImage": {
"cropperConfirm": "Confermare", "cropperConfirm": "Confermare",
"supportedFormats": "Inserisci un'immagine in formato file JPG, PNG o GIF" "supportedFormats": "Inserisci un'immagine in formato file JPG, PNG o GIF"
}, },
"title": "" "title": null
}, },
"delete": { "delete": {
"cancel": "", "cancel": null,
"comment": { "comment": {
"message": "", "message": null,
"success": "", "success": null,
"title": "", "title": null,
"type": "" "type": null
}, },
"contribution": { "contribution": {
"message": "", "message": null,
"success": "", "success": null,
"title": "", "title": null,
"type": "" "type": null
}, },
"submit": "" "submit": null
}, },
"disable": { "disable": {
"cancel": "", "cancel": null,
"comment": { "comment": {
"message": "", "message": null,
"title": "", "title": null,
"type": "" "type": null
}, },
"contribution": { "contribution": {
"message": "", "message": null,
"title": "", "title": null,
"type": "" "type": null
}, },
"submit": "", "submit": null,
"success": "", "success": null,
"user": { "user": {
"message": "", "message": null,
"title": "", "title": null,
"type": "" "type": null
} }
}, },
"donations": { "donations": {
@ -309,120 +262,118 @@
}, },
"editor": { "editor": {
"embed": { "embed": {
"always_allow": "", "always_allow": null,
"data_privacy_info": "I tuoi dati non sono ancora stati condivisi con fornitori terzi. Se continui a guardare questo video, il seguente fornitore probabilmente raccoglierà i dati dell'utente:", "data_privacy_info": "I tuoi dati non sono ancora stati condivisi con fornitori terzi. Se continui a guardare questo video, il seguente fornitore probabilmente raccoglierà i dati dell'utente:",
"data_privacy_warning": "", "data_privacy_warning": null,
"play_now": "" "play_now": null
}, },
"hashtag": { "hashtag": {
"addHashtag": "", "addHashtag": null,
"addLetter": "", "addLetter": null,
"noHashtagsFound": "" "noHashtagsFound": null
}, },
"mention": { "mention": {
"noUsersFound": "" "noUsersFound": null
}, },
"placeholder": "" "placeholder": null
}, },
"filter-menu": { "filter-menu": {
"all": "", "all": null,
"categories": "", "categories": null,
"emotions": "", "emotions": null,
"filter-by": "", "filter-by": null,
"following": "", "following": null,
"languages": "" "languages": null
}, },
"followButton": { "followButton": {
"follow": "", "follow": null,
"following": "" "following": null
}, },
"hashtags-filter": { "hashtags-filter": {
"clearSearch": "", "clearSearch": null,
"hashtag-search": "", "hashtag-search": null,
"title": "" "title": null
}, },
"index": { "index": {
"change-filter-settings": "", "change-filter-settings": null,
"no-results": "" "no-results": null
}, },
"login": { "login": {
"copy": "Se sei gia registrato su Human Connection, accedi qui.",
"email": "La tua email", "email": "La tua email",
"failure": "", "failure": null,
"forgotPassword": "", "forgotPassword": null,
"hello": "Ciao", "hello": "Ciao",
"login": "Accesso", "login": "Accesso",
"logout": "Logout", "logout": "Logout",
"moreInfo": "Che cosa è Human Connection?", "moreInfo": "Che cosa è {APPLICATION_NAME}?",
"moreInfoHint": "", "moreInfoHint": null,
"moreInfoURL": "", "no-account": null,
"no-account": "",
"password": "La tua password", "password": "La tua password",
"register": "", "register": null,
"success": "" "success": null
}, },
"maintenance": { "maintenance": {
"explanation": "", "explanation": null,
"questions": "", "questions": null,
"title": "" "title": null
}, },
"moderation": { "moderation": {
"name": "", "name": null,
"reports": { "reports": {
"createdAt": "", "createdAt": null,
"disabledBy": "", "disabledBy": null,
"empty": "", "empty": null,
"name": "", "name": null,
"reasonCategory": "", "reasonCategory": null,
"reasonDescription": "", "reasonDescription": null,
"reporter": "", "reporter": null,
"submitter": "" "submitter": null
} }
}, },
"notifications": { "notifications": {
"comment": "", "comment": null,
"content": "", "content": null,
"empty": "", "empty": null,
"filterLabel": { "filterLabel": {
"all": "", "all": null,
"read": "", "read": null,
"unread": "" "unread": null
}, },
"pageLink": "", "pageLink": null,
"post": "", "post": null,
"reason": { "reason": {
"commented_on_post": "", "commented_on_post": null,
"mentioned_in_comment": "", "mentioned_in_comment": null,
"mentioned_in_post": "" "mentioned_in_post": null
}, },
"title": "", "title": null,
"user": "" "user": null
}, },
"post": { "post": {
"comment": { "comment": {
"submit": "", "submit": null,
"submitted": "", "submitted": null,
"updated": "" "updated": null
}, },
"edited": "", "edited": null,
"menu": { "menu": {
"delete": "", "delete": null,
"edit": "", "edit": null,
"pin": "", "pin": null,
"pinnedSuccessfully": "", "pinnedSuccessfully": null,
"unpin": "", "unpin": null,
"unpinnedSuccessfully": "" "unpinnedSuccessfully": null
}, },
"moreInfo": { "moreInfo": {
"description": "", "description": null,
"name": "Ulteriori informazioni", "name": "Ulteriori informazioni",
"title": "", "title": null,
"titleOfCategoriesSection": "", "titleOfCategoriesSection": null,
"titleOfHashtagsSection": "", "titleOfHashtagsSection": null,
"titleOfRelatedContributionsSection": "" "titleOfRelatedContributionsSection": null
}, },
"name": "Messaggio", "name": "Messaggio",
"pinned": "", "pinned": null,
"takeAction": { "takeAction": {
"name": "Agire" "name": "Agire"
} }
@ -433,22 +384,22 @@
"followers": "Seguenti", "followers": "Seguenti",
"following": "Seguendo", "following": "Seguendo",
"invites": { "invites": {
"description": "", "description": null,
"emailPlaceholder": "", "emailPlaceholder": null,
"title": "" "title": null
}, },
"memberSince": "Membro dal", "memberSince": "Membro dal",
"name": "Il mio profilo", "name": "Il mio profilo",
"network": { "network": {
"andMore": "", "andMore": null,
"followedBy": "", "followedBy": null,
"followedByNobody": "", "followedByNobody": null,
"following": "", "following": null,
"followingNobody": "", "followingNobody": null,
"title": "" "title": null
}, },
"shouted": "Gridato", "shouted": "Gridato",
"socialMedia": "", "socialMedia": null,
"userAnonym": "Anonymous" "userAnonym": "Anonymous"
}, },
"quotes": { "quotes": {
@ -458,86 +409,86 @@
} }
}, },
"release": { "release": {
"cancel": "", "cancel": null,
"comment": { "comment": {
"error": "", "error": null,
"message": "", "message": null,
"title": "", "title": null,
"type": "" "type": null
}, },
"contribution": { "contribution": {
"error": "", "error": null,
"message": "", "message": null,
"title": "", "title": null,
"type": "" "type": null
}, },
"submit": "", "submit": null,
"success": "", "success": null,
"user": { "user": {
"error": "", "error": null,
"message": "", "message": null,
"title": "", "title": null,
"type": "" "type": null
} }
}, },
"report": { "report": {
"cancel": "", "cancel": null,
"comment": { "comment": {
"error": "", "error": null,
"message": "", "message": null,
"title": "", "title": null,
"type": "" "type": null
}, },
"contribution": { "contribution": {
"error": "", "error": null,
"message": "", "message": null,
"title": "", "title": null,
"type": "" "type": null
}, },
"reason": { "reason": {
"category": { "category": {
"invalid": "", "invalid": null,
"label": "", "label": null,
"options": { "options": {
"advert_products_services_commercial": "", "advert_products_services_commercial": null,
"criminal_behavior_violation_german_law": "", "criminal_behavior_violation_german_law": null,
"discrimination_etc": "", "discrimination_etc": null,
"doxing": "", "doxing": null,
"glorific_trivia_of_cruel_inhuman_acts": "", "glorific_trivia_of_cruel_inhuman_acts": null,
"intentional_intimidation_stalking_persecution": "", "intentional_intimidation_stalking_persecution": null,
"other": "", "other": null,
"pornographic_content_links": "" "pornographic_content_links": null
}, },
"placeholder": "" "placeholder": null
}, },
"description": { "description": {
"label": "", "label": null,
"placeholder": "" "placeholder": null
} }
}, },
"submit": "", "submit": null,
"success": "", "success": null,
"user": { "user": {
"error": "", "error": null,
"message": "", "message": null,
"title": "", "title": null,
"type": "" "type": null
} }
}, },
"search": { "search": {
"failed": "", "failed": null,
"hint": "", "hint": null,
"placeholder": "" "placeholder": null
}, },
"settings": { "settings": {
"data": { "data": {
"labelBio": "Su di te", "labelBio": "Su di te",
"labelCity": "La tua città o regione", "labelCity": "La tua città o regione",
"labelName": "Nome", "labelName": "Nome",
"labelSlug": "", "labelSlug": null,
"name": "I tuoi dati", "name": "I tuoi dati",
"namePlaceholder": "Anonymous", "namePlaceholder": "Anonymous",
"success": "" "success": null
}, },
"delete": { "delete": {
"name": "Elimina Account" "name": "Elimina Account"
@ -555,39 +506,39 @@
"name": "Scaricamento dati" "name": "Scaricamento dati"
}, },
"email": { "email": {
"change-successful": "", "change-successful": null,
"labelEmail": "", "labelEmail": null,
"labelNewEmail": "", "labelNewEmail": null,
"labelNonce": "", "labelNonce": null,
"name": "", "name": null,
"submitted": "", "submitted": null,
"success": "", "success": null,
"validation": { "validation": {
"same-email": "" "same-email": null
}, },
"verification-error": { "verification-error": {
"explanation": "", "explanation": null,
"message": "", "message": null,
"reason": { "reason": {
"invalid-nonce": "", "invalid-nonce": null,
"no-email-request": "" "no-email-request": null
}, },
"support": "" "support": null
} }
}, },
"embeds": { "embeds": {
"info-description": "Ecco l'elenco dei fornitori di terze parti i cui contenuti possono essere visualizzati come codice di terze parti, ad esempio sotto forma di video incorporati.", "info-description": "Ecco l'elenco dei fornitori di terze parti i cui contenuti possono essere visualizzati come codice di terze parti, ad esempio sotto forma di video incorporati.",
"name": "", "name": null,
"status": { "status": {
"change": { "change": {
"allow": "", "allow": null,
"deny": "", "deny": null,
"question": "" "question": null
}, },
"description": "", "description": null,
"disabled": { "disabled": {
"off": "", "off": null,
"on": "" "on": null
} }
} }
}, },
@ -620,121 +571,89 @@
"name": "Mie organizzazioni" "name": "Mie organizzazioni"
}, },
"privacy": { "privacy": {
"make-shouts-public": "", "make-shouts-public": null,
"name": "", "name": null,
"success-update": "" "success-update": null
}, },
"security": { "security": {
"change-password": { "change-password": {
"button": "", "button": null,
"label-new-password": "", "label-new-password": null,
"label-new-password-confirm": "", "label-new-password-confirm": null,
"label-old-password": "", "label-old-password": null,
"message-new-password-confirm-required": "", "message-new-password-confirm-required": null,
"message-new-password-missmatch": "", "message-new-password-missmatch": null,
"message-new-password-required": "", "message-new-password-required": null,
"message-old-password-required": "", "message-old-password-required": null,
"passwordSecurity": "", "passwordSecurity": null,
"passwordStrength0": "", "passwordStrength0": null,
"passwordStrength1": "", "passwordStrength1": null,
"passwordStrength2": "", "passwordStrength2": null,
"passwordStrength3": "", "passwordStrength3": null,
"passwordStrength4": "", "passwordStrength4": null,
"success": "" "success": null
}, },
"name": "Sicurezza" "name": "Sicurezza"
}, },
"social-media": { "social-media": {
"name": "", "name": null,
"placeholder": "", "placeholder": null,
"requireUnique": "", "requireUnique": null,
"submit": "", "submit": null,
"successAdd": "Social media aggiunti. \nProfilo utente aggiornato ", "successAdd": "Social media aggiunti. \nProfilo utente aggiornato ",
"successDelete": "Social media cancellati. Profilo utente aggiornato!" "successDelete": "Social media cancellati. Profilo utente aggiornato!"
}, },
"validation": { "validation": {
"slug": { "slug": {
"alreadyTaken": "", "alreadyTaken": null,
"regex": "" "regex": null
} }
} }
}, },
"shoutButton": { "shoutButton": {
"shouted": "" "shouted": null
}, },
"site": { "site": {
"back-to-login": "", "back-to-login": null,
"bank": "conto bancario", "bank": "conto bancario",
"code-of-conduct": "", "code-of-conduct": null,
"contact": "Contatto", "contact": "Contatto",
"data-privacy": "protezione dei dati", "data-privacy": "protezione dei dati",
"director": "Direttore Generale", "director": "Direttore Generale",
"error-occurred": "", "error-occurred": null,
"faq": "", "faq": null,
"germany": "Germania", "germany": "Germania",
"imprint": "Impressum", "imprint": "Impressum",
"made": "Con &#10084; fatto", "made": "Con &#10084; fatto",
"register": "numero di registro", "register": "numero di registro",
"responsible": "Responsabile ai sensi del § 55 Abs. 2 RStV (Germania)", "responsible": "Responsabile ai sensi del § 55 Abs. 2 RStV (Germania)",
"taxident": "Numero di identificazione dell'imposta sul valore aggiunto ai sensi del § 27 a Legge sull'imposta sul valore aggiunto (Germania)", "taxident": "Numero di identificazione dell'imposta sul valore aggiunto ai sensi del § 27 a Legge sull'imposta sul valore aggiunto (Germania)",
"termsAndConditions": "", "termsAndConditions": null,
"thanks": "", "thanks": null,
"tribunal": "registro tribunale" "tribunal": "registro tribunale"
}, },
"store": { "store": {
"posts": { "posts": {
"orderBy": { "orderBy": {
"newest": { "newest": {
"label": "" "label": null
}, },
"oldest": { "oldest": {
"label": "" "label": null
} }
} }
} }
}, },
"termsAndConditions": { "termsAndConditions": {
"addition": {
"description": "Https://human-connection. org/eventi/",
"title": "Inoltre, teniamo regolarmente eventi in cui puoi anche condividere le tue impressioni e porre domande. Puoi trovare una panoramica attuale qui:"
},
"agree": "Sono d'accordo!", "agree": "Sono d'accordo!",
"code-of-conduct": {
"description": "Il nostro codice di condotta funge da manuale per l'aspetto personale e l'interazione reciproca. Chiunque sia attivo come utente nella rete di Human Connection, scrive articoli, commenti o contatta altri utenti, anche al di fuori della rete, riconosce queste regole di condotta come vincolanti. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct </a>",
"title": "Codice di condotta"
},
"errors-and-feedback": {
"description": "Facciamo ogni sforzo per mantenere la nostra rete e i nostri dati al sicuro e disponibili. Ogni nuova versione del software viene sottoposta a test sia automatizzati che manuali. Tuttavia, possono verificarsi errori imprevisti. Pertanto, siamo grati per tutti i bug segnalati. Siete invitati a segnalare eventuali bug che si scopre inviando un'e-mail al supporto presso support@human-connection.org",
"title": "Errori e feedback"
},
"help-and-questions": {
"description": "Per aiuto e domande abbiamo compilato per voi una raccolta completa di domande e risposte alle domande più frequenti (FAQ). Potete trovarli qui: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" >https:</a>//support.human-connection.org/kb/ ",
"title": "Aiuto e domande"
},
"moderation": {
"description": "Fino a quando le nostre possibilità finanziarie ci permettono di implementare il sistema di moderazione comunitaria, abbiamo moderato con un sistema semplificato e con personale proprio o eventualmente volontario. Formiamo questi moderatori e per questo motivo solo loro prendono le decisioni appropriate. Questi moderatori svolgono il loro lavoro in forma anonima. È possibile segnalare a noi messaggi, commenti e utenti (ad esempio, se forniscono informazioni nel loro profilo o se hanno immagini che violano queste Condizioni d'uso). Se ci segnalate qualcosa, potete darci una ragione e una breve spiegazione. Dopodiché daremo un'occhiata a ciò che hai segnalato e, se necessario, ti sanzioneremo, ad esempio bloccando i contributi, i commenti o gli utenti. Purtroppo, lei e la persona interessata non riceverà alcun feedback da parte nostra in questo momento, ma questo è in fase di pianificazione. Indipendentemente da ciò, ci riserviamo il diritto di imporre sanzioni in linea di principio per motivi che non sono o non sono ancora elencati nel nostro Codice di condotta o nei presenti termini di servizio.",
"title": "Moderazione"
},
"newTermsAndConditions": "Nuovi Termini e Condizioni", "newTermsAndConditions": "Nuovi Termini e Condizioni",
"privacy-statement": { "termsAndConditionsConfirmed": "Ho letto e confermato i Termini e condizioni.",
"description": "La nostra rete è una rete di conoscenza e azione sociale. Per noi è quindi particolarmente importante che il maggior numero possibile di contenuti sia accessibile al pubblico. Nel corso dello sviluppo della nostra rete ci sarà sempre più la possibilità di decidere sulla visibilità dei dati personali. Ti informeremo su queste nuove funzionalità. Altrimenti, dovresti sempre pensare a quali dati personali divulghi su te stesso (o altri). Ciò vale in particolare per il contenuto di post e commenti, poiché questi hanno un carattere ampiamente pubblico. Successivamente ci saranno possibilità di limitare la visibilità del tuo profilo. Parte dei termini di servizio è la nostra informativa sulla privacy, che ti informa sulle singole operazioni di trattamento dei dati nella nostra rete: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\"> https://human-connection.org/datenschutz/#netzwerk </a> bzw. <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"> https://human-connection.org/datenschutz/ </a> La nostra informativa sulla privacy è adattata alla situazione legale e caratteristiche della nostra rete ed è sempre valido nella versione più recente.",
"title": "Informativa sulla Privacy"
},
"terms-of-service": {
"description": "Le seguenti condizioni d'uso costituiscono la base per l'utilizzo della nostra rete. Quando ti registri, devi accettarli e ti informeremo in seguito di eventuali modifiche che potrebbero aver luogo. La rete di connessione umana è gestita in Germania ed è quindi soggetta alla legge tedesca. Il foro competente è Kirchheim / Teck. Per i dettagli, consulta la nostra impronta: <a href=\"https://human-connection.org/imprint\" target=\"_blank\" > https://human-connection.org/imprint </a>",
"title": "Termini di servizio"
},
"termsAndConditionsConfirmed": "Ho letto e confermato i <a href=\"/terms-and-conditions\" target=\"_blank\"> Termini e condizioni </a> .",
"termsAndConditionsNewConfirm": "Ho letto e accetto le nuove condizioni generali di contratto.", "termsAndConditionsNewConfirm": "Ho letto e accetto le nuove condizioni generali di contratto.",
"termsAndConditionsNewConfirmText": "Si prega di leggere le nuove condizioni d'uso ora!", "termsAndConditionsNewConfirmText": "Si prega di leggere le nuove condizioni d'uso ora!"
"use-and-license": {
"description": "Se qualsiasi contenuto pubblicato su di noi è protetto da diritti di proprietà intellettuale, l'utente ci concede una licenza mondiale, non esclusiva, trasferibile e sub-licenziabile, per l'utilizzo di tali contenuti per la pubblicazione nella nostra rete. Questa licenza scade quando si elimina il contenuto o l'intero account. Ricorda che altri potrebbero condividere i tuoi contenuti e noi non possiamo cancellarli.",
"title": "Uso e licenza"
}
}, },
"user": { "user": {
"avatar": { "avatar": {
"submitted": "" "submitted": null
} }
} }
} }

View File

@ -84,12 +84,11 @@
"following": "Volgt" "following": "Volgt"
}, },
"login": { "login": {
"copy": "Als u al een mini-aansluiting account heeft, log dan hier in.",
"email": "Uw E-mail", "email": "Uw E-mail",
"hello": "Hallo", "hello": "Hallo",
"login": "Inloggen", "login": "Inloggen",
"logout": "Uitloggen", "logout": "Uitloggen",
"moreInfo": "Wat is Human Connection?", "moreInfo": "Wat is {APPLICATION_NAME}?",
"password": "Uw Wachtwoord" "password": "Uw Wachtwoord"
}, },
"post": { "post": {

View File

@ -169,15 +169,13 @@
"title": "Twoja bańka filtrująca" "title": "Twoja bańka filtrująca"
}, },
"login": { "login": {
"copy": "Jeśli masz już konto Human Connection, zaloguj się tutaj.",
"email": "Twój adres e-mail", "email": "Twój adres e-mail",
"forgotPassword": "Zapomniałeś hasła?", "forgotPassword": "Zapomniałeś hasła?",
"hello": "Cześć", "hello": "Cześć",
"login": "Logowanie", "login": "Logowanie",
"logout": "Wyloguj się", "logout": "Wyloguj się",
"moreInfo": "Co to jest Human Connection?", "moreInfo": "Co to jest {APPLICATION_NAME}?",
"moreInfoHint": "idź po więcej szczegółów", "moreInfoHint": "idź po więcej szczegółów",
"moreInfoURL": "https://human-connection.org/en/",
"password": "Twoje hasło" "password": "Twoje hasło"
}, },
"moderation": { "moderation": {

View File

@ -102,14 +102,14 @@
}, },
"get-help": "Se você for vítima ou testemunhar um comportamento inaceitável, ou tiver qualquer outra preocupação, por favor notifique um organizador da comunidade o mais rápido possível e inclua o link ou mencione o conteúdo correspondente:", "get-help": "Se você for vítima ou testemunhar um comportamento inaceitável, ou tiver qualquer outra preocupação, por favor notifique um organizador da comunidade o mais rápido possível e inclua o link ou mencione o conteúdo correspondente:",
"preamble": { "preamble": {
"description": "A Human Connection é uma rede de conhecimento e ação social sem fins lucrativos da próxima geração. Feito por pessoas - para pessoas. Open Source, justo e transparente. Para uma mudança local e global positiva em todas as áreas da vida. Redesenhamos completamente a troca pública de conhecimentos, idéias e projetos. As funções da Human Connection reúnem as pessoas - offline e online - para que possamos fazer do mundo um lugar melhor.", "description": "A {APPLICATION_NAME} é uma rede de conhecimento e ação social sem fins lucrativos da próxima geração. Feito por pessoas - para pessoas. Open Source, justo e transparente. Para uma mudança local e global positiva em todas as áreas da vida. Redesenhamos completamente a troca pública de conhecimentos, idéias e projetos. As funções da {APPLICATION_NAME} reúnem as pessoas - offline e online - para que possamos fazer do mundo um lugar melhor.",
"title": "Introdução" "title": "Introdução"
}, },
"purpose": { "purpose": {
"description": "Com este código de conduta, regulamentamos os princípios essenciais para o comportamento em nossa rede social. A Carta dos Direitos Humanos das Nações Unidas é a nossa orientação e forma o coração da nossa compreensão dos valores. O código de conduta serve como princípios orientadores para a nossa aparência pessoal e interação uns com os outros. Qualquer pessoa ativa como usuário da Human Connection Network, que escreve artigos, comentários ou se conecta com outros usuários, incluindo aqueles fora da rede, reconhece estas regras de conduta como obrigatórias.", "description": "Com este código de conduta, regulamentamos os princípios essenciais para o comportamento em nossa rede social. A Carta dos Direitos Humanos das Nações Unidas é a nossa orientação e forma o coração da nossa compreensão dos valores. O código de conduta serve como princípios orientadores para a nossa aparência pessoal e interação uns com os outros. Qualquer pessoa ativa como usuário da {APPLICATION_NAME} Network, que escreve artigos, comentários ou se conecta com outros usuários, incluindo aqueles fora da rede, reconhece estas regras de conduta como obrigatórias.",
"title": "Propósito" "title": "Propósito"
}, },
"subheader": "para a rede social da Human Connection gGmbH", "subheader": "para a rede social da {ORGANIZATION_NAME}",
"unacceptable-behaviour": { "unacceptable-behaviour": {
"description": "Os seguintes comportamentos são inaceitáveis dentro da nossa comunidade:", "description": "Os seguintes comportamentos são inaceitáveis dentro da nossa comunidade:",
"list": { "list": {
@ -197,7 +197,7 @@
}, },
"signup": { "signup": {
"form": { "form": {
"data-privacy": "Eu li e entendi o <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Política de Privacidade</ds-text></a> ", "data-privacy": "Eu li e entendi o Política de Privacidade.",
"description": "Para começar, digite seu endereço de e-mail:", "description": "Para começar, digite seu endereço de e-mail:",
"errors": { "errors": {
"email-exists": "Já existe uma conta de usuário com este endereço de e-mail!", "email-exists": "Já existe uma conta de usuário com este endereço de e-mail!",
@ -207,9 +207,9 @@
"minimum-age": "Tenho 18 anos ou mais.", "minimum-age": "Tenho 18 anos ou mais.",
"submit": "Criar uma conta", "submit": "Criar uma conta",
"success": "Um e-mail com um link para completar o seu registo foi enviado para <b>{email}</b>", "success": "Um e-mail com um link para completar o seu registo foi enviado para <b>{email}</b>",
"terms-and-condition": "Eu concordo com os <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" > Termos e condições</ds-text></a>." "terms-and-condition": "Eu concordo com os Termos e condições."
}, },
"title": "Junte-se à Human Connection!", "title": "Junte-se à {APPLICATION_NAME}!",
"unavailable": "Infelizmente, o registo público para usuário não está disponível neste servidor." "unavailable": "Infelizmente, o registo público para usuário não está disponível neste servidor."
} }
} }
@ -337,16 +337,14 @@
"no-results": "Nenhuma contribuição encontrada." "no-results": "Nenhuma contribuição encontrada."
}, },
"login": { "login": {
"copy": "Se você já tem uma conta no Human Connection, entre aqui.",
"email": "Seu email", "email": "Seu email",
"failure": "Endereço de e-mail ou senha incorretos.", "failure": "Endereço de e-mail ou senha incorretos.",
"forgotPassword": "Esqueceu a sua senha?", "forgotPassword": "Esqueceu a sua senha?",
"hello": "Olá", "hello": "Olá",
"login": "Entrar", "login": "Entrar",
"logout": "Sair", "logout": "Sair",
"moreInfo": "O que é a Human Connection?", "moreInfo": "O que é a {APPLICATION_NAME}?",
"moreInfoHint": "para a página de apresentação", "moreInfoHint": "para a página de apresentação",
"moreInfoURL": "https://human-connection.org/en/",
"no-account": "Ainda não tem uma conta?", "no-account": "Ainda não tem uma conta?",
"password": "Sua senha", "password": "Sua senha",
"register": "Cadastrar-se", "register": "Cadastrar-se",
@ -355,7 +353,7 @@
"maintenance": { "maintenance": {
"explanation": "No momento estamos em manutenção, por favor tente novamente mais tarde.", "explanation": "No momento estamos em manutenção, por favor tente novamente mais tarde.",
"questions": "Qualquer dúvida, envie um e-mail para", "questions": "Qualquer dúvida, envie um e-mail para",
"title": "Human Connection está em manutenção" "title": "{APPLICATION_NAME} está em manutenção"
}, },
"moderation": { "moderation": {
"name": "Moderação", "name": "Moderação",
@ -424,7 +422,7 @@
"invites": { "invites": {
"description": "Digite o endereço de e-mail para o convite.", "description": "Digite o endereço de e-mail para o convite.",
"emailPlaceholder": "E-mail para convidar", "emailPlaceholder": "E-mail para convidar",
"title": "Convidar alguém para Human Connection!" "title": "Convidar alguém para {APPLICATION_NAME}!"
}, },
"memberSince": "Membro desde", "memberSince": "Membro desde",
"name": "Meu perfil", "name": "Meu perfil",
@ -682,43 +680,11 @@
} }
}, },
"termsAndConditions": { "termsAndConditions": {
"addition": {
"description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>",
"title": "Além disso, realizamos regularmente eventos onde você também pode compartilhar suas impressões e fazer perguntas. Você pode encontrar uma visão geral atual aqui:"
},
"agree": "Eu concordo!", "agree": "Eu concordo!",
"code-of-conduct": {
"description": "Nosso código de conduta serve como um manual de aparência pessoal e interação entre si. Quem quer que seja ativo como utilizador na rede Human Connection, escreva artigos, comentários ou faça contato com outros utilizadores, mesmo fora da rede, reconhece estas regras de conduta como sendo vinculativas. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct</a>",
"title": "Código de Conduta"
},
"errors-and-feedback": {
"description": "Fazemos todos os esforços para manter a nossa rede e dados seguros e disponíveis. Cada nova versão do software passa por testes automatizados e manuais. No entanto, podem ocorrer erros imprevistos. Portanto, somos gratos por quaisquer erros reportados. Você é bem-vindo para relatar quaisquer erros que você descobrir enviando um e-mail para o Suporte em support@human-connection.org.",
"title": "Erros e Feedback"
},
"help-and-questions": {
"description": "Para ajuda e perguntas, nós compilamos uma coleção abrangente de perguntas e respostas frequentes (FAQ) para você. Você pode encontrá-las aqui: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > https://support.human-connection.org/kb/ </a>",
"title": "Ajuda e Perguntas"
},
"moderation": {
"description": "Até que nossas possibilidades financeiras nos permitam implementar o sistema de moderação comunitária, moderamos com um sistema simplificado e com pessoal próprio ou possivelmente voluntário. Nós treinamos esses moderadores e por isso só eles tomam as decisões apropriadas. Estes moderadores realizam o seu trabalho de forma anônima. Você pode denunciar mensagens, comentários e usuários para nós (por exemplo, se eles fornecem informações em seu perfil ou têm imagens que violam estes Termos de Uso). Se você relatar algo para nós, você precisa dar uma razão e pode dar uma breve explicação. Em seguida, analisaremos o que você denunciou e o sancionaremos, se necessário, por exemplo, bloqueando contribuições, comentários ou usuários. Infelizmente, você e a pessoa em questão não receberão qualquer feedback da nossa parte neste momento, mas isto está na fase de planeamento. Independentemente disso, reservamo-nos o direito de impor sanções em princípio por razões que podem ou não estar listadas no nosso Código de Conduta ou nestes termos de serviço.",
"title": "Moderação"
},
"newTermsAndConditions": "Novos Termos e Condições", "newTermsAndConditions": "Novos Termos e Condições",
"privacy-statement": { "termsAndConditionsConfirmed": "Eu li e confirmei os Terms and Conditions.",
"description": "Nossa rede é uma rede social de conhecimento e ação. Portanto, é particularmente importante para nós que o máximo de conteúdo possível seja acessível ao público. No decurso do desenvolvimento da nossa rede, haverá cada vez mais a possibilidade de decidir sobre a visibilidade dos dados pessoais. Iremos informá-lo sobre estas novas funcionalidades. Caso contrário, você deve sempre pensar sobre quais dados pessoais você divulga sobre si mesmo (ou outros). Isto aplica-se em particular ao conteúdo das mensagens e comentários, uma vez que estes têm um carácter largamente público. Mais tarde, haverá possibilidades de limitar a visibilidade do seu perfil. Parte dos termos de serviço é a nossa declaração de privacidade, que o informa sobre as operações individuais de processamento de dados na nossa rede: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\"> https://human-connection.org/datenschutz/#netzwerk</a> bzw. <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz/</a> Nossa declaração de privacidade é adaptada à situação legal e às características de nossa rede e é sempre válida na versão mais atual.",
"title": "Política de Privacidade"
},
"terms-of-service": {
"description": "As seguintes condições de utilização constituem a base para a utilização da nossa rede. Ao registar-se, deve aceitar os termos de utilização e informaremos mais tarde sobre quaisquer alterações que possam ocorrer. A Human Connection Network é operada na Alemanha e, portanto, está sujeita à lei alemã. O local de jurisdição é Kirchheim / Teck. Para mais detalhes, veja a nossa impressão: <a href=\"https://human-connection.org/imprint\" target=\"_blank\" >https://human-connection.org/imprint</a> ",
"title": "Termos do Serviço"
},
"termsAndConditionsConfirmed": "Eu li e confirmei os <a href=\"/terms-and-conditions\" target=\"_blank\">Terms and Conditions</a>.",
"termsAndConditionsNewConfirm": "Eu li e concordo com os novos termos de condições.", "termsAndConditionsNewConfirm": "Eu li e concordo com os novos termos de condições.",
"termsAndConditionsNewConfirmText": "Por favor, leia os novos termos de uso agora!", "termsAndConditionsNewConfirmText": "Por favor, leia os novos termos de uso agora!"
"use-and-license": {
"description": "Se qualquer conteúdo que você publicar para nós for protegido por direitos de propriedade intelectual, você nos concede uma licença não exclusiva, transferível, sublicenciável e mundial para usar tal conteúdo para postar em nossa rede. Esta licença expira quando você exclui seu conteúdo ou toda a sua conta. Lembre-se de que outros podem compartilhar seu conteúdo e nós não podemos excluí-lo.",
"title": "Uso e Licença"
}
}, },
"user": { "user": {
"avatar": { "avatar": {

View File

@ -76,54 +76,7 @@
} }
}, },
"code-of-conduct": { "code-of-conduct": {
"consequences": { "subheader": "социальной сети {ORGANIZATION_NAME}"
"description": "Если участник сообщества проявляет неприемлемое поведение, ответственные операторы, модераторы и администраторы сети могут принять соответствующие меры, включая, но не ограничиваясь:",
"list": {
"0": "Просьба о немедленном прекращении неприемлемого поведения",
"1": "Блокирование или удаление комментариев",
"2": "Временное исключение из соответствующего поста или другого контента",
"3": "Блокирование или удаление контента",
"4": "Временный запрет на добавление контента",
"5": "Временное исключение из сети",
"6": "Окончательное исключение из сети",
"7": "Передача сведений о нарушениях немецкого законодательства."
},
"title": "Последствия неприемлемого поведения"
},
"expected-behaviour": {
"description": "Мы ожидаем и требуем от всех членов сообщества предерживаться следующих правил поведения:",
"list": {
"0": "Будьте внимательны и уважительны к тому, что пишете и делаете.",
"1": "Пытайтесь сотрудничать, прежде чем возникнет конфликт.",
"2": "Воздерживайтесь от поведения и высказываний, унижающих достоинство, дискриминационного или преследующего характера.",
"3": "Будьте внимательны к своему окружению и другим участникам. Информируйте лидеров сообщества об опасных ситуациях, когда кто-либо попал в беду или нарушает настоящий Кодекс поведения, даже если они кажутся незначительными."
},
"title": "Ожидаемое поведение"
},
"get-help": "Если вы стали жертвой или свидетелем неприемлемого поведения или у вас возникли какие-либо другие проблемы, пожалуйста, как можно скорее сообщите об этом организатору сообщества и укажите ссылку на соответствующий контент:",
"preamble": {
"description": "Human Connection - это некоммерческая социальная сеть знаний и действий следующего поколения. Создана людьми для людей. С открытым исходным кодом, справедливая и прозрачная. Для позитивных локальных и глобальных изменений во всех сферах жизни. Мы полностью перестраиваем публичный обмен знаниями, идеями и проектами. Функции Human Connection объединяют людей офлайн и онлайн так что мы можем сделать мир лучше.",
"title": "Преамбула"
},
"purpose": {
"description": "С помощью этих правил поведения мы регулируем основные принципы поведения в нашей социальной сети. При этом Устав ООН по правам человека является нашей ориентацией и лежит в основе нашего понимания ценностей. Правила поведения служат руководящими принципами для личного выступления и общения друг с другом. Любой, кто является активным пользователем в сети Human Connection, публикует сообщения, комментирует или контактирует с другими пользователями, в том числе за пределами сети, признает эти правила поведения обязательными.",
"title": "Цель"
},
"subheader": "социальной сети \"Human Connection gGmbH\"",
"unacceptable-behaviour": {
"description": "В нашем сообществе неприемлемо следующее поведение:",
"list": {
"0": "Дискриминационные посты, комментарии, высказывания или оскорбления, в частности, касающиеся пола, сексуальной ориентации, расы, религии, политической или мировоззренческой ориентации, или инвалидности.",
"1": "Публикация или ссылка на явно порнографические материалы.",
"2": "Прославление или умаление жестоких, или бесчеловечных актов насилия.",
"3": "Публикация персональных данных других лиц без их согласия или угрозы (\"Доксинг\").",
"4": "Преднамеренное запугивание или преследование.",
"5": "Рекламировать продукты и услуги с коммерческим намерением.",
"6": "Преступное поведение или нарушение немецкого права.",
"7": "Одобрение или поощрение недопустимого поведения."
},
"title": "Недопустимое поведение"
}
}, },
"comment": { "comment": {
"content": { "content": {
@ -197,7 +150,7 @@
}, },
"signup": { "signup": {
"form": { "form": {
"data-privacy": "Я прочитал и понял <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\"><ds-text bold color=\"primary\" >Заявление о конфиденциальности</ds-text></a>", "data-privacy": "Я прочитал и понял Заявление о конфиденциальности",
"description": "Для начала работы введите свой адрес электронной почты:", "description": "Для начала работы введите свой адрес электронной почты:",
"errors": { "errors": {
"email-exists": "Уже есть учетная запись пользователя с этим адресом электронной почты!", "email-exists": "Уже есть учетная запись пользователя с этим адресом электронной почты!",
@ -209,9 +162,9 @@
"no-political": "Я не от имени какой-либо партии или политической организации в сети.", "no-political": "Я не от имени какой-либо партии или политической организации в сети.",
"submit": "Создать учетную запись", "submit": "Создать учетную запись",
"success": "Письмо со ссылкой для завершения регистрации было отправлено на <b> {email} </b>", "success": "Письмо со ссылкой для завершения регистрации было отправлено на <b> {email} </b>",
"terms-and-condition": "Принимаю <a href=\"/terms-and-conditions\"><ds-text bold color=\"primary\" >Условия и положения</ds-text></a>." "terms-and-condition": "Принимаю Условия и положения."
}, },
"title": "Присоединяйся к Human Connection!", "title": "Присоединяйся к {APPLICATION_NAME}!",
"unavailable": "К сожалению, публичная регистрация пользователей на этом сервере сейчас недоступна." "unavailable": "К сожалению, публичная регистрация пользователей на этом сервере сейчас недоступна."
} }
} }
@ -250,7 +203,6 @@
"filterALL": "Просмотреть все посты", "filterALL": "Просмотреть все посты",
"filterFollow": "Показать сообщения пользователей, на которых я подписан", "filterFollow": "Показать сообщения пользователей, на которых я подписан",
"inappropriatePicture": "Эта картинка может быть неуместным для некоторых людей.", "inappropriatePicture": "Эта картинка может быть неуместным для некоторых людей.",
"inappropriatePictureText": "Когда моя картинка должна быть размыта",
"languageSelectLabel": "Язык", "languageSelectLabel": "Язык",
"languageSelectText": "Выберите язык", "languageSelectText": "Выберите язык",
"newPost": "Создать пост", "newPost": "Создать пост",
@ -352,16 +304,14 @@
"no-results": "Посты не найдены." "no-results": "Посты не найдены."
}, },
"login": { "login": {
"copy": "Авторизуйтесь, если у вас уже есть учетная запись Human Connection.",
"email": "Электронная почта", "email": "Электронная почта",
"failure": "Неверный адрес электронной почты или пароль.", "failure": "Неверный адрес электронной почты или пароль.",
"forgotPassword": "Забыли пароль?", "forgotPassword": "Забыли пароль?",
"hello": "Здравствуйте", "hello": "Здравствуйте",
"login": "Вход", "login": "Вход",
"logout": "Выйти", "logout": "Выйти",
"moreInfo": "Что такое Human Connection?", "moreInfo": "Что такое {APPLICATION_NAME}?",
"moreInfoHint": "на страницу проекта", "moreInfoHint": "на страницу проекта",
"moreInfoURL": "https://human-connection.org/en/",
"no-account": "У вас нет аккаунта?", "no-account": "У вас нет аккаунта?",
"password": "Пароль", "password": "Пароль",
"register": "Зарегистрируйтесь", "register": "Зарегистрируйтесь",
@ -370,7 +320,7 @@
"maintenance": { "maintenance": {
"explanation": "В данный момент мы проводим плановое техническое обслуживание, пожалуйста, повторите попытку позже.", "explanation": "В данный момент мы проводим плановое техническое обслуживание, пожалуйста, повторите попытку позже.",
"questions": "Любые вопросы или сообщения о проблемах отправляйте на электронную почту", "questions": "Любые вопросы или сообщения о проблемах отправляйте на электронную почту",
"title": "Human Connection на техническом обслуживании" "title": "{APPLICATION_NAME} на техническом обслуживании"
}, },
"moderation": { "moderation": {
"name": "Модерация", "name": "Модерация",
@ -497,7 +447,7 @@
"invites": { "invites": {
"description": "Введите адрес электронной почты для приглашения.", "description": "Введите адрес электронной почты для приглашения.",
"emailPlaceholder": "Электронная почта для приглашения", "emailPlaceholder": "Электронная почта для приглашения",
"title": "Пригласите кого-нибудь в Human Connection!" "title": "Пригласите кого-нибудь в {APPLICATION_NAME}!"
}, },
"memberSince": "Участник с", "memberSince": "Участник с",
"name": "Мой профиль", "name": "Мой профиль",
@ -779,47 +729,11 @@
} }
}, },
"termsAndConditions": { "termsAndConditions": {
"addition": {
"description": "<a href=\"https://human-connection.org/events/\" target=\"_blank\" > https://human-connection.org/events/ </a>",
"title": "Кроме того, мы регулярно проводим мероприятия, где вы также можете\\nподелиться своими впечатлениями и задать вопросы. Информацию о текущих событиях можно найти здесь:"
},
"agree": "Я согласен(на)!", "agree": "Я согласен(на)!",
"code-of-conduct": {
"description": "Наш кодекс поведения служит руководством для личного поведения и взаимодействия друг с другом. Каждый пользователь социальной сети Human Connection, который пишет статьи, комментирует или вступает в контакт с другими пользователями, даже за пределами сети, признает эти правила поведения обязательными. <a href=\"https://alpha.human-connection.org/code-of-conduct\" target=\"_blank\"> https://alpha.human-connection.org/code-of-conduct</a>",
"title": "Кодекс поведения"
},
"errors-and-feedback": {
"description": "Мы прилагаем все усилия для обеспечения безопасности и доступности нашей сети и данных. Каждый новый выпуск программного обеспечения проходит как автоматическое, так и ручное тестирование. Однако могут возникнуть непредвиденные ошибки. Поэтому мы благодарны за любые обнаруженные ошибки. Вы можете сообщить о любых обнаруженных ошибках, отправив электронное письмо в службу поддержки по адресу support@human-connection.org",
"title": "Ошибки и обратная связь"
},
"help-and-questions": {
"description": "Для справки и вопросов мы собрали для вас исчерпывающую подборку часто задаваемых вопросов и ответов (FAQ). Вы можете найти их здесь: <a href=\"https://support.human-connection.org/kb/\" target=\"_blank\" > https://support.human-connection.org/kb/ </a>",
"title": "Помощь и вопросы"
},
"moderation": {
"description": "Пока наши финансовые возможности не позволяют нам реализовать полноценную систему модерации, поэтому мы осуществляем упрощенную модерацию собственными силами и с помощью волонтёров. Мы специально обучаем этих модераторов, поэтому только они принимают соответствующие решения. Модераторы действуют анонимно. Вы можете сообщать нам о постах, комментариях и пользователях (например, если они предоставляют информацию в своем профиле или имеют изображения, которые нарушают настоящие Условия использования). При обращении вы можете указать причину и дать краткое пояснение. Мы рассмотрим обращение и применим санкции в случае необходимости, например, путем блокировки постов, комментариев или пользователей. К сожалению, в настоящее время ни вы ни пострадавший пользователь не получите от нас обратной связи, но мы планируем ряд улучшений в этом направлении. Несмотря на это, мы оставляем за собой право на применение санкций по причинам, которые не могут быть или ещё не указаны в нашем Кодексе поведения или настоящих Условиях использования.",
"title": "Модерация"
},
"newTermsAndConditions": "Новые условия и положения", "newTermsAndConditions": "Новые условия и положения",
"no-commercial-use": { "termsAndConditionsConfirmed": "Я прочитал(а) и подтверждаю Условия и положения.",
"description": "Использование Human Connection сети не допускается в коммерческих целях. Это включает, но не ограничивается рекламой продуктов с коммерческими целями, размещением партнерских ссылок, прямым привлечением пожертвований или предоставлением финансовой поддержки для целей, которые не признаются благотворительными для целей налогообложения.",
"title": "Нет коммерческого использования"
},
"privacy-statement": {
"description": "Наша сеть — это социальная сеть знаний и действий. Поэтому для нас особенно важно, чтобы как можно больше контента было общедоступным. В процессе развития нашей сети будет добавлено больше возможностей для управления видимостью личных данных. Об этих новых функциях мы сообщим дополнительно. В противном случае вы должны думать о том, какие личные данные вы раскрываете о себе (или других). Это особенно актуально для содержания постов и комментариев, поскольку они имеют в основном общедоступный характер. Позже появятся возможности ограничения видимости вашего профиля. Часть условий использования — это наша политика конфиденциальности, которая информирует вас об обработке персональных данных в нашей сети: <a href=\"https://human-connection.org/datenschutz/#netzwerk\" target=\"_blank\">https://human-connection.org/datenschutz/#netzwerk</a> или <a href=\"https://human-connection.org/datenschutz/\" target=\"_blank\">https://human-connection.org/datenschutz</a>. Наше заявление о конфиденциальности корректируется в соответствии с законодательством и характеристиками нашей сети и является действительной в настоящей версии.",
"title": "Заявление о конфиденциальности"
},
"terms-of-service": {
"description": "Следующие условия использования являются основой для использования нашей сети. При регистрации вы должны принять их, а мы при необходимости сообщим вам об изменениях. Сеть Human Connection работает в Германии и поэтому регулируется немецким законодательством. Место юрисдикции - Kirchheim / Teck. Подробности в выходных данных: <a href=\"https://human-connection.org/en/imprint\" target=\"_blank\" >https://human-connection.org/en/imprint</a>.",
"title": "Условия обслуживания"
},
"termsAndConditionsConfirmed": "Я прочитал(а) и подтверждаю <a href=\"/terms-and-conditions\" target=\"_blank\">Условия и положения</a>.",
"termsAndConditionsNewConfirm": "Я прочитал(а) и согласен(на) с новыми условиями.", "termsAndConditionsNewConfirm": "Я прочитал(а) и согласен(на) с новыми условиями.",
"termsAndConditionsNewConfirmText": "Пожалуйста, ознакомьтесь с новыми условиями использования!", "termsAndConditionsNewConfirmText": "Пожалуйста, ознакомьтесь с новыми условиями использования!"
"use-and-license": {
"description": "Если размещаемый в сети контент защищен правами на интеллектуальную собственность, вы предоставляете нам неисключительную, передаваемую, сублицензируемую и всемирную лицензию на использование этого контента для публикации в нашей сети. Эта лицензия заканчивается, как только вы удаляете свой контент или учетную запись. Помните, что другие пользователи могут продолжать делиться вашим контентом, и мы не можем его удалить.",
"title": "Использование и лицензия"
}
}, },
"user": { "user": {
"avatar": { "avatar": {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

View File

@ -8,7 +8,7 @@ export default {
manifest, manifest,
head: { head: {
title: 'Human Connection', title: manifest.name,
meta: [ meta: [
{ {
charset: 'utf-8', charset: 'utf-8',
@ -20,7 +20,7 @@ export default {
{ {
hid: 'description', hid: 'description',
name: 'description', name: 'description',
content: 'Maintenance page for Human Connection', content: `Maintenance page for ${manifest.name}`,
}, },
], ],
link: [ link: [
@ -49,4 +49,14 @@ export default {
}) })
}, },
}, },
build: {
extend(config, ctx) {
config.module.rules.push({
enforce: 'pre',
test: /\.html$/,
loader: 'raw-loader',
exclude: /(node_modules)/,
})
},
},
} }

View File

@ -1,9 +1,9 @@
{ {
"name": "@human-connection/maintenance", "name": "@ocelot-social/maintenance",
"version": "1.0.0", "version": "1.0.0",
"description": "Maintenance page for Human Connection", "description": "Maintenance page for ocelot.social",
"main": "index.js", "main": "index.js",
"repository": "https://github.com/Human-Connection/Human-Connection", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
"author": "Robert Schäfer", "author": "Robert Schäfer",
"license": "MIT", "license": "MIT",
"private": false, "private": false,

Some files were not shown because too many files have changed in this diff Show More