Merge branch 'dev' into filter_workouts_by_name

fittrackee_client/src/utils/api.ts

@@ -102,8 +102,8 @@ export const rangePagination = (
   } else {
     if (
       pagination[pagination.length - 1] !== '...' &&
-      pagination[pagination.length - 1] >= pages - 2 &&
-      pagination[pagination.length - 1] < pages
+      +pagination[pagination.length - 1] >= pages - 2 &&
+      +pagination[pagination.length - 1] < pages
     ) {
       pagination = pagination.concat(
         getRange(pages, +pagination[pagination.length - 1] + 1)

fittrackee_client/src/utils/dates.ts

@@ -96,11 +96,11 @@ const availableDateFormats = [
 export const dateStringFormats: Record<string, string> = {
   de: 'do MMM yyyy',
   en: 'MMM. do, yyyy',
-  // es: 'd MMM yyyy',
+  es: 'd MMM yyyy',
   fr: 'd MMM yyyy',
-  // gl: 'd MMM yyyy',
+  gl: 'd MMM yyyy',
   it: 'd MMM yyyy',
-  // nb: 'do MMM yyyy',
+  nb: 'do MMM yyyy',
   nl: 'd MMM yyyy',
 }
 

fittrackee_client/src/utils/locales.ts

@@ -1,28 +1,28 @@
 /* eslint-disable import/no-duplicates */
 import { Locale } from 'date-fns'
-import { de, enUS, fr, it, nl } from 'date-fns/locale'
+import { de, enUS, es, fr, gl, it, nb, nl } from 'date-fns/locale'
 
 import createI18n from '@/i18n'
 
 export const localeFromLanguage: Record<string, Locale> = {
   de: de,
   en: enUS,
-  // es: es, // disabled for now
+  es: es,
   fr: fr,
-  // gl: gl, // disabled for now
+  gl: gl,
   it: it,
-  // nb: nb, // disabled for now
+  nb: nb,
   nl: nl,
 }
 
 export const languageLabels: Record<string, string> = {
   de: 'Deutsch',
   en: 'English',
-  // es: 'Español', // disabled for now
+  es: 'Español',
   fr: 'Français',
-  // gl: 'Galego', // disabled for now
+  gl: 'Galego',
   it: 'Italiano',
-  // nb: 'Norsk bokmål', // disabled for now
+  nb: 'Norsk bokmål',
   nl: 'Nederlands',
 }
 

fittrackee_client/src/utils/password.ts

@@ -19,10 +19,10 @@ export const loadLanguagePackage = async (language: string) => {
       return await import(
         /* webpackChunkName: "password.it" */ '@zxcvbn-ts/language-it'
       )
-    // case 'es':
-    //   return await import(
-    //     /* webpackChunkName: "password.es" */ '@zxcvbn-ts/language-es-es'
-    //   )
+    case 'es':
+      return await import(
+        /* webpackChunkName: "password.es" */ '@zxcvbn-ts/language-es-es'
+      )
     default:
       return await import(
         /* webpackChunkName: "password.en" */ '@zxcvbn-ts/language-en'

fittrackee_client/src/utils/workouts.ts

@@ -36,7 +36,9 @@ export const getDatasets = (
   const coordinates: TCoordinates[] = []
 
   chartData.map((data) => {
-    distance_labels.push(data.distance)
+    distance_labels.push(
+      convertStatsDistance('km', data.distance, useImperialUnits)
+    )
     duration_labels.push(data.duration)
     datasets.speed.data.push(
       convertStatsDistance('km', data.speed, useImperialUnits)