mirror of
https://github.com/IT4Change/Ocelot-Social.git
synced 2025-12-13 07:45:56 +00:00
Merge pull request #1244 from Human-Connection/451-lokalise-unlocalised-texts-20190812
🍰 454 Lokalise / translate all unlocalised Texts / Translations / Languages
This commit is contained in:
mattwr18
GitHub
commit
0213eec4e2
@ -29,9 +29,9 @@ Feature: Tags and Categories
|
||||
|
||||
Scenario: See an overview of tags
|
||||
When I navigate to the administration dashboard
|
||||
And I click on the menu item "Tags"
|
||||
And I click on the menu item "Hashtags"
|
||||
Then I can see the following table:
|
||||
| | Name | Users | Posts |
|
||||
| 1 | Democracy | 3 | 4 |
|
||||
| 2 | Nature | 2 | 3 |
|
||||
| 3 | Ecology | 1 | 1 |
|
||||
| No. | Hashtags | Users | Posts |
|
||||
| 1 | #Democracy | 3 | 4 |
|
||||
| 2 | #Nature | 2 | 3 |
|
||||
| 3 | #Ecology | 1 | 1 |
|
||||
|
||||
@ -34,4 +34,4 @@
|
||||
"npm-run-all": "^4.1.5",
|
||||
"slug": "^1.1.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -215,6 +215,7 @@
|
||||
},
|
||||
"table": {
|
||||
"columns": {
|
||||
"number": "Nr.",
|
||||
"name": "Name",
|
||||
"slug": "Slug",
|
||||
"role": "Rolle",
|
||||
@ -235,7 +236,9 @@
|
||||
"postCount": "Beiträge"
|
||||
},
|
||||
"tags": {
|
||||
"name": "Schlagworte",
|
||||
"name": "Hashtags",
|
||||
"number": "Nr.",
|
||||
"nameOfHashtag": "Name",
|
||||
"tagCountUnique": "Benutzer",
|
||||
"tagCount": "Beiträge"
|
||||
},
|
||||
@ -251,7 +254,12 @@
|
||||
"post": {
|
||||
"name": "Beitrag",
|
||||
"moreInfo": {
|
||||
"name": "Mehr Info"
|
||||
"name": "Mehr Info",
|
||||
"title": "Mehr Informationen",
|
||||
"description": "Hier findest du weitere Infos zum Thema.",
|
||||
"titleOfCategoriesSection": "Kategorien",
|
||||
"titleOfHashtagsSection": "Hashtags",
|
||||
"titleOfRelatedContributionsSection": "Verwandte Beiträge"
|
||||
},
|
||||
"takeAction": {
|
||||
"name": "Aktiv werden"
|
||||
|
||||
@ -107,7 +107,7 @@
|
||||
"follow": "Follow",
|
||||
"followers": "Followers",
|
||||
"following": "Following",
|
||||
"shouted": "Recommended",
|
||||
"shouted": "Shouted",
|
||||
"commented": "Commented",
|
||||
"userAnonym": "Anonymous",
|
||||
"socialMedia": "Where else can I find",
|
||||
@ -203,7 +203,7 @@
|
||||
"projects": "Projects",
|
||||
"invites": "Invites",
|
||||
"follows": "Follows",
|
||||
"shouts": "Recommended"
|
||||
"shouts": "Shouts"
|
||||
},
|
||||
"organizations": {
|
||||
"name": "Organizations"
|
||||
@ -215,6 +215,7 @@
|
||||
},
|
||||
"table": {
|
||||
"columns": {
|
||||
"number": "No.",
|
||||
"name": "Name",
|
||||
"slug": "Slug",
|
||||
"role": "Role",
|
||||
@ -235,7 +236,9 @@
|
||||
"postCount": "Posts"
|
||||
},
|
||||
"tags": {
|
||||
"name": "Tags",
|
||||
"name": "Hashtags",
|
||||
"number": "No.",
|
||||
"nameOfHashtag": "Name",
|
||||
"tagCountUnique": "Users",
|
||||
"tagCount": "Posts"
|
||||
},
|
||||
@ -251,7 +254,12 @@
|
||||
"post": {
|
||||
"name": "Post",
|
||||
"moreInfo": {
|
||||
"name": "More info"
|
||||
"name": "More info",
|
||||
"title": "More information",
|
||||
"description": "Here you can find more information about this topic.",
|
||||
"titleOfCategoriesSection": "Categories",
|
||||
"titleOfHashtagsSection": "Hashtags",
|
||||
"titleOfRelatedContributionsSection": "Related posts"
|
||||
},
|
||||
"takeAction": {
|
||||
"name": "Take action"
|
||||
|
||||
@ -31,7 +31,7 @@ export default {
|
||||
},
|
||||
apollo: {
|
||||
Category: {
|
||||
query: gql(`
|
||||
query: gql`
|
||||
query {
|
||||
Category(orderBy: postCount_desc) {
|
||||
id
|
||||
@ -41,7 +41,7 @@ export default {
|
||||
postCount
|
||||
}
|
||||
}
|
||||
`),
|
||||
`,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@ -133,7 +133,7 @@ export default {
|
||||
},
|
||||
apollo: {
|
||||
statistics: {
|
||||
query: gql(`
|
||||
query: gql`
|
||||
query {
|
||||
statistics {
|
||||
countUsers
|
||||
@ -147,7 +147,7 @@ export default {
|
||||
countShouts
|
||||
}
|
||||
}
|
||||
`),
|
||||
`,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@ -2,7 +2,12 @@
|
||||
<ds-card :header="$t('admin.tags.name')">
|
||||
<ds-table :data="Tag" :fields="fields" condensed>
|
||||
<template slot="id" slot-scope="scope">
|
||||
{{ scope.index + 1 }}
|
||||
{{ scope.index + 1 }}.
|
||||
</template>
|
||||
<template slot="name" slot-scope="scope">
|
||||
<nuxt-link :to="{ path: '/', query: { hashtag: scope.row.id } }">
|
||||
<b>#{{ scope.row.name | truncate(20) }}</b>
|
||||
</nuxt-link>
|
||||
</template>
|
||||
</ds-table>
|
||||
</ds-card>
|
||||
@ -20,8 +25,8 @@ export default {
|
||||
computed: {
|
||||
fields() {
|
||||
return {
|
||||
id: '#',
|
||||
name: 'Name',
|
||||
id: this.$t('admin.tags.number'),
|
||||
name: this.$t('admin.tags.name'),
|
||||
taggedCountUnique: {
|
||||
label: this.$t('admin.tags.tagCountUnique'),
|
||||
align: 'right',
|
||||
@ -35,7 +40,7 @@ export default {
|
||||
},
|
||||
apollo: {
|
||||
Tag: {
|
||||
query: gql(`
|
||||
query: gql`
|
||||
query {
|
||||
Tag(first: 20, orderBy: taggedCountUnique_desc) {
|
||||
id
|
||||
@ -44,7 +49,7 @@ export default {
|
||||
taggedCountUnique
|
||||
}
|
||||
}
|
||||
`),
|
||||
`,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<ds-card v-if="User && User.length">
|
||||
<ds-table :data="User" :fields="fields" condensed>
|
||||
<template slot="index" slot-scope="scope">
|
||||
{{ scope.row.index }}.
|
||||
{{ scope.row.index + 1 }}.
|
||||
</template>
|
||||
<template slot="name" slot-scope="scope">
|
||||
<nuxt-link
|
||||
@ -57,9 +57,7 @@
|
||||
</ds-flex>
|
||||
</ds-card>
|
||||
<ds-card v-else>
|
||||
<ds-placeholder>
|
||||
{{ $t('admin.users.empty') }}
|
||||
</ds-placeholder>
|
||||
<ds-placeholder>{{ $t('admin.users.empty') }}</ds-placeholder>
|
||||
</ds-card>
|
||||
</div>
|
||||
</template>
|
||||
@ -92,7 +90,7 @@ export default {
|
||||
},
|
||||
fields() {
|
||||
return {
|
||||
index: '#',
|
||||
index: this.$t('admin.users.table.columns.number'),
|
||||
name: this.$t('admin.users.table.columns.name'),
|
||||
slug: this.$t('admin.users.table.columns.slug'),
|
||||
createdAt: this.$t('admin.users.table.columns.createdAt'),
|
||||
@ -118,20 +116,26 @@ export default {
|
||||
apollo: {
|
||||
User: {
|
||||
query() {
|
||||
return gql(`
|
||||
query($filter: _UserFilter, $first: Int, $offset: Int, $email: String) {
|
||||
User(email: $email, filter: $filter, first: $first, offset: $offset, orderBy: createdAt_desc) {
|
||||
id
|
||||
name
|
||||
slug
|
||||
role
|
||||
createdAt
|
||||
contributionsCount
|
||||
commentedCount
|
||||
shoutedCount
|
||||
return gql`
|
||||
query($filter: _UserFilter, $first: Int, $offset: Int, $email: String) {
|
||||
User(
|
||||
email: $email
|
||||
filter: $filter
|
||||
first: $first
|
||||
offset: $offset
|
||||
orderBy: createdAt_desc
|
||||
) {
|
||||
id
|
||||
name
|
||||
slug
|
||||
role
|
||||
createdAt
|
||||
contributionsCount
|
||||
commentedCount
|
||||
shoutedCount
|
||||
}
|
||||
}
|
||||
}
|
||||
`)
|
||||
`
|
||||
},
|
||||
variables() {
|
||||
const { offset, first, email, filter } = this
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
<template>
|
||||
<ds-card>
|
||||
<h2 style="margin-bottom: .2em;">Mehr Informationen</h2>
|
||||
<p>Hier findest du weitere infos zum Thema.</p>
|
||||
<h2 style="margin-bottom: .2em;">{{ $t('post.moreInfo.title') }}</h2>
|
||||
<p>{{ $t('post.moreInfo.description') }}</p>
|
||||
<ds-space />
|
||||
<h3>
|
||||
<ds-icon name="compass" />
|
||||
Themenkategorien
|
||||
<!-- <ds-icon name="compass" /> -->
|
||||
{{ $t('post.moreInfo.titleOfCategoriesSection') }}
|
||||
</h3>
|
||||
<div class="tags">
|
||||
<ds-icon
|
||||
@ -22,8 +22,8 @@
|
||||
</div>
|
||||
<template v-if="post.tags && post.tags.length">
|
||||
<h3>
|
||||
<ds-icon name="tags" />
|
||||
Schlagwörter
|
||||
<!-- <ds-icon name="tags" /> -->
|
||||
{{ $t('post.moreInfo.titleOfHashtagsSection') }}
|
||||
</h3>
|
||||
<div class="tags">
|
||||
<ds-tag v-for="tag in post.tags" :key="tag.id">
|
||||
@ -32,7 +32,7 @@
|
||||
</ds-tag>
|
||||
</div>
|
||||
</template>
|
||||
<h3>Verwandte Beiträge</h3>
|
||||
<h3>{{ $t('post.moreInfo.titleOfRelatedContributionsSection') }}</h3>
|
||||
<ds-section style="margin: 0 -1.5rem; padding: 1.5rem;">
|
||||
<ds-flex v-if="post.relatedContributions && post.relatedContributions.length" gutter="small">
|
||||
<hc-post-card
|
||||
@ -71,7 +71,7 @@ export default {
|
||||
apollo: {
|
||||
Post: {
|
||||
query() {
|
||||
return gql(`
|
||||
return gql`
|
||||
query Post($slug: String!) {
|
||||
Post(slug: $slug) {
|
||||
id
|
||||
@ -118,7 +118,7 @@ export default {
|
||||
shoutedCount
|
||||
}
|
||||
}
|
||||
`)
|
||||
`
|
||||
},
|
||||
variables() {
|
||||
return {
|
||||
|
||||
109
webapp/yarn.lock
109
webapp/yarn.lock
@ -1688,18 +1688,6 @@
|
||||
react-inspector "^3.0.2"
|
||||
uuid "^3.3.2"
|
||||
|
||||
"@storybook/addons@5.1.10":
|
||||
version "5.1.10"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.1.10.tgz#2d8d8ca20b6d9b4652744f5fc00ead483f705435"
|
||||
integrity sha512-M9b2PCp9RZxDC6wL7vVt2SCKCGXrrEAOsdpMvU569yB1zoUPEiiqElVDwb91O2eAGPnmd2yjImp90kOpKUW0EA==
|
||||
dependencies:
|
||||
"@storybook/api" "5.1.10"
|
||||
"@storybook/channels" "5.1.10"
|
||||
"@storybook/client-logger" "5.1.10"
|
||||
core-js "^3.0.1"
|
||||
global "^4.3.2"
|
||||
util-deprecate "^1.0.2"
|
||||
|
||||
"@storybook/addons@5.1.11":
|
||||
version "5.1.11"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.1.11.tgz#27f9cfed8d7f7c8a3fc341cdba3b0bdf608f02aa"
|
||||
@ -1712,29 +1700,6 @@
|
||||
global "^4.3.2"
|
||||
util-deprecate "^1.0.2"
|
||||
|
||||
"@storybook/api@5.1.10":
|
||||
version "5.1.10"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.1.10.tgz#5eeb5d9a7c268e5c89bd40c9a80293a7c72343b8"
|
||||
integrity sha512-YeZe/71zLMmgT95IMAEZOc9AwL6Y23mWvkZMwFbkokxS9+bU/qmVlQ0B9c3JBzO3OSs7sXaRqyP1o3QkQgVsiw==
|
||||
dependencies:
|
||||
"@storybook/channels" "5.1.10"
|
||||
"@storybook/client-logger" "5.1.10"
|
||||
"@storybook/core-events" "5.1.10"
|
||||
"@storybook/router" "5.1.10"
|
||||
"@storybook/theming" "5.1.10"
|
||||
core-js "^3.0.1"
|
||||
fast-deep-equal "^2.0.1"
|
||||
global "^4.3.2"
|
||||
lodash "^4.17.11"
|
||||
memoizerific "^1.11.3"
|
||||
prop-types "^15.6.2"
|
||||
react "^16.8.3"
|
||||
semver "^6.0.0"
|
||||
shallow-equal "^1.1.0"
|
||||
store2 "^2.7.1"
|
||||
telejson "^2.2.1"
|
||||
util-deprecate "^1.0.2"
|
||||
|
||||
"@storybook/api@5.1.11":
|
||||
version "5.1.11"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/api/-/api-5.1.11.tgz#71ef00285cd8602aad24cdb26c60c5d3c76631e5"
|
||||
@ -1769,13 +1734,6 @@
|
||||
global "^4.3.2"
|
||||
telejson "^2.2.1"
|
||||
|
||||
"@storybook/channels@5.1.10":
|
||||
version "5.1.10"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.1.10.tgz#04fd35c05032c675f7816ea1ca873c1a0415c6d9"
|
||||
integrity sha512-w7n/bV1BLu51KI1eLc75lN9H1ssBc3PZMXk88GkMiKyBVRzPlJA5ixnzH86qwYGReE0dhRpsgHXZ5XmoKaVmPA==
|
||||
dependencies:
|
||||
core-js "^3.0.1"
|
||||
|
||||
"@storybook/channels@5.1.11":
|
||||
version "5.1.11"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/channels/-/channels-5.1.11.tgz#77ddf9d777891f975ac10095772c840fed4c4620"
|
||||
@ -1801,13 +1759,6 @@
|
||||
memoizerific "^1.11.3"
|
||||
qs "^6.6.0"
|
||||
|
||||
"@storybook/client-logger@5.1.10":
|
||||
version "5.1.10"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.1.10.tgz#f83a8717924dd222e0a6df82ae74701f27e0bb35"
|
||||
integrity sha512-vB1NoFWRTgcERwodhbgoDwI00eqU8++nXI7GhMS1CY8haZaSp3gyKfHRWyfH+M+YjQuGBRUcvIk4gK6OtSrDOw==
|
||||
dependencies:
|
||||
core-js "^3.0.1"
|
||||
|
||||
"@storybook/client-logger@5.1.11":
|
||||
version "5.1.11"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/client-logger/-/client-logger-5.1.11.tgz#9509af3021b7a9977f9dba1f2ff038fd3c994437"
|
||||
@ -1815,30 +1766,6 @@
|
||||
dependencies:
|
||||
core-js "^3.0.1"
|
||||
|
||||
"@storybook/components@5.1.10":
|
||||
version "5.1.10"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.1.10.tgz#4b6436f0b5bb2483fb231bee263d173a9ed7d241"
|
||||
integrity sha512-QUQeeQp1xNWiL4VlxFAea0kqn2zvBfmfPlUddOFO9lBhT6pVy0xYPjXjbTVWjVcYzZpyUNWw5GplqrR5jhlaCA==
|
||||
dependencies:
|
||||
"@storybook/client-logger" "5.1.10"
|
||||
"@storybook/theming" "5.1.10"
|
||||
core-js "^3.0.1"
|
||||
global "^4.3.2"
|
||||
markdown-to-jsx "^6.9.1"
|
||||
memoizerific "^1.11.3"
|
||||
polished "^3.3.1"
|
||||
popper.js "^1.14.7"
|
||||
prop-types "^15.7.2"
|
||||
react "^16.8.3"
|
||||
react-dom "^16.8.3"
|
||||
react-focus-lock "^1.18.3"
|
||||
react-helmet-async "^1.0.2"
|
||||
react-popper-tooltip "^2.8.3"
|
||||
react-syntax-highlighter "^8.0.1"
|
||||
react-textarea-autosize "^7.1.0"
|
||||
recompose "^0.30.0"
|
||||
simplebar-react "^1.0.0-alpha.6"
|
||||
|
||||
"@storybook/components@5.1.11":
|
||||
version "5.1.11"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/components/-/components-5.1.11.tgz#da253af0a8cb1b063c5c2e8016c4540c983f717d"
|
||||
@ -1863,13 +1790,6 @@
|
||||
recompose "^0.30.0"
|
||||
simplebar-react "^1.0.0-alpha.6"
|
||||
|
||||
"@storybook/core-events@5.1.10":
|
||||
version "5.1.10"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.1.10.tgz#5aed88c572036b6bd6dfff28976ee96e6e175d7a"
|
||||
integrity sha512-Lvu/rNcgS+XCkQKSGdNpUSWjpFF9AOSHPXsvkwHbRwJYdMDn3FznlXfDUiubOWtsziXHB6vl3wkKDlH+ckb32Q==
|
||||
dependencies:
|
||||
core-js "^3.0.1"
|
||||
|
||||
"@storybook/core-events@5.1.11":
|
||||
version "5.1.11"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/core-events/-/core-events-5.1.11.tgz#9d00503a936d30398f7a64336eb956303d053765"
|
||||
@ -1961,17 +1881,6 @@
|
||||
pretty-hrtime "^1.0.3"
|
||||
regenerator-runtime "^0.12.1"
|
||||
|
||||
"@storybook/router@5.1.10":
|
||||
version "5.1.10"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.1.10.tgz#d3cffd3f1105eb665882f389746ccabbb98c3c16"
|
||||
integrity sha512-BdG6/essPZFHCP2ewCG0gYFQfmuuTSHXAB5fd/rwxLSYj1IzNznC5OxkvnSaTr4rgoxxaW/z1hbN1NuA0ivlFA==
|
||||
dependencies:
|
||||
"@reach/router" "^1.2.1"
|
||||
core-js "^3.0.1"
|
||||
global "^4.3.2"
|
||||
memoizerific "^1.11.3"
|
||||
qs "^6.6.0"
|
||||
|
||||
"@storybook/router@5.1.11":
|
||||
version "5.1.11"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/router/-/router-5.1.11.tgz#75089e9e623482e52ed894c3f0cb0fc6a5372da9"
|
||||
@ -1983,24 +1892,6 @@
|
||||
memoizerific "^1.11.3"
|
||||
qs "^6.6.0"
|
||||
|
||||
"@storybook/theming@5.1.10":
|
||||
version "5.1.10"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.1.10.tgz#f9bd519cdf9cccf730656e3f5fd56a339dd07c9f"
|
||||
integrity sha512-5cN1lmdVUwAR8U3T49Lfb8JW5RBvxBSPGZpUmbLGz1zi0tWBJgYXoGtw4RbTBjV9kCQOXkHGH12AsdDxHh931w==
|
||||
dependencies:
|
||||
"@emotion/core" "^10.0.9"
|
||||
"@emotion/styled" "^10.0.7"
|
||||
"@storybook/client-logger" "5.1.10"
|
||||
common-tags "^1.8.0"
|
||||
core-js "^3.0.1"
|
||||
deep-object-diff "^1.1.0"
|
||||
emotion-theming "^10.0.9"
|
||||
global "^4.3.2"
|
||||
memoizerific "^1.11.3"
|
||||
polished "^3.3.1"
|
||||
prop-types "^15.7.2"
|
||||
resolve-from "^5.0.0"
|
||||
|
||||
"@storybook/theming@5.1.11":
|
||||
version "5.1.11"
|
||||
resolved "https://registry.yarnpkg.com/@storybook/theming/-/theming-5.1.11.tgz#0d1af46535f2e601293c999a314905069a93ec3b"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user