Merge branch 'master' into v0.3.0

fittrackee_client/src/locales/en/activities.json

@@ -6,6 +6,7 @@
   "Ave. speed": "Ave. speed",
   "Ascent": "Ascent",
   "Average speed": "Average speed",
+  "Chart": "Chart",
   "Confirmation": "Confirmation",
   "data from gpx, without any cleaning": "data from gpx, without any cleaning",
   "Date": "Date",

fittrackee_client/src/locales/en/resources.js

@@ -0,0 +1,17 @@
+import EnActivitiesTranslations from './activities.json'
+import EnCommonTranslations from './common.json'
+import EnDashboardTranslations from './dashboard.json'
+import EnMessagesTranslations from './messages.json'
+import EnSportsTranslations from './sports.json'
+import EnStatisticsTranslations from './statistics.json'
+import EnUserTranslations from './user.json'
+
+export const enResources = {
+  activities: EnActivitiesTranslations,
+  common: EnCommonTranslations,
+  dashboard: EnDashboardTranslations,
+  messages: EnMessagesTranslations,
+  sports: EnSportsTranslations,
+  statistics: EnStatisticsTranslations,
+  user: EnUserTranslations,
+}

fittrackee_client/src/locales/fr/activities.json

@@ -6,6 +6,7 @@
   "Ave. speed": "Vitesse moyenne",
   "Ascent": "Dénivelé positif",
   "Average speed": "Vitesse moyenne",
+  "Chart": "Analyse",
   "Confirmation": "Confirmation",
   "data from gpx, without any cleaning": "données issues du fichier gpx, sans correction",
   "Date": "Date",

fittrackee_client/src/locales/fr/resources.js

@@ -0,0 +1,17 @@
+import FrActivitiesTranslations from './activities.json'
+import FrCommonTranslations from './common.json'
+import FrDashboardTranslations from './dashboard.json'
+import FrMessagesTranslations from './messages.json'
+import FrSportsTranslations from './sports.json'
+import FrStatisticsTranslations from './statistics.json'
+import FrUserTranslations from './user.json'
+
+export const frResources = {
+  activities: FrActivitiesTranslations,
+  common: FrCommonTranslations,
+  dashboard: FrDashboardTranslations,
+  messages: FrMessagesTranslations,
+  sports: FrSportsTranslations,
+  statistics: FrStatisticsTranslations,
+  user: FrUserTranslations,
+}

fittrackee_client/src/locales/index.js

@@ -0,0 +1,7 @@
+import { enResources } from './en/resources'
+import { frResources } from './fr/resources'
+
+export const resources = {
+  en: enResources,
+  fr: frResources,
+}