Merge pull request #613 from SamR1/enable-bg-translations

Enable Bulgarian translations
SamR1 · Aug 31, 2024 · ad71bf1 · ad71bf1
2 parents d36d3c2 + 9bda697
commit ad71bf1
Show file tree

Hide file tree

Showing 15 changed files with 709 additions and 660 deletions.
diff --git a/fittrackee/config.py b/fittrackee/config.py
@@ -18,7 +18,7 @@
     else ''
 )
 SUPPORTED_LANGUAGES = [
-    # 'bg',  # Bulgarian - disabled for now
+    'bg',  # Bulgarian
     'cs',  # Czech
     'de',  # German
     'en',  # English

diff --git a/fittrackee/dist/index.html b/fittrackee/dist/index.html
@@ -7,11 +7,11 @@
     <link rel="stylesheet" href="/static/css/fork-awesome.min.css"/>
     <link rel="stylesheet" href="/static/css/leaflet.css"/>
     <title>FitTrackee</title>
-    <script type="module" crossorigin src="/static/index-DQ7xav_K.js"></script>
+    <script type="module" crossorigin src="/static/index-hb5LZD5e.js"></script>
     <link rel="modulepreload" crossorigin href="/static/charts-lWJH0bM4.js">
     <link rel="modulepreload" crossorigin href="/static/maps-BFpqWvfo.js">
     <link rel="stylesheet" crossorigin href="/static/css/maps-HupOsEJb.css">
-    <link rel="stylesheet" crossorigin href="/static/css/index-_u_9KiAp.css">
+    <link rel="stylesheet" crossorigin href="/static/css/index-Bg51Oc16.css">
   </head>
   <body>
     <div id="app"></div>

diff --git a/...rackee/dist/static/css/index-_u_9KiAp.css → ...rackee/dist/static/css/index-Bg51Oc16.css b/...rackee/dist/static/css/index-_u_9KiAp.css → ...rackee/dist/static/css/index-Bg51Oc16.css
diff --git a/fittrackee/dist/static/index-DQ7xav_K.js b/fittrackee/dist/static/index-DQ7xav_K.js
diff --git a/fittrackee/dist/static/index-hb5LZD5e.js b/fittrackee/dist/static/index-hb5LZD5e.js
diff --git a/fittrackee_client/src/components/Dashboard/UserRecords/RecordsCard.vue b/fittrackee_client/src/components/Dashboard/UserRecords/RecordsCard.vue
@@ -7,6 +7,7 @@
       </template>
       <template #content>
         <SportRecordsTable
+          :class="{ 'max-width': maxWidth }"
           v-for="record in getTranslatedRecords(records.records)"
           :record="record"
           :key="record.id"
@@ -17,11 +18,14 @@
 </template>
 
 <script setup lang="ts">
-  import { toRefs } from 'vue'
+  import { computed, toRefs } from 'vue'
+  import type { ComputedRef } from 'vue'
   import { useI18n } from 'vue-i18n'
 
   import SportRecordsTable from '@/components/Common/SportRecordsTable.vue'
+  import { ROOT_STORE } from '@/store/constants'
   import type { ICardRecord, IRecord, IRecordsBySport } from '@/types/workouts'
+  import { useStore } from '@/use/useStore'
   import { sortRecords } from '@/utils/records'
 
   interface Props {
@@ -32,8 +36,14 @@
 
   const { records, sportTranslatedLabel } = toRefs(props)
 
+  const store = useStore()
   const { t } = useI18n()
 
+  const language: ComputedRef<string> = computed(
+    () => store.getters[ROOT_STORE.GETTERS.LANGUAGE]
+  )
+  const maxWidth: ComputedRef<boolean> = computed(() => language.value === 'bg')
+
   function getTranslatedRecords(records: IRecord[]): ICardRecord[] {
     const translatedRecords: ICardRecord[] = []
     records.map((record) => {
@@ -99,6 +109,15 @@
           }
         }
       }
+      @media screen and (max-width: $x-small-limit) {
+        .card-content {
+          .record.max-width {
+            .record-type {
+              max-width: 40%;
+            }
+          }
+        }
+      }
     }
   }
 </style>
diff --git a/fittrackee_client/src/components/Statistics/StatsMenu.vue b/fittrackee_client/src/components/Statistics/StatsMenu.vue
@@ -122,6 +122,10 @@
 
     .chart-arrow {
       cursor: pointer;
+
+      @media screen and (max-width: $x-small-limit) {
+        padding: 6px;
+      }
     }
   }
   .stats-type {

diff --git a/fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue b/fittrackee_client/src/components/User/ProfileDisplay/UserPreferences.vue
@@ -83,7 +83,7 @@
     () => store.getters[ROOT_STORE.GETTERS.LANGUAGE]
   )
   const userLanguage = computed(() =>
-    props.user.language
+    props.user.language && props.user.language in languageLabels
       ? languageLabels[props.user.language]
       : languageLabels['en']
   )

diff --git a/fittrackee_client/src/components/User/ProfileEdition/UserPreferencesEdition.vue b/fittrackee_client/src/components/User/ProfileEdition/UserPreferencesEdition.vue
@@ -194,7 +194,7 @@
   import type { IUserPreferencesPayload, IAuthUserProfile } from '@/types/user'
   import { useStore } from '@/use/useStore'
   import { availableDateFormatOptions } from '@/utils/dates'
-  import { availableLanguages } from '@/utils/locales'
+  import { availableLanguages, languageLabels } from '@/utils/locales'
 
   interface Props {
     user: IAuthUserProfile
@@ -306,7 +306,8 @@
       ? user.use_raw_gpx_speed
       : false
     userForm.imperial_units = user.imperial_units ? user.imperial_units : false
-    userForm.language = user.language ? user.language : 'en'
+    userForm.language =
+      user.language && user.language in languageLabels ? user.language : 'en'
     userForm.timezone = user.timezone ? user.timezone : 'Europe/Paris'
     userForm.date_format = user.date_format ? user.date_format : 'dd/MM/yyyy'
     userForm.weekm = user.weekm ? user.weekm : false

diff --git a/fittrackee_client/src/i18n.ts b/fittrackee_client/src/i18n.ts
@@ -1,6 +1,6 @@
 import { createI18n } from 'vue-i18n'
 
-// import bgMessages from '@/locales/bg/bg'
+import bgMessages from '@/locales/bg/bg'
 import csMessages from '@/locales/cs/cs'
 import deMessages from '@/locales/de/de'
 import enMessages from '@/locales/en/en'
@@ -20,7 +20,7 @@ export default createI18n({
   fallbackLocale: 'en',
   globalInjection: true,
   messages: {
-    // bg: bgMessages,
+    bg: bgMessages,
     cs: csMessages,
     de: deMessages,
     en: enMessages,

diff --git a/fittrackee_client/src/store/modules/root/mutations.ts b/fittrackee_client/src/store/modules/root/mutations.ts
@@ -1,11 +1,11 @@
+import { enUS } from 'date-fns/locale'
 import type { MutationTree } from 'vuex'
 
 import { ROOT_STORE } from '@/store/constants'
 import type { IRootState, TRootMutations } from '@/store/modules/root/types'
 import type { TAppConfig, IAppStatistics } from '@/types/application'
 import type { TLanguage } from '@/types/locales'
 import { localeFromLanguage } from '@/utils/locales'
-
 export const mutations: MutationTree<IRootState> & TRootMutations = {
   [ROOT_STORE.MUTATIONS.EMPTY_ERROR_MESSAGES](state: IRootState) {
     state.errorMessages = null
@@ -42,8 +42,13 @@ export const mutations: MutationTree<IRootState> & TRootMutations = {
     state.application.statistics = statistics
   },
   [ROOT_STORE.MUTATIONS.UPDATE_LANG](state: IRootState, language: TLanguage) {
-    state.language = language
-    state.locale = localeFromLanguage[language]
+    if (language in localeFromLanguage) {
+      state.language = language
+      state.locale = localeFromLanguage[language]
+    } else {
+      state.language = 'en'
+      state.locale = enUS
+    }
   },
   [ROOT_STORE.MUTATIONS.UPDATE_DARK_MODE](
     state: IRootState,

diff --git a/fittrackee_client/src/types/locales.ts b/fittrackee_client/src/types/locales.ts
@@ -1,5 +1,5 @@
 export type TLanguage =
-  // | 'bg'  // disabled for now
+  | 'bg'
   | 'cs'
   | 'de'
   | 'en'

diff --git a/fittrackee_client/src/utils/dates.ts b/fittrackee_client/src/utils/dates.ts
@@ -95,7 +95,7 @@ const availableDateFormats = [
   'date_string', // depending on language
 ]
 export const dateStringFormats: Record<TLanguage, string> = {
-  // bg: 'd MMMM yyyy',
+  bg: 'd MMMM yyyy',
   cs: 'd. MMM yyyy',
   de: 'do MMM yyyy',
   en: 'MMM. do, yyyy',

diff --git a/fittrackee_client/src/utils/locales.ts b/fittrackee_client/src/utils/locales.ts
@@ -1,6 +1,6 @@
 import type { Locale } from 'date-fns'
 import {
-  // bg,
+  bg,
   cs,
   de,
   enUS,
@@ -22,7 +22,7 @@ export const isLanguageSupported = (
   language: string
 ): language is TLanguage => {
   return [
-    // 'bg',
+    'bg',
     'cs',
     'de',
     'en',
@@ -39,7 +39,7 @@ export const isLanguageSupported = (
 }
 
 export const localeFromLanguage: Record<TLanguage, Locale> = {
-  // bg: bg,
+  bg: bg,
   cs: cs,
   de: de,
   en: enUS,
@@ -55,7 +55,7 @@ export const localeFromLanguage: Record<TLanguage, Locale> = {
 }
 
 export const languageLabels: Record<TLanguage, string> = {
-  // bg: 'български',
+  bg: 'български',
   cs: 'Česky (72%)',
   de: 'Deutsch (98%)',
   en: 'English',
@@ -64,8 +64,8 @@ export const languageLabels: Record<TLanguage, string> = {
   fr: 'Français',
   gl: 'Galego (99%)',
   it: 'Italiano (82%)',
-  nb: 'Norsk bokmål (52%)',
   nl: 'Nederlands (99%)',
+  nb: 'Norsk bokmål (52%)',
   pl: 'Polski (91%)',
   pt: 'Português (98%)',
 }

diff --git a/fittrackee_client/src/utils/password.ts b/fittrackee_client/src/utils/password.ts
@@ -3,6 +3,7 @@ import { zxcvbnOptions } from '@zxcvbn-ts/core'
 export const loadLanguagePackage = async (language: string) => {
   // no package available for
   // - Basque
+  // - Bulgarian
   // - Dutch (nl-NL)
   // - Galician
   // - Norwegian bokmål