@magmamath/students-features 0.9.5-rc.2 → 0.9.6-rc.0

package/src/features/chatbot/types/api.types.ts

@@ -77,9 +77,18 @@ export type GoogleText2SpeechPayload = {
     pitch: number
     speakingRate: number
   }
+  enableTimePointing?: string[]
 }
 
-export type GoogleText2SpeechResponse = string | undefined | { audioContent?: string }
+export type Timepoint = {
+  markName: string
+  timeSeconds: number
+}
+
+export type GoogleText2SpeechResponse = {
+  audioContent?: string
+  timepoints?: Timepoint[]
+}
 
 export type ChatHintPayload = {
   problemDescription: string

package/src/features/endOfAssignment/components/AssessmentScoreCard/AssessmentScoreCard.tsx

@@ -0,0 +1,43 @@
+import React from 'react'
+import { StyleSheet, Text, View } from 'react-native'
+import { BORDER_RADIUS, COLORS, SHADOWS, SPACING } from '@magmamath/react-native-ui'
+import { EOAModalText } from '@magmamath/students-features'
+
+type AssessmentScoreCardProps = {
+  textContent: EOAModalText
+  solvedAmount?: number
+  problemsAmount?: number
+}
+
+export const AssessmentScoreCard = ({
+  textContent,
+  solvedAmount = 0,
+  problemsAmount = 0,
+}: AssessmentScoreCardProps) => {
+  return (
+    <View style={styles.container}>
+      <Text style={styles.text}>
+        {solvedAmount} / {problemsAmount} {textContent.stats?.score ?? 'pt'}
+      </Text>
+    </View>
+  )
+}
+
+const styles = StyleSheet.create({
+  container: {
+    alignItems: 'center',
+    justifyContent: 'center',
+    minHeight: 130,
+    minWidth: 410,
+    padding: SPACING['400'],
+    borderRadius: BORDER_RADIUS['400'],
+    backgroundColor: COLORS.NEUTRAL_1,
+    ...SHADOWS['1'],
+  },
+  text: {
+    fontSize: 96,
+    fontWeight: '700',
+    color: COLORS.NEUTRAL_9,
+    fontFamily: 'Buenos Aires',
+  },
+})

package/src/features/endOfAssignment/components/CorrectAnswer/CorrectAnswer.tsx

@@ -1,6 +1,5 @@
 import React, { useCallback, useState } from 'react'
 import { View, StyleSheet } from 'react-native'
-
 import { useUnit } from 'effector-react'
 import { SPACING, Typography, COLORS, FONT_FAMILY } from '@magmamath/react-native-ui'
 
@@ -11,6 +10,8 @@ import { GOOD_DRAWING_CARD_APPEARENCE_DELAY } from '../../constants'
 import { AnimatedCardVariant, EOAModalContentProps, EOAModalVariant } from '../../types'
 import { useKeyBoard } from '../../../../shared/hooks/useKeyboard'
 import { KeyboardKeys } from '../../../../lib/constants'
+import { getEoaButtonColor } from '../../helpers'
+import { AssessmentScoreCard } from '../AssessmentScoreCard/AssessmentScoreCard'
 
 export const CorrectAnswer = ({ textContent, model, onPracticePress }: EOAModalContentProps) => {
   const popUpData = useUnit(model.$popUpData)
@@ -22,6 +23,7 @@ export const CorrectAnswer = ({ textContent, model, onPracticePress }: EOAModalC
     stats,
     hasRecommendations,
     isExam = false,
+    isAssessment = false,
     newerAssignmentAvailable,
   } = popUpData ?? {}
 
@@ -72,14 +74,22 @@ export const CorrectAnswer = ({ textContent, model, onPracticePress }: EOAModalC
       </View>
 
       <View style={styles.animationContainer}>
-        <AnimatedCard
-          variant={AnimatedCardVariant.CORRECT_ANSWER}
-          textContent={textContent}
-          solvedAmount={stats?.solvedAmount}
-          problemsAmount={stats?.problemsAmount}
-          shouldTriggerSparkles={cardsAnimationCompleted}
-          onAnimationEnd={onCorrectAnswerAnimationEnd}
-        />
+        {isAssessment ? (
+          <AssessmentScoreCard
+            textContent={textContent}
+            solvedAmount={stats?.solvedAmount}
+            problemsAmount={stats?.problemsAmount}
+          />
+        ) : (
+          <AnimatedCard
+            variant={AnimatedCardVariant.CORRECT_ANSWER}
+            textContent={textContent}
+            solvedAmount={stats?.solvedAmount}
+            problemsAmount={stats?.problemsAmount}
+            shouldTriggerSparkles={cardsAnimationCompleted}
+            onAnimationEnd={onCorrectAnswerAnimationEnd}
+          />
+        )}
 
         {modalVariant === EOAModalVariant.HAS_GOOD_DRAWING && (
           <AnimatedCard
@@ -96,9 +106,9 @@ export const CorrectAnswer = ({ textContent, model, onPracticePress }: EOAModalC
       <PracticeButtonGroup
         textContent={textContent}
         isPracticeButtonVisible={isPracticeButtonVisible}
-        isExam={isExam}
         onLeftButtonPress={model.hidePopUpAndLeave}
         onRightButtonPress={handlePracticeButtonPress}
+        buttonColor={getEoaButtonColor(popUpData)}
       />
     </View>
   )

package/src/features/endOfAssignment/components/EOAModal.tsx

@@ -14,7 +14,6 @@ import { ExamPaused } from './ExamPaused/ExamPaused'
 import { ExamSubmit } from './ExamSubmit/ExamSubmit'
 
 import { getModalContainerSize, shouldDisplayModalBackground } from '../helpers'
-import { ButtonColor } from '@magmamath/react-native-ui'
 
 const MODAL_CONTENT_VARIANTS_MAP = new Map([
   [EOAModalVariant.NO_CORRECT_ANSWERS, NoAnswer],
@@ -33,7 +32,6 @@ type EOAModalProps = {
   model: EOAModel
   textContent: EOAModalText
   onPracticePress: () => void
-  buttonColor?: ButtonColor
 }
 
 /**
@@ -42,7 +40,7 @@ type EOAModalProps = {
  * Dynamically renders a modal UI after an assignment ends, using the current `modalVariant`
  * to determine which specific view to display (e.g., `NoAnswer`, `CorrectAnswer`, `CheatDetected`).
  */
-export const EOAModal = ({ model, textContent, onPracticePress, buttonColor }: EOAModalProps) => {
+export const EOAModal = ({ model, textContent, onPracticePress }: EOAModalProps) => {
   const popUpData = useUnit(model.$popUpData)
   const modalVariant = useUnit(model.$modalVariant)
 
@@ -64,12 +62,7 @@ export const EOAModal = ({ model, textContent, onPracticePress, buttonColor }: E
       style={getModalContainerSize(modalVariant)}
       onClose={model.hidePopUp}
       content={
-        <ModalContent
-          model={model}
-          textContent={textContent}
-          onPracticePress={onPracticePress}
-          buttonColor={buttonColor}
-        />
+        <ModalContent model={model} textContent={textContent} onPracticePress={onPracticePress} />
       }
       withBackground={withBackground}
     />

package/src/features/endOfAssignment/components/ExamPaused/ExamPaused.tsx

@@ -13,12 +13,12 @@ import {
 import { EOAModalContentProps } from '../../types'
 import { useKeyBoard } from '../../../../shared/hooks/useKeyboard'
 import { KeyboardKeys } from '../../../../lib/constants'
+import { getEoaButtonColor } from '../../helpers'
+import { useUnit } from 'effector-react'
+
+export const ExamPaused = ({ textContent, model }: EOAModalContentProps) => {
+  const popUpData = useUnit(model.$popUpData)
 
-export const ExamPaused = ({
-  textContent,
-  model,
-  buttonColor = ButtonColor.PURPLE,
-}: EOAModalContentProps) => {
   useKeyBoard({
     callback: (event) => {
       if (event.key === KeyboardKeys.ENTER) {
@@ -39,7 +39,7 @@ export const ExamPaused = ({
 
       <Button
         variant={ButtonVariant.PRIMARY}
-        colorScheme={buttonColor}
+        colorScheme={getEoaButtonColor(popUpData)}
         size={ButtonSize.LARGE}
         style={{ text: styles.buttonText }}
         onPress={model.hidePopUpAndLeave}

package/src/features/endOfAssignment/components/ExamSubmit/ExamSubmit.tsx

@@ -4,7 +4,6 @@ import { View, StyleSheet, Platform, Image } from 'react-native'
 import { useUnit } from 'effector-react'
 import {
   Button,
-  ButtonColor,
   ButtonSize,
   ButtonVariant,
   COLORS,
@@ -18,6 +17,7 @@ import { EOAModalContentProps } from '../../types'
 import { PracticeButton } from '../../ui/PracticeButton'
 import { useKeyBoard } from '../../../../shared/hooks/useKeyboard'
 import { KeyboardKeys } from '../../../../lib/constants'
+import { getEoaButtonColor } from '../../helpers'
 
 export const ExamSubmit = ({ textContent, model, onPracticePress }: EOAModalContentProps) => {
   const popUpData = useUnit(model.$popUpData)
@@ -60,7 +60,7 @@ export const ExamSubmit = ({ textContent, model, onPracticePress }: EOAModalCont
         <Button
           variant={isPracticeButtonVisible ? ButtonVariant.TERTIARY : ButtonVariant.PRIMARY}
           size={ButtonSize.LARGE}
-          colorScheme={popUpData?.isExam ? ButtonColor.PURPLE : ButtonColor.BLUE}
+          colorScheme={getEoaButtonColor(popUpData)}
           style={{ text: { textTransform: 'uppercase' } }}
           onPress={model.hidePopUpAndLeave}
         >

package/src/features/endOfAssignment/components/NoAnswer/NoAnswer.tsx

@@ -16,17 +16,19 @@ import { EOAModalContentProps } from '../../types'
 import { NoAnswerContent } from './NoAnswerContent'
 import { useKeyBoard } from '../../../../shared/hooks/useKeyboard'
 import { KeyboardKeys } from '../../../../lib/constants'
+import { getEoaButtonColor } from '../../helpers'
+import { AssessmentScoreCard } from '../AssessmentScoreCard/AssessmentScoreCard'
 
 export const NoAnswer = ({ model, textContent, onPracticePress }: EOAModalContentProps) => {
   const popUpData = useUnit(model.$popUpData)
 
-  const { stats, isExam, user } = popUpData ?? {}
+  const { stats, isExam, isAssessment, user } = popUpData ?? {}
 
   function getButtons() {
     const buttons = [
       {
         text: textContent.leftButtonText ?? '',
-        colorScheme: isExam ? ButtonColor.PURPLE : ButtonColor.BLUE,
+        colorScheme: getEoaButtonColor(popUpData),
         onPress: () => model.hidePopUpAndLeave(),
       },
     ]
@@ -84,10 +86,19 @@ export const NoAnswer = ({ model, textContent, onPracticePress }: EOAModalConten
           </Typography>
         )}
       </View>
-      <NoAnswerContent
-        solvedAmount={stats?.solvedAmount ?? 0}
-        problemsAmount={stats?.problemsAmount ?? 0}
-      />
+      {isAssessment ? (
+        <AssessmentScoreCard
+          textContent={textContent}
+          solvedAmount={stats?.solvedAmount}
+          problemsAmount={stats?.problemsAmount}
+        />
+      ) : (
+        <NoAnswerContent
+          solvedAmount={stats?.solvedAmount ?? 0}
+          problemsAmount={stats?.problemsAmount ?? 0}
+        />
+      )}
+
       <View style={styles.buttonsContainer}>
         {buttons.map((button, index) => (
           <Button

package/src/features/endOfAssignment/helpers.ts

@@ -1,16 +1,17 @@
 import { MODALS_WITH_BACKGROUND } from './constants'
-import { EOAModalVariant } from './types'
+import { EOAModalData, EOAModalVariant } from './types'
+import { ButtonColor } from '@magmamath/react-native-ui'
 
 export const getModalContainerSize = (modalVariant: EOAModalVariant) => {
   switch (modalVariant) {
     case EOAModalVariant.EXAM_SUBMIT:
     case EOAModalVariant.EXAM_SAFE_MODE_SUBMIT:
-      return { container: { width: 600, height: 384 } }
+      return { container: { width: 620, height: 384 } }
     case EOAModalVariant.EXAM_PAUSED:
     case EOAModalVariant.EXAM_SAFE_MODE_CHEAT_DETECTED:
       return { container: { width: 560, height: 338 } }
     case EOAModalVariant.EXAM_SAFE_MODE_LEAVE:
-      return { container: { width: 550, height: 280 } }
+      return { container: { width: 550, height: 325 } }
     case EOAModalVariant.HAS_GOOD_DRAWING:
       return { container: { width: 957, height: 550 } }
     case EOAModalVariant.HAS_CORRECT_ANSWERS:
@@ -26,3 +27,9 @@ export const shouldDisplayModalBackground = (modalVariant: EOAModalVariant | nul
 
   return MODALS_WITH_BACKGROUND.includes(modalVariant)
 }
+
+export const getEoaButtonColor = (popupData: EOAModalData | null): ButtonColor => {
+  if (popupData?.isAssessment) return ButtonColor.SUNSET
+  if (popupData?.isExam) return ButtonColor.PURPLE
+  return ButtonColor.BLUE
+}

package/src/features/endOfAssignment/model/model.ts

@@ -9,6 +9,7 @@ export class EOAModel {
   public readonly leavePressed = createEvent()
   public readonly goToFirstProblemPressed = createEvent()
   public readonly recommendationsUpdated = createEvent<boolean>()
+  public readonly popUpStatsUpdated = createEvent<Partial<EOAModalData['stats']>>()
   public readonly popUpTriggered = createEvent<EOAEventType>()
 
   public readonly $popUpData = createStore<EOAModalData | null>(null)
@@ -16,6 +17,9 @@ export class EOAModel {
     .on(this.recommendationsUpdated, (state, hasRecommendations) =>
       state ? { ...state, hasRecommendations } : state,
     )
+    .on(this.popUpStatsUpdated, (state, payload) =>
+      state ? { ...state, stats: { ...state.stats, ...payload } } : state,
+    )
     .reset(this.hidePopUp)
 
   public readonly $modalVariant = createStore<EOAModalVariant | null>(null)
@@ -33,7 +37,7 @@ export class EOAModel {
       }
 
       if (eventType === EOAEventType.EXAM_PAUSED) return EOAModalVariant.EXAM_PAUSED
-      
+
       if (eventType === EOAEventType.CHEAT_DETECTED) {
         return EOAModalVariant.EXAM_SAFE_MODE_CHEAT_DETECTED
       }

package/src/features/endOfAssignment/types.ts

@@ -34,11 +34,11 @@ export type EOAModalContentProps = {
   textContent: EOAModalText
   model: EOAModel
   onPracticePress?: () => void
-  buttonColor?: ButtonColor
 }
 
 export type EOAModalData = {
   isExam: boolean
+  isAssessment: boolean
   newerAssignmentAvailable?: boolean
   examFinished?: boolean
   cheatDetection?: boolean
@@ -63,5 +63,6 @@ export type EOAModalText = {
     correctAnswersPlural?: string
     goodCalculations?: string
     goodCalculationsPlural?: string
+    score?: string
   }
 }

package/src/features/endOfAssignment/ui/PracticeButtonGroup.tsx

@@ -11,13 +11,14 @@ import Animated, {
 import { ButtonVariant, SPACING, Button, ButtonSize, ButtonColor } from '@magmamath/react-native-ui'
 
 import { PracticeButton } from './PracticeButton'
+import { getEoaButtonColor } from '../helpers'
 
 type PracticeButtonGroupProps = {
   textContent: { leftButtonText?: string; rightButtonText?: string }
   isPracticeButtonVisible: boolean
   onLeftButtonPress: () => void
   onRightButtonPress: () => void
-  isExam: boolean
+  buttonColor?: ButtonColor
 }
 
 export const PracticeButtonGroup = ({
@@ -25,7 +26,7 @@ export const PracticeButtonGroup = ({
   isPracticeButtonVisible,
   onLeftButtonPress,
   onRightButtonPress,
-  isExam,
+  buttonColor = ButtonColor.BLUE,
 }: PracticeButtonGroupProps) => {
   const buttonsContainerOpacity = useSharedValue(0)
 
@@ -45,7 +46,7 @@ export const PracticeButtonGroup = ({
         <Button
           variant={isPracticeButtonVisible ? ButtonVariant.TERTIARY : ButtonVariant.PRIMARY}
           size={ButtonSize.LARGE}
-          colorScheme={isExam ? ButtonColor.PURPLE : ButtonColor.BLUE}
+          colorScheme={buttonColor}
           style={{ text: { textTransform: 'uppercase' } }}
           onPress={onLeftButtonPress}
         >

package/src/features/keyboard/components/BasicLayout/keyboardGroups.ts

@@ -58,7 +58,3 @@ export const MATH_CURRENCY_US_KEYBOARD_GROUP: KeyboardGroup = {
   id: MathEntryKeyboardGroupId.CURRENCY_US,
   keys: [MATH_CURRENCY_UNITS.DOLLAR, MATH_CURRENCY_UNITS.CENT],
 }
-export const MATH_CURRENCY_DE_KEYBOARD_GROUP: KeyboardGroup = {
-  id: MathEntryKeyboardGroupId.CURRENCY_DE,
-  keys: [MATH_CURRENCY_UNITS.EURO, MATH_CURRENCY_UNITS.DOLLAR, MATH_CURRENCY_UNITS.POUND],
-}

package/src/features/keyboard/constants/keyboardGroupsByLocale.ts

@@ -1,6 +1,5 @@
 import { KeyboardGroup, KeyboardType } from '../types/types'
 import {
-  MATH_CURRENCY_DE_KEYBOARD_GROUP,
   MATH_CURRENCY_SW_KEYBOARD_GROUP,
   MATH_CURRENCY_UK_KEYBOARD_GROUP,
   MATH_CURRENCY_US_KEYBOARD_GROUP,
@@ -99,20 +98,6 @@ export const KEYBOARD_GROUPS_BY_LOCALE: Record<Locale, Record<KeyboardType, Keyb
     [KeyboardType.BasicTime]: MATH_TIME_SW_KEYBOARD_GROUP,
     [KeyboardType.Numpad]: MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP,
   }),
-  [Locale.DE]: createKeyboardLocale({
-    [KeyboardType.Basic]: MATH_ENTRY_BASIC_SW_KEYBOARD_GROUP,
-    [KeyboardType.BasicPlus]: MATH_ENTRY_BASIC_SW_PLUS,
-    [KeyboardType.BasicPlusMobile]: MATH_ENTRY_BASIC_PLUS_MOBILE_SW,
-    [KeyboardType.BasicPlusPlus]: MATH_ENTRY_BASIC_PLUS_PLUS_SW,
-    [KeyboardType.BasicPlusPlusMobile]: MATH_ENTRY_BASIC_PLUS_PLUS_MOBILE_SW,
-    [KeyboardType.BasicUnits]: {
-      ...MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS,
-      keys: MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS.keys[0],
-    },
-    [KeyboardType.BasicCurrency]: MATH_CURRENCY_DE_KEYBOARD_GROUP,
-    [KeyboardType.BasicTime]: MATH_TIME_SW_KEYBOARD_GROUP,
-    [KeyboardType.Numpad]: MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP,
-  }),
 }
 export const KEYBOARD_UNITS_GROUPS_BY_LOCALE: Record<
   Locale,
@@ -134,10 +119,4 @@ export const KEYBOARD_UNITS_GROUPS_BY_LOCALE: Record<
     [KeyboardUnitsGroupType.VOLUME]: MATH_ENTRY_VOLUME_UNITS_SW_KEYBOARD_GROUPS,
     [KeyboardUnitsGroupType.WEIGHT]: MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS,
   }),
-  [Locale.DE]: createKeyboardUnitsLocale({
-    [KeyboardUnitsGroupType.LENGTH]: MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS,
-    [KeyboardUnitsGroupType.AREA]: MATH_ENTRY_AREA_UNITS_SW_KEYBOARD_GROUPS,
-    [KeyboardUnitsGroupType.VOLUME]: MATH_ENTRY_VOLUME_UNITS_SW_KEYBOARD_GROUPS,
-    [KeyboardUnitsGroupType.WEIGHT]: MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS,
-  }),
 }

package/src/features/keyboard/types/keyboardGroupIds.ts

@@ -27,6 +27,5 @@ export enum MathEntryKeyboardGroupId {
   CURRENCY_SW = 'math-entry-currency-sw',
   CURRENCY_UK = 'math-entry-currency-uk',
   CURRENCY_US = 'math-entry-currency-us',
-  CURRENCY_DE = 'math-entry-currency-de',
   UNDERLINED = 'math-entry-underlined',
 }

package/src/lib/helpers/helpers.ts

@@ -27,27 +27,12 @@ export const getRelativeTimeText = (date: Date) => {
   const years = getYears(days)
 
   if (seconds < 60) return getText('time.justNow')
-
-  if (minutes < 60) {
-    if (minutes === 1) return `1 ${getText('time.minuteAgo')}`
-    return getText('time.minutesAgo', { count: minutes.toString() })
-  }
-
-  if (hours < 24) {
-    if (hours === 1) return `1 ${getText('time.hourAgo')}`
-    return getText('time.hoursAgo', { count: hours.toString() })
-  }
-
-  if (days < 30) {
-    if (days === 1) return `1 ${getText('time.dayAgo')}`
-    return getText('time.daysAgo', { count: days.toString() })
-  }
-
-  if (months < 12) {
-    if (months === 1) return `1 ${getText('time.monthAgo')}`
-    return getText('time.monthsAgo', { count: months.toString() })
-  }
-
-  if (years === 1) return `1 ${getText('time.yearAgo')}`
-  return getText('time.yearsAgo', { count: years.toString() })
+  if (minutes < 60)
+    return `${minutes} ${minutes === 1 ? getText('time.minuteAgo') : getText('time.minutesAgo')}`
+  if (hours < 24)
+    return `${hours} ${hours === 1 ? getText('time.hourAgo') : getText('time.hoursAgo')}`
+  if (days < 30) return `${days} ${days === 1 ? getText('time.dayAgo') : getText('time.daysAgo')}`
+  if (months < 12)
+    return `${months} ${months === 1 ? getText('time.monthAgo') : getText('time.monthsAgo')}`
+  return `${years} ${years === 1 ? getText('time.yearAgo') : getText('time.yearsAgo')}`
 }

package/src/shared/translation/constants.ts

@@ -4,7 +4,6 @@ import GB from './localization/gb.json'
 import SW from './localization/sw.json'
 import CA from './localization/ca.json'
 import SCT from './localization/sct.json'
-import DE from './localization/de.json'
 
 export const LOCALIZATION_CONFIGS = {
   [Locale.EN]: EN,
@@ -12,5 +11,4 @@ export const LOCALIZATION_CONFIGS = {
   [Locale.SW]: SW,
   [Locale.CA]: CA,
   [Locale.SCT]: SCT,
-  [Locale.DE]: DE,
 }

package/src/shared/translation/localization/ca.json

@@ -3,15 +3,15 @@
   "teacherFeedback.noComments": "No comments yet",
   "time.justNow": "just now",
   "time.minuteAgo": "minute ago",
-  "time.minutesAgo": "{{count}} minutes ago",
+  "time.minutesAgo": "minutes ago",
   "time.hourAgo": "hour ago",
-  "time.hoursAgo": "{{count}} hours ago",
+  "time.hoursAgo": "hours ago",
   "time.dayAgo": "day ago",
-  "time.daysAgo": "{{count}} days ago",
+  "time.daysAgo": "days ago",
   "time.monthAgo": "month ago",
-  "time.monthsAgo": "{{count}} months ago",
+  "time.monthsAgo": "months ago",
   "time.yearAgo": "year ago",
-  "time.yearsAgo": "{{count}} years ago",
+  "time.yearsAgo": "years ago",
   "chat": {
     "anotherHint": "Give me another hint",
     "giveHint": "I need a hint",

package/src/shared/translation/localization/en.json

@@ -3,15 +3,15 @@
   "teacherFeedback.noComments": "No comments yet",
   "time.justNow": "just now",
   "time.minuteAgo": "minute ago",
-  "time.minutesAgo": "{{count}} minutes ago",
+  "time.minutesAgo": "minutes ago",
   "time.hourAgo": "hour ago",
-  "time.hoursAgo": "{{count}} hours ago",
+  "time.hoursAgo": "hours ago",
   "time.dayAgo": "day ago",
-  "time.daysAgo": "{{count}} days ago",
+  "time.daysAgo": "days ago",
   "time.monthAgo": "month ago",
-  "time.monthsAgo": "{{count}} months ago",
+  "time.monthsAgo": "months ago",
   "time.yearAgo": "year ago",
-  "time.yearsAgo": "{{count}} years ago",
+  "time.yearsAgo": "years ago",
   "chat": {
     "anotherHint": "Give me another hint",
     "giveHint": "I need a hint",

package/src/shared/translation/localization/gb.json

@@ -3,15 +3,15 @@
   "teacherFeedback.noComments": "No comments yet",
   "time.justNow": "just now",
   "time.minuteAgo": "minute ago",
-  "time.minutesAgo": "{{count}} minutes ago",
+  "time.minutesAgo": "minutes ago",
   "time.hourAgo": "hour ago",
-  "time.hoursAgo": "{{count}} hours ago",
+  "time.hoursAgo": "hours ago",
   "time.dayAgo": "day ago",
-  "time.daysAgo": "{{count}} days ago",
+  "time.daysAgo": "days ago",
   "time.monthAgo": "month ago",
-  "time.monthsAgo": "{{count}} months ago",
+  "time.monthsAgo": "months ago",
   "time.yearAgo": "year ago",
-  "time.yearsAgo": "{{count}} years ago",
+  "time.yearsAgo": "years ago",
   "chat": {
     "anotherHint": "Give me another hint",
     "giveHint": "I need a hint",

package/src/shared/translation/localization/sct.json

@@ -3,15 +3,15 @@
   "teacherFeedback.noComments": "No comments yet",
   "time.justNow": "just now",
   "time.minuteAgo": "minute ago",
-  "time.minutesAgo": "{{count}} minutes ago",
+  "time.minutesAgo": "minutes ago",
   "time.hourAgo": "hour ago",
-  "time.hoursAgo": "{{count}} hours ago",
+  "time.hoursAgo": "hours ago",
   "time.dayAgo": "day ago",
-  "time.daysAgo": "{{count}} days ago",
+  "time.daysAgo": "days ago",
   "time.monthAgo": "month ago",
-  "time.monthsAgo": "{{count}} months ago",
+  "time.monthsAgo": "months ago",
   "time.yearAgo": "year ago",
-  "time.yearsAgo": "{{count}} years ago",
+  "time.yearsAgo": "years ago",
   "chat": {
     "anotherHint": "Give me another hint",
     "giveHint": "I need a hint",

package/src/shared/translation/localization/sw.json

@@ -3,15 +3,15 @@
   "teacherFeedback.noComments": "Inga kommentarer än",
   "time.justNow": "alldeles nyss",
   "time.minuteAgo": "minut sedan",
-  "time.minutesAgo": "{{count}} minuter sedan",
+  "time.minutesAgo": "minuter sedan",
   "time.hourAgo": "timme sedan",
-  "time.hoursAgo": "{{count}} timmar sedan",
+  "time.hoursAgo": "timmar sedan",
   "time.dayAgo": "dag sedan",
-  "time.daysAgo": "{{count}} dagar sedan",
+  "time.daysAgo": "dagar sedan",
   "time.monthAgo": "månad sedan",
-  "time.monthsAgo": "{{count}} månader sedan",
+  "time.monthsAgo": "månader sedan",
   "time.yearAgo": "år sedan",
-  "time.yearsAgo": "{{count}} år sedan",
+  "time.yearsAgo": "år sedan",
   "chat": {
     "anotherHint": "Ge mig en till ledtråd",
     "giveHint": "Ge mig en ledtråd",

package/src/shared/translation/types.ts

@@ -3,8 +3,6 @@ import swTranslations from './localization/sw.json'
 import gbTranslations from './localization/gb.json'
 import caTranslations from './localization/ca.json'
 import sctTranslations from './localization/sct.json'
-import deTranslations from "./localization/de.json"
-
 import { RetrieveKeys } from '../../lib/types/keys'
 import { ISValidTranslation } from './validation.types'
 
@@ -18,7 +16,6 @@ export enum Locale {
   GB = 'en-GB',
   CA = 'en-CA',
   SCT = 'en-SCT',
-  DE = 'de-DE'
 }
 
 //  Validation of translations, do not remove
@@ -27,4 +24,3 @@ type ISValidSW = ISValidTranslation<typeof swTranslations>
 type ISValidGB = ISValidTranslation<typeof gbTranslations>
 type ISValidCA = ISValidTranslation<typeof caTranslations>
 type ISValidSCT = ISValidTranslation<typeof sctTranslations>
-type ISValidDE = ISValidTranslation<typeof deTranslations>