Alexander/FitTrackee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into format_links_in_notes

Browse Source
This commit is contained in:
Joshua Taillon
2022-11-09 16:13:19 -07:00
committed by GitHub
parent b9b32d81ef dafa373b6f
commit 7f6ca16cf4
99 changed files with 1121 additions and 855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fittrackee_client/src/locales/de/about.json
View File

@ -2,5 +2,5 @@
"CONTACT_ADMIN": "Kontaktiere den Administrator",
"FITTRACKEE_DESCRIPTION": "<strong>FitTrackee</strong> ist ein selbst-gehosteter Outdoor-Aktivitäts-Tracker.",
"FITTRACKEE_LICENSE": "unter {0} Lizenz ",
"SOURCE_CODE": "Quellkode"
"SOURCE_CODE": "Quellcode"
}

2
fittrackee_client/src/locales/de/api.json
View File

@ -1,6 +1,7 @@
{
"ERROR": {
"UNKNOWN": "Fehler. Bitte versuche es erneut oder kontaktiere den Administrator.",
"at least one file in zip archive exceeds size limit, please check the archive": "Mindestens eine Datei im ZIP-Archiv überschreitet das Größenlimit, bitte überprüfe das Archiv.",
"email: valid email must be provided": "E-Mail: Eine gültige E-Mail muss angegeben werden.",
"error during gpx processing": "Fehler bei der GPX-Verarbeitung.",
"error during gpx file parsing": "Fehler beim Einlesen der GPX-Datei",
@ -18,6 +19,7 @@
"new email must be different than curent email": "Die neue E-Mail muss sich von der aktuellen E-Mail unterscheiden",
"no file part": "Keine Datei angegeben.",
"no selected file": "Keine Datei ausgewählt.",
"the number of files in the archive exceeds the limit": "Die Anzahl der Dateien im Archiv überschreitet die Begrenzung.",
"password: password and password confirmation do not match": "Passwort: Passwort und Passwortbestätigung stimmen nicht überein.",
"provide a valid auth token": "Gebe ein gültiges Authentifizierungstoken an.",
"sorry, that username is already taken": "Es tut mir leid, der Benutzername ist schon vergeben.",

2
fittrackee_client/src/locales/de/user.json
View File

@ -69,7 +69,7 @@
"PICTURE_REMOVE": "Bild entfernen",
"PREFERENCES_EDITION": "Einstellungsausgabe",
"PROFILE_EDITION": "Profil-Ausgabe",
"REGISTRATION_DATE": "Regirierungsdatum",
"REGISTRATION_DATE": "Registrierungsdatum",
"SPORTS_EDITION": "Sportarten-Einstellungsausgabe",
"SUNDAY": "Sontag",
"TABS": {

2
fittrackee_client/src/locales/en/api.json
View File

@ -1,6 +1,7 @@
{
"ERROR": {
"UNKNOWN": "Error. Please try again or contact the administrator.",
"at least one file in zip archive exceeds size limit, please check the archive": "At least one file in zip archive exceeds size limit, please check the archive.",
"email: valid email must be provided": "Email: valid email must be provided.",
"error during gpx processing": "Error during gpx processing.",
"error during gpx file parsing": "Error during gpx file parsing.",
@ -18,6 +19,7 @@
"new email must be different than curent email": "The new email must be different than curent email",
"no file part": "No file provided.",
"no selected file": "No selected file.",
"the number of files in the archive exceeds the limit": "The number of files in the archive exceeds the limit.",
"password: password and password confirmation do not match": "Password: password and password confirmation don't match.",
"provide a valid auth token": "Provide a valid auth token.",
"sorry, that username is already taken": "Sorry, that username is already taken.",

4
fittrackee_client/src/locales/fr/administration.json
View File

@ -10,11 +10,11 @@
"ADMIN_CONTACT": "Email de l'administrateur pour contact ",
"MAX_USERS_LABEL": "Nombre maximum d'utilisateurs actifs ",
"MAX_USERS_HELP": "Si égal à 0, pas limite d'inscription",
"MAX_FILES_IN_ZIP_LABEL": "Taille max. des archives zip (en Mo) ",
"MAX_FILES_IN_ZIP_LABEL": "Nombre max. de fichiers dans une archive zip ",
"NO_CONTACT_EMAIL": "non renseigné",
"SINGLE_UPLOAD_MAX_SIZE_LABEL": "Taille max. des fichiers (en Mo) ",
"TITLE": "Configuration de l'application",
"ZIP_UPLOAD_MAX_SIZE_LABEL": "Nombre max. de fichiers dans une archive zip "
"ZIP_UPLOAD_MAX_SIZE_LABEL": "Taille max. des archives zip (en Mo) "
},
"BACK_TO_ADMIN": "Revenir à l'admin",
"CONFIRM_USER_ACCOUNT_DELETION": "Êtes-vous sûr de vouloir supprimer le compte de l'utilisateur {0} ? Toutes les données seront définitivement.",

2
fittrackee_client/src/locales/fr/api.json
View File

@ -1,6 +1,7 @@
{
"ERROR": {
"UNKNOWN": "Erreur. Veuillez réessayer ou contacter l'administrateur.",
"at least one file in zip archive exceeds size limit, please check the archive": "Au moins un fichier de l'archive zip dépasse la taille maximale, veuillez vérifier l'archive.",
"email: valid email must be provided": "Courriel : une adresse électronique valide doit être fournie.",
"error during gpx processing": "Erreur lors du traitement du fichier gpx.",
"error during gpx file parsing": "Erreur lors de l'analyse du fichier.",
@ -24,6 +25,7 @@
"signature expired, please log in again": "Signature expirée. Merci de vous reconnecter.",
"sorry, that username is already taken": "Désolé, ce nom d'utilisateur est déjà utilisé.",
"successfully registered": "Inscription validée.",
"the number of files in the archive exceeds the limit": "Le nombre de fichiers de l'archive dépasse la limite.",
"user does not exist": "L'utilisateur n'existe pas.",
"valid email must be provided for admin contact": "Une adresse électronique doit être fournie pour le contact de l'administrateur",
"you can not delete your account, no other user has admin rights": "Vous ne pouvez pas supprimer votre compte, aucun autre utilisateur n'a des droits d'administration.",

1
fittrackee_client/src/scss/base.scss
View File

@ -162,6 +162,7 @@ button {
.view {
padding-bottom: 35px;
background-color: var(--app-background-color);
}
.fa-trophy {

1
fittrackee_client/src/views/user/LoginOrRegister.vue
View File

@ -30,7 +30,6 @@
#loginOrRegister {
display: flex;
height: 100%;
.container {
display: flex;

3
fittrackee_client/src/views/user/ProfileView.vue
View File

@ -1,5 +1,5 @@
<template>
<div id="profile" class="container view" v-if="authUser.username">
<div id="profile" class="view" v-if="authUser.username">
<router-view :user="authUser"></router-view>
<div id="bottom" />
</div>
@ -24,6 +24,7 @@
#profile {
display: flex;
flex-direction: column;
padding: 0 $default-padding;
::v-deep(.profile-form) {
display: flex;

2
fittrackee_client/src/views/workouts/WorkoutsView.vue
View File

@ -60,8 +60,6 @@
<style lang="scss" scoped>
@import '~@/scss/vars.scss';
#workouts {
height: 100%;
.workouts-container {
display: flex;
flex-direction: row;