@magmamath/students-features 0.9.94 → 0.9.95

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

@@ -58,3 +58,7 @@ 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,5 +1,6 @@
 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,
@@ -98,6 +99,20 @@ 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,
@@ -119,4 +134,10 @@ 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,5 +27,6 @@ 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,12 +27,27 @@ export const getRelativeTimeText = (date: Date) => {
   const years = getYears(days)
 
   if (seconds < 60) return getText('time.justNow')
-  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')}`
+
+  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() })
 }

package/src/shared/translation/constants.ts

@@ -4,6 +4,7 @@ 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,
@@ -11,4 +12,5 @@ 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": "minutes ago",
+  "time.minutesAgo": "{{count}} minutes ago",
   "time.hourAgo": "hour ago",
-  "time.hoursAgo": "hours ago",
+  "time.hoursAgo": "{{count}} hours ago",
   "time.dayAgo": "day ago",
-  "time.daysAgo": "days ago",
+  "time.daysAgo": "{{count}} days ago",
   "time.monthAgo": "month ago",
-  "time.monthsAgo": "months ago",
+  "time.monthsAgo": "{{count}} months ago",
   "time.yearAgo": "year ago",
-  "time.yearsAgo": "years ago",
+  "time.yearsAgo": "{{count}} years ago",
   "chat": {
     "anotherHint": "Give me another hint",
     "giveHint": "I need a hint",

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

@@ -0,0 +1,42 @@
+{
+  "locale": "de-DE",
+  "teacherFeedback.noComments": "Noch keine Kommentare",
+  "time.justNow": "gerade eben",
+  "time.minuteAgo": "vor einer Minute",
+  "time.minutesAgo": "vor {{count}} Minuten",
+  "time.hourAgo": "vor einer Stunde",
+  "time.hoursAgo": "vor {{count}} Stunden",
+  "time.dayAgo": "vor einem Tag",
+  "time.daysAgo": "vor {{count}} Tagen",
+  "time.monthAgo": "vor einem Monat",
+  "time.monthsAgo": "vor {{count}} Monaten",
+  "time.yearAgo": "vor einem Jahr",
+  "time.yearsAgo": "vor {{count}} Jahren",
+  "chat": {
+    "anotherHint": "Gib mir noch einen Hinweis",
+    "giveHint": "Ich brauche einen Hinweis",
+    "giveHintOpenChat": "Ich brauche einen Hinweis",
+    "answerAgain": "Noch einmal antworten, um einen weiteren Hinweis zu bekommen!",
+    "errorMessage": "Etwas ist schiefgelaufen! Versuch es erneut",
+    "howCanIHelp": "Hi! Möchtest du Hilfe?",
+    "showError": "Fehler anzeigen",
+    "inputPlaceholder": "Tippe..."
+  },
+  "gifCelebrations": {
+    "greatStart": "Toller Start!",
+    "onTheWay": "Auf dem Weg!",
+    "almostThere": "Fast geschafft"
+  },
+  "exampleSolution": {
+    "exampleSolution": "Beispiellösung",
+    "letMeThink": "Lass mich nachdenken...",
+    "aha": "Aha!",
+    "errorMessage": "Beim Erstellen einer Beispiellösung ist etwas schiefgelaufen"
+  },
+  "keyboard": {
+    "length": "Länge",
+    "area": "Fläche",
+    "volume": "Volumen",
+    "weight": "Gewicht"
+  }
+}

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": "minutes ago",
+  "time.minutesAgo": "{{count}} minutes ago",
   "time.hourAgo": "hour ago",
-  "time.hoursAgo": "hours ago",
+  "time.hoursAgo": "{{count}} hours ago",
   "time.dayAgo": "day ago",
-  "time.daysAgo": "days ago",
+  "time.daysAgo": "{{count}} days ago",
   "time.monthAgo": "month ago",
-  "time.monthsAgo": "months ago",
+  "time.monthsAgo": "{{count}} months ago",
   "time.yearAgo": "year ago",
-  "time.yearsAgo": "years ago",
+  "time.yearsAgo": "{{count}} 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": "minutes ago",
+  "time.minutesAgo": "{{count}} minutes ago",
   "time.hourAgo": "hour ago",
-  "time.hoursAgo": "hours ago",
+  "time.hoursAgo": "{{count}} hours ago",
   "time.dayAgo": "day ago",
-  "time.daysAgo": "days ago",
+  "time.daysAgo": "{{count}} days ago",
   "time.monthAgo": "month ago",
-  "time.monthsAgo": "months ago",
+  "time.monthsAgo": "{{count}} months ago",
   "time.yearAgo": "year ago",
-  "time.yearsAgo": "years ago",
+  "time.yearsAgo": "{{count}} 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": "minutes ago",
+  "time.minutesAgo": "{{count}} minutes ago",
   "time.hourAgo": "hour ago",
-  "time.hoursAgo": "hours ago",
+  "time.hoursAgo": "{{count}} hours ago",
   "time.dayAgo": "day ago",
-  "time.daysAgo": "days ago",
+  "time.daysAgo": "{{count}} days ago",
   "time.monthAgo": "month ago",
-  "time.monthsAgo": "months ago",
+  "time.monthsAgo": "{{count}} months ago",
   "time.yearAgo": "year ago",
-  "time.yearsAgo": "years ago",
+  "time.yearsAgo": "{{count}} 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": "minuter sedan",
+  "time.minutesAgo": "{{count}} minuter sedan",
   "time.hourAgo": "timme sedan",
-  "time.hoursAgo": "timmar sedan",
+  "time.hoursAgo": "{{count}} timmar sedan",
   "time.dayAgo": "dag sedan",
-  "time.daysAgo": "dagar sedan",
+  "time.daysAgo": "{{count}} dagar sedan",
   "time.monthAgo": "månad sedan",
-  "time.monthsAgo": "månader sedan",
+  "time.monthsAgo": "{{count}} månader sedan",
   "time.yearAgo": "år sedan",
-  "time.yearsAgo": "år sedan",
+  "time.yearsAgo": "{{count}} år sedan",
   "chat": {
     "anotherHint": "Ge mig en till ledtråd",
     "giveHint": "Ge mig en ledtråd",

package/src/shared/translation/types.ts

@@ -3,6 +3,8 @@ 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'
 
@@ -16,6 +18,7 @@ export enum Locale {
   GB = 'en-GB',
   CA = 'en-CA',
   SCT = 'en-SCT',
+  DE = 'de-DE'
 }
 
 //  Validation of translations, do not remove
@@ -24,3 +27,4 @@ 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>