@magmamath/students-features 1.3.14 → 1.3.16-rc.22

package/src/features/pmProgress/components/header/NextUp.tsx

@@ -3,34 +3,27 @@ import { StyleSheet, View } from 'react-native'
 import { COLORS, HeadingVariants, SPACING, Typography } from '@magmamath/react-native-ui'
 import { SketchArrowRight } from '../../../../shared/icons/SketchArrowRight'
 import { SliceDiamondIcon } from '../../../../shared/icons/SliceDiamondIcon'
-import { useText } from '../../../../shared/translation'
-import { useUnit, useStoreMap } from 'effector-react'
+import { useUnit } from 'effector-react'
 import { usePmProgress } from '../../context/PmProgressContext'
-import { isFluencyDomain } from '../../shared/pmProgress.helpers'
 import { OpeningLoaderId, SolvingFlow } from '../../shared/pmProgress.constants'
 import { StartButton } from './StartButton'
+import { useNextUpDomain } from '../../hooks/useNextUpDomain'
+import { useText } from '../../../../i18n/i18n'
 
 export const NextUp = () => {
   const t = useText()
   const { model, onStartPress } = usePmProgress()
+  const nextUp = useNextUpDomain()
 
   const status = useUnit(model.tree.$status)
   const loaderOpeningId = useUnit(model.solving.$loaderOpeningId)
 
-  const nextUp = useStoreMap(model.tree.$domains, (domains) =>
-    domains.find((domain) => {
-      const isFluency = isFluencyDomain(domain.title)
-      const isDomainCompleted = domain.standards.every((standard) => standard.isCompleted)
-      return !isFluency && !isDomainCompleted
-    }),
-  )
-
   const isLoading = loaderOpeningId === OpeningLoaderId.START_BUTTON
   const isSkillOpeningActionPending = !!(loaderOpeningId !== null || status)
 
   return (
     <View style={styles.container}>
-      {nextUp && !status && (
+      {nextUp.domain && !status && (
         <>
           <View style={styles.content}>
             <View style={styles.subtitle}>
@@ -40,10 +33,10 @@ export const NextUp = () => {
             </View>
             <View style={[styles.row, styles.tilted]}>
               <Typography variant={HeadingVariants.H7} style={styles.muted}>
-                {nextUp?.title}
+                {nextUp.domain.title}
               </Typography>
               <View style={styles.diamond}>
-                <SliceDiamondIcon color={nextUp?.color} />
+                <SliceDiamondIcon color={nextUp.domain.color} />
               </View>
             </View>
           </View>

package/src/features/pmProgress/components/header/PmProgressHeader.tsx

@@ -14,13 +14,13 @@ import {
   Typography,
 } from '@magmamath/react-native-ui'
 import { isWeb } from '../../../../shared/common.constants'
-import { useText } from '../../../../shared/translation'
-import { useUnit, useStoreMap } from 'effector-react'
+import { useStoreMap, useUnit } from 'effector-react'
 import { usePmProgress } from '../../context/PmProgressContext'
 import { formatGradeLabel } from '../../shared/pmProgress.helpers'
 import { MenuIcon } from '../../../../shared/icons/MenuIcon'
 import { NextUp } from './NextUp'
 import { BURGER_MENU_BREAKPOINT, MENU_MAX_HEIGHT } from '@magmamath/students-features'
+import { useText } from '../../../../i18n/i18n'
 
 const menuItemProps: MenuItemProps = {
   style: {

package/src/features/pmProgress/components/header/StartButton.tsx

@@ -11,7 +11,7 @@ import {
   SPACING,
   Typography,
 } from '@magmamath/react-native-ui'
-import { useText } from '../../../../shared/translation'
+import { useText } from '../../../../i18n/i18n'
 
 const PULSATION_COLOR = '#FFBE4E66'
 const PULSE_OVERFLOW_X = 16

package/src/features/pmProgress/components/insights/PmInsights.tsx

@@ -15,7 +15,7 @@ import {
 export const PmInsights = () => {
   const { model } = usePmProgress()
   const [chartSize, setChartSize] = useState(MAX_PIE_CHART_SIZE)
-  const chartData = useStoreMap(model.tree.$domains, (domains) =>
+  const chartData = useStoreMap(model.tree.$domainsInGrade, (domains) =>
     domains.map((domain) => ({
       value: 1,
       fillPercent: Math.round(domain.scorePercentage),

package/src/features/pmProgress/components/insights/PmTimeframeStats.tsx

@@ -1,6 +1,7 @@
 import React from 'react'
 import { StyleSheet, View } from 'react-native'
 import {
+  BORDER_RADIUS,
   COLORS,
   FONT_FAMILY,
   SelectGroup,
@@ -12,12 +13,11 @@ import {
 import { StatsCard } from './StatsCard'
 import { StarIcon } from '../../../../shared/icons/StarIcon'
 import { TimerIcon } from '../../../../shared/icons/TimerIcon'
-import { BORDER_RADIUS } from '@magmamath/react-native-ui'
-import { useText } from '../../../../shared/translation'
 import { useUnit } from 'effector-react'
 import { formatTime } from '../../shared/pmProgress.helpers'
 import { InsightsTimeframe, STATS_MAX_HEIGHT } from '../../shared/pmProgress.constants'
 import { usePmProgress } from '../../context/PmProgressContext'
+import { useText } from '../../../../i18n/i18n'
 
 const optionStyle: SelectOptionProps['style'] = {
   text: {

package/src/features/pmProgress/components/list/Fluency.tsx

@@ -3,11 +3,11 @@ import { StyleSheet, View } from 'react-native'
 import { ListCard } from './ListCard'
 import { COLORS, SPACING } from '@magmamath/react-native-ui'
 import { SliceDiamondIcon } from '../../../../shared/icons/SliceDiamondIcon'
-import { useText } from '../../../../shared/translation'
 import { useUnit } from 'effector-react'
 import { SolvingFlow } from '../../shared/pmProgress.constants'
 import { Domain } from '../../shared/pmProgress.types'
 import { usePmProgress } from '../../context/PmProgressContext'
+import { useText } from '../../../../i18n/i18n'
 
 type FluencyProps = {
   data: Domain | undefined

package/src/features/pmProgress/components/list/ListCard.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { Pressable, View, StyleSheet, Platform, ViewStyle } from 'react-native'
+import { Platform, Pressable, StyleSheet, View, ViewStyle } from 'react-native'
 import {
   BORDER_RADIUS,
   CaretDownIcon,
@@ -10,7 +10,8 @@ import {
   Typography,
 } from '@magmamath/react-native-ui'
 import { ListItem } from './ListItem'
-import { useText } from '../../../../shared/translation'
+import { useText } from '../../../../i18n/i18n'
+
 const HEADER_HEIGHT = 60
 const PROGRESS_BAR_WIDTH = 50
 const PROGRESS_BAR_HEIGHT = 10

package/src/features/pmProgress/components/list/ListItem.tsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { ActivityIndicator, View, Pressable, StyleSheet, Text } from 'react-native'
+import { ActivityIndicator, Pressable, StyleSheet, Text, View } from 'react-native'
 import {
   ArrowRightIcon,
   BORDER_RADIUS,
@@ -11,7 +11,7 @@ import {
   SPACING,
   Typography,
 } from '@magmamath/react-native-ui'
-import { useText } from '../../../../shared/translation'
+import { useText } from '../../../../i18n/i18n'
 
 const CARD_HEIGHT = 52
 const ICON_SIZE = 25

package/src/features/pmProgress/components/list/PmDomainList.tsx

@@ -11,7 +11,7 @@ import { SolvingFlow } from '../../shared/pmProgress.constants'
 
 export const PmDomainList = () => {
   const { model, onStandardPress } = usePmProgress()
-  const domains = useUnit(model.tree.$domains)
+  const domains = useUnit(model.tree.$domainsInGrade)
   const expandedId = useUnit(model.highlight.$expandedId)
   const hoveredId = useUnit(model.highlight.$hoveredId)
   const loaderOpeningId = useUnit(model.solving.$loaderOpeningId)

package/src/features/pmProgress/components/locked/PmStatusOverlay.tsx

@@ -1,22 +1,14 @@
 import React, { ReactNode } from 'react'
 import { StyleSheet, View } from 'react-native'
-import {
-  COLORS,
-  ErrorIcon,
-  HeadingVariants,
-  LockIcon,
-  SPACING,
-  Typography,
-} from '@magmamath/react-native-ui'
-import { useText } from '../../../../shared/translation'
-import { TranslationKeys } from '../../../../shared/translation/types'
+import { COLORS, ErrorIcon, HeadingVariants, LockIcon, SPACING, Typography, } from '@magmamath/react-native-ui'
 import { PmProgressStatus } from '../../shared/pmProgress.constants'
+import { TranslationKey, useText } from '../../../../i18n/i18n'
 
 type EmptyStateVariant = {
   icon: ReactNode
   circleColor: string
-  titleKey: TranslationKeys
-  subtitleKey: TranslationKeys
+  titleKey: TranslationKey
+  subtitleKey: TranslationKey
 }
 
 const PM_EMPTY_STATE_VARIANTS: Record<PmProgressStatus, EmptyStateVariant> = {

package/src/features/pmProgress/components/recs/PmTeacherRecs.tsx

@@ -11,10 +11,10 @@ import {
   SHADOWS,
   SPACING,
 } from '@magmamath/react-native-ui'
-import { useText } from '../../../../shared/translation'
-import { useUnit, useStoreMap } from 'effector-react'
+import { useStoreMap, useUnit } from 'effector-react'
 import { CustomDomain, OpeningLoaderId, SolvingFlow } from '../../shared/pmProgress.constants'
 import { usePmProgress } from '../../context/PmProgressContext'
+import { useText } from '../../../../i18n/i18n'
 
 export const PmTeacherRecs = () => {
   const t = useText()

package/src/features/pmProgress/components/standard/StandardTag.tsx

@@ -4,6 +4,7 @@ import { PmProgressModel } from '@magmamath/students-features'
 import { SliceDiamondIcon } from '../../../../shared/icons/SliceDiamondIcon'
 import { COLORS, FONT_FAMILY } from '@magmamath/react-native-ui'
 import { useStoreMap } from 'effector-react'
+import { isWeb } from '../../../../shared/common.constants'
 
 type ColorPreset = {
   background: string
@@ -118,7 +119,7 @@ type StandardTagProps = {
 
 export const StandardTag = ({ skillId, model }: StandardTagProps) => {
   const standardInfo = useStoreMap({
-    store: model.tree.$domains,
+    store: model.tree.$domainsInGrade,
     keys: [skillId],
     fn: (domains, [skillId]) => {
       const domain = domains.find((d) => d.standards.some((s) => s.skillIds.includes(skillId)))
@@ -150,7 +151,7 @@ export const StandardTag = ({ skillId, model }: StandardTagProps) => {
 const styles = StyleSheet.create({
   container: {
     minWidth: 110,
-    maxWidth: 350,
+    maxWidth: isWeb ? 350 : 280,
     paddingHorizontal: 8,
     paddingVertical: 4,
     borderRadius: 12,
@@ -165,7 +166,7 @@ const styles = StyleSheet.create({
     elevation: 2,
   },
   textContainer: {
-    flex: 1,
+    ...(isWeb ? { flex: 1 } : { flexShrink: 1 }),
     flexDirection: 'column',
     justifyContent: 'center',
     alignItems: 'flex-start',

package/src/features/pmProgress/hooks/useNextUpDomain.ts

@@ -0,0 +1,31 @@
+import { useUnit, useStoreMap } from 'effector-react'
+import { usePmProgress } from '../context/PmProgressContext'
+import { findDomainBySkillId, isFluencyDomain } from '../shared/pmProgress.helpers'
+
+export const useNextUpDomain = () => {
+  const { model } = usePmProgress()
+  const magmaRecs = useUnit(model.recommendations.$magma)
+  const domainsInTree = useUnit(model.tree.$domains)
+
+  return useStoreMap({
+    store: model.tree.$domainsInGrade,
+    keys: [magmaRecs, domainsInTree],
+    fn: (domainsInGrade) => {
+      const firstRec = magmaRecs.items[0]
+      if (firstRec) {
+        const allDomains = Object.values(domainsInTree).flat()
+        const domain = findDomainBySkillId(firstRec._id, allDomains) ?? null
+        return { domain, isFromRecommendation: true }
+      }
+
+      const domain =
+        domainsInGrade.find((domain) => {
+          const isFluency = isFluencyDomain(domain.title)
+          const isDomainCompleted = domain.standards.every((standard) => standard.isCompleted)
+          return !isFluency && !isDomainCompleted
+        }) ?? null
+
+      return { domain, isFromRecommendation: false }
+    },
+  })
+}

package/src/features/pmProgress/model/PmTreeModel.ts

@@ -1,4 +1,4 @@
-import { attach, createEffect, createEvent, createStore, restore, sample } from 'effector'
+import { attach, combine, createEffect, createEvent, createStore, restore, sample } from 'effector'
 import { createAction } from 'effector-action'
 import {
   Domain,
@@ -18,6 +18,7 @@ import {
   getInitialPmGrade,
   getTreeGrades,
   isTreeDataReady,
+  isTreeDataWithoutGradeReady,
 } from '../shared/pmProgress.helpers'
 import { TreeNormalizer } from '../shared/TreeNormalizer'
 import { persist } from 'effector-storage/session'
@@ -30,12 +31,14 @@ export class PmTreeModel {
   private readonly $user = createStore<User | null>(null)
 
   private readonly setupInitialGrade = createEvent<SetupInitialGradeProps>()
-  private readonly setDomains = createEvent<Domain[]>()
   public readonly setGrade = createEvent<number | null>()
 
   public readonly $isInitialized = createStore(false)
   public readonly $grade = restore(this.setGrade, null)
-  public readonly $domains = restore(this.setDomains, [])
+  public readonly $domains = createStore<Record<number, Domain[]>>({})
+  public readonly $domainsInGrade = combine(this.$domains, this.$grade, (domains, grade) =>
+    grade !== null ? (domains[grade] ?? []) : [],
+  )
   public readonly $grades = createStore<Grade[]>([])
   public readonly $status = createStore<PmProgressStatus | null>(null)
 
@@ -48,7 +51,7 @@ export class PmTreeModel {
     this.setupFailedAndLockedStatus()
     this.setupTreeInit()
     this.setupGradeInit()
-    this.setupDomainStructure()
+    this.setupDomainsInTree()
   }
 
   public readonly initTreeFx = createEffect(async ({ user }: PmProgressGateProps) => {
@@ -150,22 +153,28 @@ export class PmTreeModel {
     })
   }
 
-  private setupDomainStructure() {
+  private setupDomainsInTree() {
     sample({
-      clock: [this.$grade, this.initTreeFx.doneData],
-      source: { tree: this.$tree, stats: this.$stats, user: this.$user, grade: this.$grade },
-      filter: isTreeDataReady,
-      fn: ({ tree, stats, user, grade }) => {
-        const [treeWithUserStats] = enhanceProgressMatrixData(
-          Object.values(tree.treeMapping),
-          stats,
-          [{ entityId: user._id, name: user.fullName }],
-          grade as number,
+      clock: this.initTreeFx.doneData,
+      source: { tree: this.$tree, stats: this.$stats, user: this.$user },
+      filter: isTreeDataWithoutGradeReady,
+      fn: ({ tree, stats, user }) => {
+        const treeNodes = Object.values(tree.treeMapping)
+        const grades = getTreeGrades(tree, user).filter((g) => !g.isLocked)
+
+        return Object.fromEntries(
+          grades.map((grade) => {
+            const [treeWithStats] = enhanceProgressMatrixData(
+              treeNodes,
+              stats,
+              [{ entityId: user._id, name: user.fullName }],
+              grade.value,
+            )
+            return [grade.value, getDomainStructure(treeWithStats, tree.treeMapping)]
+          }),
         )
-
-        return getDomainStructure(treeWithUserStats, tree.treeMapping)
       },
-      target: this.setDomains,
+      target: this.$domains,
     })
   }
 }

package/src/features/pmProgress/shared/pmProgress.constants.ts

@@ -35,7 +35,7 @@ export enum PmProgressStatus {
 export enum SessionStorageKeys {
   SOLVING_QUEUE = 'PM_SOLVING_QUEUE',
   GRADE = 'PM_GRADE',
-  DOMAINS = 'PM_DOMAINS',
+  DOMAINS = 'PM_DOMAINS_IN_TREE',
 }
 
 /**

package/src/features/pmProgress/shared/pmProgress.helpers.ts

@@ -1,5 +1,6 @@
 import { COLORS } from '@magmamath/react-native-ui'
 import type { ProgressMatrixStatsDto } from '@matteappen/skills-utils/enhanceProgressData/types'
+import type { GradeLabelsMap } from './pmProgress.types'
 import {
   Domain,
   DomainStandard,
@@ -13,8 +14,7 @@ import {
 import { CustomDomain, DOMAIN_BORDER_COLORS, DOMAIN_COLORS } from './pmProgress.constants'
 import { dynamicCornerRadius, dynamicInnerRadius } from '../components/chart/chart.helpers'
 import type { PieChartManagerConfig } from '../components/chart/chart.types'
-import { getText } from '../../../shared/translation/helpers'
-import type { GradeLabelsMap } from './pmProgress.types'
+import { getText } from '../../../i18n/i18n'
 
 const groupStandardsByDomain = (
   standardStats: ProgressMatrixStatsDto[number]['standardStats'],
@@ -171,6 +171,14 @@ type TreeDataReady = {
 export const isTreeDataReady = (source: TreeDataSource): source is TreeDataReady =>
   source.tree !== null && source.stats !== null && source.user !== null && source.grade !== null
 
+type TreeDataWithoutGrade = Omit<TreeDataSource, 'grade'>
+type TreeDataWithoutGradeReady = Omit<TreeDataReady, 'grade'>
+
+export const isTreeDataWithoutGradeReady = (
+  source: TreeDataWithoutGrade,
+): source is TreeDataWithoutGradeReady =>
+  source.tree !== null && source.stats !== null && source.user !== null
+
 export const createChartConfig = (size: number): PieChartManagerConfig => {
   const OUTER_MARGIN = 5
   return {
@@ -261,6 +269,9 @@ export const withoutDuplicates = (skills: (Skill | undefined)[]): Skill[] => {
   })
 }
 
+export const findDomainBySkillId = (skillId: string, domains: Domain[]): Domain | undefined =>
+  domains.find((d) => d.standards.some((s) => s.skillIds.includes(skillId)))
+
 // Reorders grades starting from the given grade, wrapping around. [1,2,3] with start=2 → [2,3,1]
 export const startGradesFrom = (grades: Grade[], startGrade: number): Grade[] => {
   const index = grades.findIndex(({ value }) => value === startGrade)

package/src/features/voice/playing/components/VoiceTranscriptionsDropdown.tsx

@@ -24,7 +24,7 @@ import { useVoiceTranscriptionsDropdown } from '../hooks/useVoiceTranscriptionsD
 import { VoicePlayerModel, PlayerState } from '../model'
 import { VoiceTranscriptionsDropdownItem } from './VoiceTranscriptionsDropdownItem'
 import { DROPDOWN_MAX_CONTENT_HEIGHT, NO_AUDIO_BE_MESSAGE } from '../../constants'
-import { useText } from '../../../../shared/translation'
+import { useText } from '../../../../i18n/i18n'
 import { PlayButton } from '../../../../shared/components/PlayButton'
 import { getActiveAttempt, getAudioStatus } from '../../helpers'
 

package/src/features/voice/playing/components/VoiceTranscriptionsDropdownItem.tsx

@@ -12,7 +12,7 @@ import {
 } from '@magmamath/react-native-ui'
 import Animated, { runOnJS, useAnimatedReaction } from 'react-native-reanimated'
 import { useVoiceTranscriptionsDropdownItemAnimation } from '../hooks/useVoiceTranscriptionsDropdownItemAnimation'
-import { useText } from '../../../../shared/translation'
+import { useText } from '../../../../i18n/i18n'
 
 type VoiceTranscriptionsDropdownItemProps = {
   attempt: number

package/src/features/voice/recording/components/VoiceRecordButton.tsx

@@ -16,8 +16,8 @@ import { Pressable, StyleSheet } from 'react-native'
 import { VoiceRecordModel } from '../model/VoiceRecord.model'
 import { useUnit } from 'effector-react'
 import { VOICE_RECORD_SHADOWS, VoiceRecorderState } from '../../constants'
-import { useText } from '../../../../shared/translation'
 import { RecordButtonVariant } from '../../types'
+import { useText } from '../../../../i18n/i18n'
 
 type VoiceRecordButtonProps = {
   model: VoiceRecordModel

package/src/features/voice/recording/modal/ModalFooterButtons.tsx

@@ -1,13 +1,12 @@
 import React from 'react'
 import { Button, ButtonColor, ButtonSize, ButtonVariant, SPACING } from '@magmamath/react-native-ui'
 import { StyleSheet, View } from 'react-native'
-import { useText } from '../../../../shared/translation'
-import { TranslationKeys } from '../../../../shared/translation/types'
+import { TranslationKey, useText } from '../../../../i18n/i18n'
 
 type ModalFooterButtonsProps = {
   onCancel: () => void
   onConfirm: () => void
-  confirmLabel: TranslationKeys
+  confirmLabel: TranslationKey
   confirmColor?: ButtonColor
 }
 

package/src/features/voice/recording/modal/VoiceRecordDeleteModal.tsx

@@ -3,7 +3,7 @@ import { BaseModal, ButtonColor } from '@magmamath/react-native-ui'
 import { StyleSheet } from 'react-native'
 import { useUnit } from 'effector-react'
 import { VoiceRecorderState } from '../../constants'
-import { useText } from '../../../../shared/translation'
+import { useText } from '../../../../i18n/i18n'
 import { ModalFooterButtons } from './ModalFooterButtons'
 import { VoiceRecordModalParams } from '../../types'
 

package/src/features/voice/recording/modal/VoiceRecordUndoModal.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { BaseModal } from '@magmamath/react-native-ui'
 import { StyleSheet } from 'react-native'
-import { useText } from '../../../../shared/translation'
+import { useText } from '../../../../i18n/i18n'
 import { ModalFooterButtons } from './ModalFooterButtons'
 import { VoiceRecordModalParams } from '../../types'
 

package/src/features/voice/recording/model/VoiceRecord.model.ts

@@ -10,7 +10,7 @@ import {
 } from '../../types'
 import { ensureRecordingPermissions, getAvailableInputs } from '../../helpers'
 import { VOICE_RECORDER_MIN_DURATION_MS } from '../../constants'
-import { t } from '../../../../shared/translation'
+import { getText as t } from '../../../../i18n/i18n'
 
 type VoiceRecordModelParams = {
   api: VoiceRecorderApi

package/{dist/commonjs/shared/translation/localization/en.json → src/i18n/.generated/schema.json}

@@ -1,85 +1,90 @@
 {
-  "locale": "en-SE",
-  "teacherFeedback.noComments": "No comments yet",
-  "time.justNow": "just now",
-  "time.minuteAgo": "minute ago",
-  "time.minutesAgo": "{{count}} minutes ago",
-  "time.hourAgo": "hour ago",
-  "time.hoursAgo": "{{count}} hours ago",
-  "time.dayAgo": "day ago",
-  "time.daysAgo": "{{count}} days ago",
-  "time.monthAgo": "month ago",
-  "time.monthsAgo": "{{count}} months ago",
-  "time.yearAgo": "year ago",
-  "time.yearsAgo": "{{count}} years ago",
   "chat": {
     "anotherHint": "Give me another hint",
-    "getHint": "Get a hint",
-    "needHint": "I need a hint",
-    "giveHintOpenChat": "I need a hint",
     "answerAgain": "Answer again to get another hint!",
     "errorMessage": "Something went wrong! Try again",
+    "getHint": "Get a hint",
+    "giveHint": "I need a hint",
+    "giveHintOpenChat": "I need a hint",
     "howCanIHelp": "Hi! Do you want help?",
-    "showError": "Show error",
-    "inputPlaceholder": "Type..."
-  },
-  "gifCelebrations": {
-    "greatStart": "Great start!",
-    "onTheWay": "On the way!",
-    "almostThere": "Almost there"
+    "inputPlaceholder": "Type...",
+    "needHint": "I need a hint",
+    "showError": "Show error"
   },
   "exampleSolution": {
-    "exampleSolution": "Example solution",
-    "letMeThink": "Let me think...",
     "aha": "Aha!",
-    "errorMessage": "Something went wrong with generating an example solution"
+    "errorMessage": "Something went wrong with generating an example solution",
+    "exampleSolution": "Example solution",
+    "letMeThink": "Let me think..."
+  },
+  "gifCelebrations": {
+    "almostThere": "Almost there",
+    "greatStart": "Great start!",
+    "onTheWay": "On the way!"
   },
   "keyboard": {
-    "length": "Length",
     "area": "Area",
+    "length": "Length",
+    "time": "Time",
     "volume": "Volume",
-    "weight": "Weight",
-    "time": "Time"
+    "weight": "Weight"
+  },
+  "locale": "en-SE",
+  "pmProgress": {
+    "allLockedSubtitle": "Your teacher has locked all grades.\nAsk them to unlock grades so you can start practicing.",
+    "allLockedTitle": "All grades are locked",
+    "allTime": "All time",
+    "andMore": "and '{{'count'}}' more...",
+    "fluency": "Fluency",
+    "grade": "Grade",
+    "gradeK": "K",
+    "gradeOther": "Other",
+    "initErrorSubtitle": "We couldn't load your progress.\nPlease try again later.",
+    "initErrorTitle": "Something went wrong",
+    "lastWeek": "Last week",
+    "loading": "Loading...",
+    "nextUp": "Next up!",
+    "practiceButton": "PRACTICE",
+    "skillLeft": "skill left",
+    "skillsLeft": "skills left",
+    "stars": "Practice stars",
+    "startButton": "START",
+    "teacherRecs": "Teacher recommendations",
+    "thisWeek": "This week",
+    "time": "Practice time",
+    "title": "Practice & Progress"
+  },
+  "teacherFeedback": {
+    "noComments": "No comments yet"
+  },
+  "time": {
+    "dayAgo": "day ago",
+    "daysAgo": "{{count}} days ago",
+    "hourAgo": "hour ago",
+    "hoursAgo": "{{count}} hours ago",
+    "justNow": "just now",
+    "minuteAgo": "minute ago",
+    "minutesAgo": "{{count}} minutes ago",
+    "monthAgo": "month ago",
+    "monthsAgo": "{{count}} months ago",
+    "yearAgo": "year ago",
+    "yearsAgo": "{{count}} years ago"
   },
   "voice": {
-    "deleteRecording": "Delete recording?",
-    "youWontBeAbleToRecover": "You won't be able to recover this file once it's gone.",
-    "recordingDeleted": "Recording successfully deleted.",
-    "delete": "Delete",
+    "attempt": "Attempt {{ number }}",
     "cancel": "Cancel",
+    "delete": "Delete",
+    "deleteRecording": "Delete recording?",
     "noMicrophoneAccess": "No microphone access.",
     "noMicrophoneAccessBySystem": "Microphone access denied by system settings.",
     "noMicrophoneFound": "No microphone found.",
-    "uploadFailed": "Upload failed. Please try again.",
-    "redoRecording": "Redo recording?",
+    "recordingDeleted": "Recording successfully deleted.",
     "redo": "Redo",
+    "redoRecording": "Redo recording?",
     "thisWillRemoveRecording": "This will remove your previous recording.",
     "transcriptions": "Transcriptions",
-    "attempt": "Attempt {{number}}",
-    "transcriptNotAvailable": "Transcript not available"
-  },
-  "pmProgress": {
-    "title": "Practice & Progress",
-    "startButton": "START",
-    "nextUp": "Next up!",
-    "teacherRecs": "Teacher recommendations",
-    "practiceButton": "PRACTICE",
-    "stars": "Practice stars",
-    "time": "Practice time",
-    "thisWeek": "This week",
-    "lastWeek": "Last week",
-    "allTime": "All time",
-    "fluency": "Fluency",
-    "andMore": "and {{count}} more...",
-    "skillsLeft": "skills left",
-    "skillLeft": "skill left",
-    "grade": "Grade",
-    "gradeK": "K",
-    "gradeOther": "Other",
-    "loading": "Loading...",
-    "allLockedTitle": "All grades are locked",
-    "allLockedSubtitle": "Your teacher has locked all grades.\nAsk them to unlock grades so you can start practicing.",
-    "initErrorTitle": "Something went wrong",
-    "initErrorSubtitle": "We couldn't load your progress.\nPlease try again later."
+    "transcriptNotAvailable": "Transcript not available",
+    "uploadFailed": "Upload failed. Please try again.",
+    "youWontBeAbleToRecover": "You won't be able to recover this file once it's gone."
   }
-}
+}