Merge branch 'master' into locations

components/Author.vue

@@ -72,7 +72,7 @@
           <ds-space margin="small">
             <ds-number
               :count="fanCount"
-              label="Folgen"
+              :label="$t('profile.followers')"
               size="x-large"
             />
           </ds-space>
@@ -81,7 +81,7 @@
           <ds-space margin="small">
             <ds-number
               :count="author.contributionsCount"
-              label="Beiträge"
+              :label="$t('common.post', null, author.contributionsCount)"
             />
           </ds-space>
         </ds-flex-item>
@@ -89,7 +89,7 @@
           <ds-space margin="small">
             <ds-number
               :count="author.commentsCount"
-              label="Kommentare"
+              :label="$t('common.comment', null, author.commentsCount)"
             />
           </ds-space>
         </ds-flex-item>

locales/de.json

@@ -8,7 +8,7 @@
     "delete": "Löschen"
   },
   "login": {
-    "copy": "Wenn Du ein Konto bei Human Connection hast, melde Dich bitte hier an.",
+    "copy": "Wenn Du bereits ein Konto bei Human Connection hast, melde Dich bitte hier an.",
     "login": "Einloggen",
     "logout": "Ausloggen",
     "email": "Deine E-Mail",
@@ -21,7 +21,9 @@
     "memberSince": "Mitglied seit",
     "follow": "Folgen",
     "followers": "Folgen",
-    "following": "Folgt"
+    "following": "Folgt",
+    "shouted": "Empfohlen",
+    "commented": "Kommentiert"
   },
   "settings": {
     "name": "Einstellungen",
@@ -104,5 +106,22 @@
       "quote": "Viele kleine Leute, an vielen kleinen Orten, die viele kleine Dinge tun, werden das Antlitz dieser Welt verändern.",
       "author": "Afrikanisches Sprichwort"
     }
+  },
+  "common": {
+    "post": "Beitrag ::: Beiträge",
+    "comment": "Kommentar ::: Kommentare",
+    "letsTalk": "Miteinander reden",
+    "versus": "Versus",
+    "moreInfo": "Mehr Info",
+    "takeAction": "Aktiv werden",
+    "shout": "Empfehlung ::: Empfehlungen",
+    "user": "Benutzer ::: Benutzer",
+    "category": "Kategorie ::: Kategorien",
+    "organization": "Organisation ::: Organisationen",
+    "project": "Projekt ::: Projekte",
+    "tag": "Tag ::: Tags",
+    "name": "Name",
+    "loadMore": "mehr laden",
+    "loading": "wird geladen"
   }
 }

locales/en.json

@@ -21,7 +21,9 @@
     "memberSince": "Member since",
     "follow": "Follow",
     "followers": "Followers",
-    "following": "Following"
+    "following": "Following",
+    "shouted": "Shouted",
+    "commented": "Commented"
   },
   "settings": {
     "name": "Settings",
@@ -104,5 +106,22 @@
       "quote": "Many small people in many small places do many small things, that can alter the face of the world.",
       "author": "African proverb"
     }
+  },
+  "common": {
+    "post": "Post ::: Posts",
+    "comment": "Comment ::: Comments",
+    "letsTalk": "Let`s Talk",
+    "versus": "Versus",
+    "moreInfo": "More Info",
+    "takeAction": "Take Action",
+    "shout": "Shout ::: Shouts",
+    "user": "User ::: Users",
+    "category": "Category ::: Categories",
+    "organization": "Organization ::: Organizations",
+    "project": "Project ::: Projects",
+    "tag": "Tag ::: Tags",
+    "name": "Name",
+    "loadMore": "load more",
+    "loading": "loading"
   }
 }

locales/es.json

@@ -1,6 +1,7 @@
 {
   "login": {
     "copy": "Si ya tiene una cuenta de Human Connection, inicie sesión aquí.",
+    "login": "Iniciar sesión",
     "logout": "Cierre de sesión",
     "email": "Tu correo electrónico",
     "password": "Tu contraseña",
@@ -10,9 +11,12 @@
   "profile": {
     "name": "Mi perfil",
     "memberSince": "Miembro desde",
-    "followers": "Seguidores"
+    "follow": "Seguir",
+    "followers": "Seguidores",
+    "following": "Siguiendo"
   },
   "settings": {
+    "name": "Configuración",
     "data": {
       "name": "Sus datos"
     },
@@ -25,6 +29,9 @@
     "download": {
       "name": "Descargar datos"
     },
+    "delete": {
+      "name": "Borrar cuenta"
+    },
     "organizations": {
       "name": "Mis organizaciones"
     },
@@ -35,12 +42,16 @@
   "admin": {
     "name": "Admin",
     "dashboard": {
+      "name": "Tablero",
       "users": "Usuarios",
+      "posts": "Mensajes",
       "comments": "Comentarios",
+      "notifications": "Notificaciones",
       "organizations": "Organizaciones",
       "projects": "Proyectos",
       "invites": "Invita",
-      "follows": "Sigue"
+      "follows": "Sigue",
+      "shouts": "Gritos"
     },
     "organizations": {
       "name": "Organizaciones"
@@ -56,14 +67,20 @@
     },
     "categories": {
       "name": "Categorías",
-      "categoryName": "Nombre"
+      "categoryName": "Nombre",
+      "postCount": "Mensajes"
     },
     "tags": {
       "name": "Etiquetas",
-      "tagCountUnique": "Usuarios"
+      "tagCountUnique": "Usuarios",
+      "tagCount": "Mensajes"
+    },
+    "settings": {
+      "name": "Configuración"
     }
   },
   "post": {
+    "name": "Mensaje",
     "moreInfo": {
       "name": "Más info"
     },
@@ -73,7 +90,25 @@
   },
   "quotes": {
     "african": {
+      "quote": "Muchas personas pequeñas en muchos lugares pequeños hacen muchas cosas pequeñas, que pueden alterar la faz del mundo.",
       "author": "Proverbio africano"
     }
+  },
+  "common": {
+    "post": "Mensaje ::: Mensajes",
+    "comment": "Comentario ::: Comentarios",
+    "letsTalk": "Hablemos",
+    "versus": "Versus",
+    "moreInfo": "Más info",
+    "takeAction": "Tomar acción",
+    "shout": "Grito ::: Gritos",
+    "user": "Usuario ::: Usuarios",
+    "category": "Categoría ::: Categorías",
+    "organization": "Organización ::: Organizaciones",
+    "project": "Proyecto ::: Proyectos",
+    "tag": "Etiqueta ::: Etiquetas",
+    "name": "Nombre",
+    "loadMore": "cargar más",
+    "loading": "cargando"
   }
 }

locales/fr.json

@@ -93,5 +93,22 @@
       "quote": "Beaucoup de petites personnes dans beaucoup de petits endroits font beaucoup de petites choses, qui peuvent changer la face du monde.",
       "author": "Proverbe africain"
     }
+  },
+  "common": {
+    "post": "Message ::: Messages",
+    "comment": "Commentaire ::: Commentaires",
+    "letsTalk": "Parlons-en",
+    "versus": "Versus",
+    "moreInfo": "Plus d'infos",
+    "takeAction": "Passer à l'action",
+    "shout": "Shout ::: Shouts",
+    "user": "Utilisateur ::: Utilisateurs",
+    "category": "Catégorie ::: Catégories",
+    "organization": "Organisation ::: Organisations",
+    "project": "Projet ::: Projets",
+    "tag": "Tag ::: Tags",
+    "name": "Nom",
+    "loadMore": "charger plus",
+    "loading": "chargement"
   }
 }

locales/it.json

@@ -1,6 +1,7 @@
 {
   "login": {
     "copy": "Se hai già un account di Human Connection, accedi qui.",
+    "login": "Accesso",
     "logout": "Logout",
     "email": "La tua email",
     "password": "La tua password",
@@ -9,8 +10,10 @@
   },
   "profile": {
     "name": "Il mio profilo",
+    "memberSince": "Membro dal",
     "follow": "Seguire",
-    "followers": "Seguaci"
+    "followers": "Seguaci",
+    "following": "Seguendo"
   },
   "settings": {
     "name": "Impostazioni",
@@ -41,12 +44,14 @@
     "dashboard": {
       "name": "Cruscotto",
       "users": "Utenti",
+      "posts": "Messaggi",
       "comments": "Commenti",
       "notifications": "Notifiche",
       "organizations": "Organizzazioni",
       "projects": "Progetti",
       "invites": "Inviti",
-      "follows": "Segue"
+      "follows": "Segue",
+      "shouts": "Grida"
     },
     "organizations": {
       "name": "Organizzazioni"
@@ -62,7 +67,8 @@
     },
     "categories": {
       "name": "Categorie",
-      "categoryName": "Nome"
+      "categoryName": "Nome",
+      "postCount": "Messaggi"
     },
     "tags": {
       "name": "Tag",
@@ -74,6 +80,7 @@
     }
   },
   "post": {
+    "name": "Messaggio",
     "moreInfo": {
       "name": "Ulteriori informazioni"
     },
@@ -83,7 +90,25 @@
   },
   "quotes": {
     "african": {
+      "quote": "Molte piccole persone in molti piccoli luoghi fanno molte piccole cose, che possono alterare la faccia del mondo.",
       "author": "Proverbio africano"
     }
+  },
+  "common": {
+    "post": "Messaggio ::: Messaggi",
+    "comment": "Commento ::: Commenti",
+    "letsTalk": "Parliamo",
+    "versus": "Contro",
+    "moreInfo": "Ulteriori informazioni",
+    "takeAction": "Agire",
+    "shout": "Grida ::: Grida",
+    "user": "Utente ::: Utenti",
+    "category": "Categoria ::: Categorie",
+    "organization": "Organizzazione ::: Organizzazioni",
+    "project": "Progetto ::: Progetti",
+    "tag": "Tag ::: Tag",
+    "name": "Nome",
+    "loadMore": "caricare di più",
+    "loading": "caricamento"
   }
 }

locales/nl.json

@@ -23,6 +23,9 @@
     "security": {
       "name": "Veiligheid"
     },
+    "invites": {
+      "name": "Uitnodigingen"
+    },
     "download": {
       "name": "Gegevens downloaden"
     },
@@ -46,6 +49,7 @@
       "notifications": "Meldingen",
       "organizations": "Organisaties",
       "projects": "Projecten",
+      "invites": "Uitnodigingen",
       "follows": "Volgt",
       "shouts": "Shouts"
     },
@@ -55,6 +59,9 @@
     "users": {
       "name": "Gebruikers"
     },
+    "pages": {
+      "name": "Pages"
+    },
     "notifications": {
       "name": "Meldingen"
     },
@@ -86,5 +93,22 @@
       "quote": "Veel kleine mensen op veel kleine plaatsen doen veel kleine dingen, die het gezicht van de wereld kunnen veranderen.",
       "author": "Afrikaans spreekwoord"
     }
+  },
+  "common": {
+    "post": "Bericht ::: Berichten",
+    "comment": "Opmerking ::: Opmerkingen",
+    "letsTalk": "Laten we praten",
+    "versus": "Versus",
+    "moreInfo": "Meer info",
+    "takeAction": "Onderneem actie",
+    "shout": "Shout ::: Shouts",
+    "user": "Gebruiker ::: Gebruikers",
+    "category": "Categorie ::: Categorieën",
+    "organization": "Organisatie ::: Organisaties",
+    "project": "Project ::: Projecten",
+    "tag": "Tag ::: Tags",
+    "name": "Naam",
+    "loadMore": "meer laden",
+    "loading": "inlading"
   }
 }

locales/pl.json

@@ -1,7 +1,7 @@
 {
   "login": {
     "copy": "Jeśli masz już konto Human Connection, zaloguj się tutaj.",
-    "login": "Login",
+    "login": "logowanie",
     "logout": "Wyloguj się",
     "email": "Twój adres e-mail",
     "password": "Twoje hasło",
@@ -40,7 +40,7 @@
     }
   },
   "admin": {
-    "name": "Admin",
+    "name": "Administrator",
     "dashboard": {
       "name": "Tablica rozdzielcza",
       "users": "Użytkownicy",
@@ -51,7 +51,7 @@
       "projects": "Projekty",
       "invites": "Zaproszenia",
       "follows": "Obserwowań",
-      "shouts": "Wykrzyki"
+      "shouts": "   okrzyk"
     },
     "organizations": {
       "name": "Organizacje"
@@ -93,5 +93,22 @@
       "quote": "Wielu małych ludzi w wielu małych miejscach robi wiele małych rzeczy, które mogą zmienić oblicze świata.",
       "author": "Afrykańskie przysłowie"
     }
+  },
+  "common": {
+    "post": "Post ::: Posty",
+    "comment": "Komentarz ::: Komentarze",
+    "letsTalk": "Porozmawiajmy",
+    "versus": "Versus",
+    "moreInfo": "Więcej informacji",
+    "takeAction": "Podejmij działanie",
+    "shout": "okrzyk       okrzyki",
+    "user": "Użytkownik ::: Użytkownicy",
+    "category": "kategoria kategorie",
+    "organization": "Organizacja ::: Organizacje",
+    "project": "Projekt ::: Projekty",
+    "tag": "Tag ::: Tagi",
+    "name": "imię",
+    "loadMore": "załaduj więcej",
+    "loading": "ładowanie"
   }
 }

locales/pt.json

@@ -44,13 +44,14 @@
     "dashboard": {
       "name": "Painel de controle",
       "users": "Usuários",
-      "posts": "Postagens",
+      "posts": "Pastagens",
       "comments": "Comentários",
       "notifications": "Notificações",
       "organizations": "Organizações",
       "projects": "Projetos",
       "invites": "Convites",
-      "follows": "Seguidores"
+      "follows": "Seguidores",
+      "shouts": "Gritos"
     },
     "organizations": {
       "name": "Organizações"
@@ -67,12 +68,12 @@
     "categories": {
       "name": "Categorias",
       "categoryName": "Nome",
-      "postCount": "Postagens"
+      "postCount": "Pastagens"
     },
     "tags": {
       "name": "Etiquetas",
       "tagCountUnique": "Usuários",
-      "tagCount": "Postagens"
+      "tagCount": "Pastagens"
     },
     "settings": {
       "name": "Configurações"
@@ -92,5 +93,22 @@
       "quote": "Pequenos grupos de pessoas, em pequenos locais podem fazer várias coisas pequenas, mas que podem alterar o mundo ao nosso redor.",
       "author": "Provérbio Africano"
     }
+  },
+  "common": {
+    "post": "Post ::: Postagens",
+    "comment": "Comentário ::: Comentários",
+    "letsTalk": "Vamos falar",
+    "versus": "Versus",
+    "moreInfo": "Mais informações",
+    "takeAction": "Tomar uma ação",
+    "shout": "Grito ::: Gritos",
+    "user": "Usuário ::: Usuários",
+    "category": "Categoria ::: Categorias",
+    "organization": "Organização ::: Organizações",
+    "project": "Projeto ::: Projetos",
+    "tag": "Tag ::: Tags",
+    "name": "Nome",
+    "loadMore": "carregar mais",
+    "loading": "carregando"
   }
 }

pages/post/_slug.vue

@@ -18,33 +18,33 @@
 
 <script>
 export default {
-  data() {
+  computed: {
-    return {
+    routes() {
-      routes: [
+      return [
         {
-          name: 'Post',
+          name: this.$t('common.post', null, 1),
           path: `/post/${this.$route.params.slug}`,
           children: [
             {
-              name: 'Kommentare',
+              name: this.$t('common.comment', null, 2),
               path: `/post/${this.$route.params.slug}#comments`
             },
             {
-              name: 'Miteinander reden',
+              name: this.$t('common.letsTalk'),
               path: `/post/${this.$route.params.slug}#lets-talk`
             },
             {
-              name: 'Versus',
+              name: this.$t('common.versus'),
               path: `/post/${this.$route.params.slug}#versus`
             }
           ]
         },
         {
-          name: 'Mehr Info',
+          name: this.$t('common.moreInfo'),
           path: `/post/${this.$route.params.slug}/more-info`
         },
         {
-          name: 'Aktiv werden',
+          name: this.$t('common.takeAction'),
           path: `/post/${this.$route.params.slug}/take-action`
         }
       ]

pages/profile/_slug.vue

@@ -205,7 +205,7 @@
                   <ds-space margin="small">
                     <!-- TODO: find better solution for rendering errors -->
                     <no-ssr>
-                      <ds-number label="Beiträge">
+                      <ds-number :label="$t('common.post', null, user.contributionsCount)">
                         <hc-count-to
                           slot="count"
                           :end-val="user.contributionsCount"
@@ -218,7 +218,7 @@
                   <ds-space margin="small">
                     <!-- TODO: find better solution for rendering errors -->
                     <no-ssr>
-                      <ds-number label="Kommentiert">
+                      <ds-number :label="$t('profile.commented')">
                         <hc-count-to
                           slot="count"
                           :end-val="user.commentsCount"
@@ -231,7 +231,7 @@
                   <ds-space margin="small">
                     <!-- TODO: find better solution for rendering errors -->
                     <no-ssr>
-                      <ds-number label="Empfohlen">
+                      <ds-number :label="$t('profile.shouted')">
                         <hc-count-to
                           slot="count"
                           :end-val="user.shoutedCount"