mirror of
https://github.com/IT4Change/gradido.git
synced 2026-02-06 09:56:05 +00:00
Merge remote-tracking branch 'origin/master' into 3522-feature-introduce-security-in-disbursement-handshake
This commit is contained in:
clauspeterhuebner
commit
3fc7fa9673
@ -22,7 +22,7 @@ const i18n = createI18n({
|
||||
},
|
||||
edit: 'Edit',
|
||||
delete: 'Delete',
|
||||
moderatorChat: 'Chat',
|
||||
Chat: 'Chat',
|
||||
},
|
||||
},
|
||||
datetimeFormats: {
|
||||
|
||||
@ -22,7 +22,7 @@ const i18n = createI18n({
|
||||
},
|
||||
edit: 'Edit',
|
||||
delete: 'Delete',
|
||||
moderatorChat: 'Chat',
|
||||
Chat: 'Chat',
|
||||
},
|
||||
},
|
||||
datetimeFormats: {
|
||||
|
||||
@ -25,6 +25,8 @@
|
||||
@click="emit('toggle-messages-visible')"
|
||||
>
|
||||
{{ $t('contribution.alert.answerQuestion') }}
|
||||
<br />
|
||||
{{ $t('answerNow') }}
|
||||
</div>
|
||||
</BCol>
|
||||
<BCol cols="9" lg="3" offset="3" offset-md="0" offset-lg="0">
|
||||
@ -78,7 +80,7 @@
|
||||
@click="emit('toggle-messages-visible')"
|
||||
>
|
||||
<IBiChatDots />
|
||||
<div>{{ $t('moderatorChat') }}</div>
|
||||
<div>{{ $t('Chat') }}</div>
|
||||
</div>
|
||||
</BCol>
|
||||
</BRow>
|
||||
|
||||
@ -29,13 +29,13 @@ const i18n = createI18n({
|
||||
overview: 'Overview',
|
||||
send: 'Send',
|
||||
transactions: 'Transactions',
|
||||
info: 'Info',
|
||||
circles: 'Circles',
|
||||
usersearch: 'User Search',
|
||||
settings: 'Settings',
|
||||
admin_area: 'Admin Area',
|
||||
logout: 'Logout',
|
||||
},
|
||||
info: 'Info',
|
||||
creation: 'Creation',
|
||||
},
|
||||
},
|
||||
@ -108,7 +108,7 @@ describe('Sidebar', () => {
|
||||
expect(wrapper.findAll('.nav-item').at(3).text()).toContain('Creation')
|
||||
})
|
||||
|
||||
it('has nav-item "navigation.info" in navbar', () => {
|
||||
it('has nav-item "info" in navbar', () => {
|
||||
expect(wrapper.findAll('.nav-item').at(4).text()).toContain('Info')
|
||||
})
|
||||
})
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
<BNavItem to="/information" class="mb-3" active-class="active-route">
|
||||
<div class="sidebar-menu-item-wrapper">
|
||||
<i-mdi-information class="svg-icon" />
|
||||
<span class="ms-2">{{ $t('navigation.info') }}</span>
|
||||
<span class="ms-2">{{ $t('info') }}</span>
|
||||
</div>
|
||||
</BNavItem>
|
||||
</BNav>
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
</span>
|
||||
</div>
|
||||
<a href="https://gradido.net/gms1/" target="_blank">
|
||||
{{ $t('info') }}
|
||||
{{ $t('card-user-search.info') }}
|
||||
</a>
|
||||
<BRow class="my-1">
|
||||
<BCol cols="12">
|
||||
|
||||
@ -20,7 +20,7 @@ export function useAppToast() {
|
||||
|
||||
const toastInfo = (message) => {
|
||||
toast(message, {
|
||||
title: t('navigation.info'),
|
||||
title: t('info'),
|
||||
variant: 'warning',
|
||||
bodyClass: 'gdd-toaster-body-darken',
|
||||
})
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
"1000thanks": "1000 Dank, weil du bei uns bist!",
|
||||
"125": "125%",
|
||||
"85": "85%",
|
||||
"Chat": "Chat",
|
||||
"GDD": "GDD",
|
||||
"GDT": "GDT",
|
||||
"GMS": {
|
||||
@ -17,6 +18,7 @@
|
||||
},
|
||||
"PersonalDetails": "Persönliche Angaben",
|
||||
"advanced-calculation": "Vorausberechnung",
|
||||
"answerNow": "→ Jetzt antworten!",
|
||||
"asterisks": "****",
|
||||
"auth": {
|
||||
"left": {
|
||||
@ -34,7 +36,7 @@
|
||||
"headline": "Kooperationsplattform »Gradido-Kreise«",
|
||||
"text": "Lokale Kreise, Studienkreise, Projekte, Events und Kongresse",
|
||||
"allowed": {
|
||||
"button": "Kreise starten..."
|
||||
"button": "Kreise öffnen..."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Konfigurieren..."
|
||||
@ -43,14 +45,15 @@
|
||||
"card-user-search": {
|
||||
"headline": "Geografische Mitgliedssuche (beta)",
|
||||
"allowed": {
|
||||
"button": "Öffne Mitgliedssuche...",
|
||||
"button": "Mitgliedssuche öffnen...",
|
||||
"disabled-button": "GMS offline...",
|
||||
"text": "Finde Mitglieder aller Communities auf einer Landkarte."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Standort festlegen...",
|
||||
"text": "Finde Mitglieder aller Communities auf einer Landkarte? Dann musst du selbst erst deinen Standort festlegen."
|
||||
}
|
||||
"button": "Standort eintragen...",
|
||||
"text": "Um andere Mitglieder in deinem Umkreis zu finden, trage jetzt deinen Standort auf der Karte ein!"
|
||||
},
|
||||
"info": "So gehts"
|
||||
},
|
||||
"community": {
|
||||
"admins": "Administratoren",
|
||||
@ -298,7 +301,7 @@
|
||||
"recruited-member": "Eingeladenes Mitglied"
|
||||
},
|
||||
"h": "h",
|
||||
"info": "Info",
|
||||
"info": "Information",
|
||||
"language": "Sprache",
|
||||
"link-load": "den letzten Link nachladen | die letzten {n} Links nachladen",
|
||||
"link-load-more": "weitere {n} Links nachladen",
|
||||
@ -323,11 +326,9 @@
|
||||
},
|
||||
"missingGradidoAccount": "Noch kein {communityName} Konto?",
|
||||
"moderatorChangedMemo": "Text vom Moderator bearbeitet",
|
||||
"moderatorChat": "Moderator Chat",
|
||||
"navigation": {
|
||||
"admin_area": "Adminbereich",
|
||||
"community": "Gemeinschaft",
|
||||
"info": "Information",
|
||||
"logout": "Abmelden",
|
||||
"overview": "Übersicht",
|
||||
"send": "Senden",
|
||||
|
||||
@ -5,6 +5,7 @@
|
||||
"1000thanks": "1000 thanks for being with us!",
|
||||
"125": "125%",
|
||||
"85": "85%",
|
||||
"Chat": "Chat",
|
||||
"GDD": "GDD",
|
||||
"GDT": "GDT",
|
||||
"GMS": {
|
||||
@ -17,6 +18,7 @@
|
||||
},
|
||||
"PersonalDetails": "Personal details",
|
||||
"advanced-calculation": "Advanced calculation",
|
||||
"answerNow": "→ Reply now!",
|
||||
"asterisks": "****",
|
||||
"auth": {
|
||||
"left": {
|
||||
@ -34,7 +36,7 @@
|
||||
"headline": "Cooperation platform “Gradido Circles”",
|
||||
"text": "Local circles, study circles, projects, events and congresses",
|
||||
"allowed": {
|
||||
"button": "Start Circles..."
|
||||
"button": "Open Circles..."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configurate..."
|
||||
@ -43,14 +45,15 @@
|
||||
"card-user-search": {
|
||||
"headline": "Geographic member search (beta)",
|
||||
"allowed": {
|
||||
"button": "Start Membersearch...",
|
||||
"button": "Open member search...",
|
||||
"disabled-button": "GMS offline...",
|
||||
"text": "Find Members of all Communities on a Map."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Start Location-Capturing...",
|
||||
"text": "Find Members of all Communities on a Map? Then you have to capture your Location first."
|
||||
}
|
||||
"button": "Enter location...",
|
||||
"text": "To find other members in your area, enter your location on the map now!"
|
||||
},
|
||||
"info": "How it works"
|
||||
},
|
||||
"community": {
|
||||
"admins": "Administrators",
|
||||
@ -68,7 +71,7 @@
|
||||
"contribution": {
|
||||
"activity": "Activity",
|
||||
"alert": {
|
||||
"answerQuestion": "There is a new message for this article.",
|
||||
"answerQuestion": "There is a new message for this contribution.",
|
||||
"answerQuestionToast": "You have new messages.",
|
||||
"communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
|
||||
"confirm": "confirmed",
|
||||
@ -298,7 +301,7 @@
|
||||
"recruited-member": "Invited member"
|
||||
},
|
||||
"h": "h",
|
||||
"info": "Info",
|
||||
"info": "Information",
|
||||
"language": "Language",
|
||||
"link-load": "Load the last link | Load the last {n} links",
|
||||
"link-load-more": "Load more {n} links",
|
||||
@ -323,11 +326,9 @@
|
||||
},
|
||||
"missingGradidoAccount": "Don't have a {communityName} account yet?",
|
||||
"moderatorChangedMemo": "Text edited by moderator",
|
||||
"moderatorChat": "Moderator Chat",
|
||||
"navigation": {
|
||||
"admin_area": "Admin Area",
|
||||
"community": "Community",
|
||||
"info": "Information",
|
||||
"logout": "Logout",
|
||||
"overview": "Overview",
|
||||
"send": "Send",
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
"GDT": "GDT",
|
||||
"PersonalDetails": "Datos personales",
|
||||
"advanced-calculation": "Proyección",
|
||||
"answerNow": "→ ¡Responde ahora!",
|
||||
"asterisks": "****",
|
||||
"auth": {
|
||||
"left": {
|
||||
@ -24,7 +25,7 @@
|
||||
"headline": "Plataforma de cooperación «Círculos Gradido»",
|
||||
"text": "Círculos locales, círculos de estudio, proyectos, ev entos y congresos",
|
||||
"allowed": {
|
||||
"button": "Iniciar círculos..."
|
||||
"button": "Abrir círculos..."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configurar..."
|
||||
@ -33,19 +34,20 @@
|
||||
"card-user-search": {
|
||||
"headline": "Búsqueda geográfica de miembros (beta)",
|
||||
"allowed": {
|
||||
"button": "Iniciar Búsqueda de Miembros...",
|
||||
"button": "Abrir búsqueda de miembros...",
|
||||
"disabled-button": "GMS offline...",
|
||||
"text": "Encuentra Miembros de todas las Comunidades en un Mapa."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configuración de ubicación...",
|
||||
"text": "Encuentra Miembros de todas las Comunidades en un Mapa? Entonces tienes que establecer tu ubicación primero."
|
||||
}
|
||||
"button": "Introducir ubicación...",
|
||||
"text": "Para encontrar otros miembros cerca de ti, ¡introduce ahora tu ubicación en el mapa!"
|
||||
},
|
||||
"info": "Así se hace"
|
||||
},
|
||||
"circles": {
|
||||
"headline": "Juntos nos apoyamos - atentos a la cultura de los círculos.",
|
||||
"text": "Haga clic en el botón para abrir la plataforma de cooperación en una nueva ventana del navegador.",
|
||||
"button": "Iniciar Círculos..."
|
||||
"button": "Abrir Círculos..."
|
||||
},
|
||||
"community": {
|
||||
"admins": "Administradores",
|
||||
@ -69,7 +71,8 @@
|
||||
"contribution": {
|
||||
"activity": "Actividad",
|
||||
"alert": {
|
||||
"answerQuestion": "Por favor, contesta las preguntas",
|
||||
"answerQuestion": "Hay una nueva noticia sobre esta contribución.",
|
||||
"answerQuestionToast": "Tienes mensajes nuevos.",
|
||||
"communityNoteList": "Aquí encontrarás todas las contribuciones enviadas y confirmadas de todos los miembros de esta comunidad.",
|
||||
"confirm": "confirmado",
|
||||
"denied": "rechazado",
|
||||
@ -239,6 +242,7 @@
|
||||
"raise": "Aumento",
|
||||
"recruited-member": "Miembro invitado"
|
||||
},
|
||||
"info": "Información",
|
||||
"language": "Idioma",
|
||||
"link-load": "recargar el último enlace | recargar los últimos {n} enlaces",
|
||||
"link-load-more": "descargar más {n} enlaces",
|
||||
@ -265,7 +269,6 @@
|
||||
"navigation": {
|
||||
"admin_area": "Área de administración",
|
||||
"community": "Comunidad",
|
||||
"info": "Información",
|
||||
"logout": "Salir",
|
||||
"members_area": "Área de afiliados",
|
||||
"overview": "Resumen",
|
||||
|
||||
@ -9,6 +9,7 @@
|
||||
"GDT": "GDT",
|
||||
"PersonalDetails": "Informations personnelles",
|
||||
"advanced-calculation": "Calcul avancé",
|
||||
"answerNow": "→ Répondre maintenant!",
|
||||
"asterisks": "****",
|
||||
"auth": {
|
||||
"left": {
|
||||
@ -26,7 +27,7 @@
|
||||
"headline": "Plate-forme de coopération «Cercles Gradido»",
|
||||
"text": "Cercles locaux, cercles d'études, projets, événements et congrès",
|
||||
"allowed": {
|
||||
"button": "Démarrer les cercles..."
|
||||
"button": "Ouvrir les cercles..."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configurer..."
|
||||
@ -35,19 +36,20 @@
|
||||
"card-user-search": {
|
||||
"headline": "Recherche géographique de membres (bêta)",
|
||||
"allowed": {
|
||||
"button": "Commencer la recherche de membres...",
|
||||
"button": "Ouvrir la recherche de membres...",
|
||||
"disabled-button": "GMS offline...",
|
||||
"text": "Trouve des membres de toutes les communautés sur une carte."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configuration de l'emplacement...",
|
||||
"text": "Trouve des membres de toutes les communautés sur une carte? Alors tu dois d'abord définir ton emplacement."
|
||||
}
|
||||
"button": "Indiquer ta position...",
|
||||
"text": "Pour trouver d'autres membres près de chez toi, indique dès maintenant ta position sur la carte!"
|
||||
},
|
||||
"info": "Comment ça marche"
|
||||
},
|
||||
"circles": {
|
||||
"headline": "Ensemble, nous nous soutenons mutuellement - attentifs à la culture du cercle.",
|
||||
"text": "En cliquant sur le bouton, tu ouvres la plateforme de coopération dans une nouvelle fenêtre de navigation.",
|
||||
"button": "Démarrer les Cercles..."
|
||||
"button": "Ouvrir les Cercles..."
|
||||
},
|
||||
"community": {
|
||||
"admins": "Administrateurs",
|
||||
@ -69,7 +71,8 @@
|
||||
"contribution": {
|
||||
"activity": "Activité",
|
||||
"alert": {
|
||||
"answerQuestion": "S'il te plais répond à la question",
|
||||
"answerQuestion": "Il y a un nouveau message concernant cette contribution.",
|
||||
"answerQuestionToast": "Vous avez de nouveaux messages.",
|
||||
"communityNoteList": "Vous trouverez ci-contre toutes les contributions versées et certifiées de tous les membres de cette communauté.",
|
||||
"confirm": "Approuvé",
|
||||
"deleted": "Supprimé",
|
||||
@ -247,6 +250,7 @@
|
||||
"recruited-member": "Membre invité"
|
||||
},
|
||||
"h": "h",
|
||||
"info": "Information",
|
||||
"language": "Langage",
|
||||
"link-load": "Enregistrer le dernier lien | Enregistrer les derniers {n} liens",
|
||||
"link-load-more": "Enregistrer plus de {n} liens",
|
||||
@ -274,7 +278,6 @@
|
||||
"navigation": {
|
||||
"admin_area": "Partie administrative",
|
||||
"community": "Communauté",
|
||||
"info": "Information",
|
||||
"logout": "Déconnexion",
|
||||
"overview": "Aperçu",
|
||||
"send": "Envoyer",
|
||||
|
||||
@ -7,6 +7,7 @@
|
||||
"GDT": "GDT",
|
||||
"PersonalDetails": "Persoonlijke gegevens",
|
||||
"advanced-calculation": "Voorcalculatie",
|
||||
"answerNow": "→ Nu antwoorden!",
|
||||
"asterisks": "****",
|
||||
"auth": {
|
||||
"left": {
|
||||
@ -24,7 +25,7 @@
|
||||
"headline": "Samenwerkingsplatform “Gradido Kringen”",
|
||||
"text": "Lokale kringen, studiekringen, projecten, evenementen en congressen",
|
||||
"allowed": {
|
||||
"button": "Kringen starten..."
|
||||
"button": "Kringen openen..."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configureren..."
|
||||
@ -33,19 +34,20 @@
|
||||
"card-user-search": {
|
||||
"headline": "Geografisch leden zoeken (bèta)",
|
||||
"allowed": {
|
||||
"button": "Zoeken naar leden starten...",
|
||||
"button": "Leden zoeken openen...",
|
||||
"disabled-button": "GMS offline...",
|
||||
"text": "Vind leden van alle gemeenschappen op een kaart."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Locatie instellen...",
|
||||
"text": "Vind leden van alle gemeenschappen op een kaart? Dan moet je eerst je locatie instellen."
|
||||
}
|
||||
"button": "Locatie invoeren",
|
||||
"text": "Om andere leden in jouw omgeving te vinden, voer nu je locatie in op de kaart!"
|
||||
},
|
||||
"info": "Zo gaat dat"
|
||||
},
|
||||
"circles": {
|
||||
"headline": "Samen ondersteunen we elkaar - mindful in de cirkelcultuur.",
|
||||
"text": "Klik op de knop om het samenwerkingsplatform te openen in een nieuw browservenster.",
|
||||
"button": "Cirkels starten..."
|
||||
"button": "Cirkels openen..."
|
||||
},
|
||||
"community": {
|
||||
"admins": "Beheerders",
|
||||
@ -69,7 +71,8 @@
|
||||
"contribution": {
|
||||
"activity": "Activiteit",
|
||||
"alert": {
|
||||
"answerQuestion": "Please answer the question",
|
||||
"answerQuestion": "Er is een nieuw bericht over deze bijdrage.",
|
||||
"answerQuestionToast": "U hebt nieuwe berichten.",
|
||||
"communityNoteList": "Hier vind je alle ingediende en bevestigde bijdragen van alle leden uit deze gemeenschap.",
|
||||
"confirm": "bevestigt",
|
||||
"denied": "afgewezen",
|
||||
@ -239,6 +242,7 @@
|
||||
"raise": "Verhoging",
|
||||
"recruited-member": "Uitgenodigd lid"
|
||||
},
|
||||
"info": "Informatie",
|
||||
"language": "Taal",
|
||||
"link-load": "de laatste link herladen | de laatste links herladen",
|
||||
"link-load-more": "verdere {n} links herladen",
|
||||
@ -265,7 +269,6 @@
|
||||
"navigation": {
|
||||
"admin_area": "Beheerder",
|
||||
"community": "Gemeenschap",
|
||||
"info": "Informatie",
|
||||
"logout": "Afmelden",
|
||||
"members_area": "Ledenbestand",
|
||||
"overview": "Overzicht",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user