Muttersprache koppeln und russischen A1-Kurs ergänzen
GUI und neue Erklärungen verwenden gemeinsam native_language. Deutsch und Russisch sind die beiden Muttersprachen; Englisch bleibt die Lernsprache. Kompatibilitätsfelder werden atomar gekoppelt, widersprüchliche Eingaben abgewiesen und bestehende Profile sowie eingefrorene Inhalte erhalten. Ergänzt vollständige russische GUI-Kataloge und 840 geprüfte Aufgabenansichten in sieben Modulen einschließlich A1-Test, mit getrennten Sprachrollen für Ausgangs- und Lernmaterial. Äquivalente Ansichten teilen ihre Nachweisidentität. Stabile API-Fehlercodes, neue deterministische Hilfen und Trainingsbegründungen berücksichtigen die Muttersprache. Dokumentiert das Sprachmodell in AGENTS.md. Validierung: Go-Race-Suite mit eigener lokaler PostgreSQL-Testdatenbank, go vet, Web-Build, Offline-Bank-/Variantenaudit, Diff-Prüfung sowie lokale Browser-Smokes für Sprachen, Kurs, Administration, Aussprache und Aufnahme. Keine Live-Anbieter, Produktionsprofile, Deployment-Schritte oder historischen Neubewertungen.
This commit is contained in:
@@ -1,9 +1,13 @@
|
||||
package domain
|
||||
|
||||
import "time"
|
||||
import (
|
||||
"errors"
|
||||
"time"
|
||||
)
|
||||
|
||||
type User struct {
|
||||
ID string `json:"id"`
|
||||
NativeLanguage string `json:"native_language"`
|
||||
Email string `json:"email"`
|
||||
UILanguage string `json:"ui_language"`
|
||||
InstructionLanguage string `json:"instruction_language"`
|
||||
@@ -11,20 +15,39 @@ type User struct {
|
||||
CreatedAt time.Time `json:"created_at"`
|
||||
}
|
||||
|
||||
// ExplanationLanguage preserves compatibility with callers that construct users
|
||||
// without the additive field; persisted accounts always have an explicit value.
|
||||
// Compatibility fields mirror NativeLanguage; they are never separate preferences.
|
||||
func (u User) ExplanationLanguage() string {
|
||||
if u.InstructionLanguage != "" {
|
||||
return u.InstructionLanguage
|
||||
if SupportedNativeLanguage(u.NativeLanguage) {
|
||||
return u.NativeLanguage
|
||||
}
|
||||
if u.UILanguage != "" {
|
||||
if SupportedNativeLanguage(u.UILanguage) {
|
||||
return u.UILanguage
|
||||
}
|
||||
return "de-DE"
|
||||
}
|
||||
|
||||
func SupportedUILanguage(language string) bool {
|
||||
return language == "de-DE" || language == "en-US"
|
||||
var ErrNativeLanguageUnsupported = errors.New("unsupported native language")
|
||||
var ErrNativeLanguageConflict = errors.New("conflicting native language fields")
|
||||
|
||||
func SupportedNativeLanguage(language string) bool { return language == "de-DE" || language == "ru-RU" }
|
||||
func SupportedUILanguage(language string) bool { return SupportedNativeLanguage(language) }
|
||||
|
||||
// ResolveNativeLanguage accepts old client aliases only if all provided values agree.
|
||||
func ResolveNativeLanguage(values ...string) (string, error) {
|
||||
selected := ""
|
||||
for _, value := range values {
|
||||
if value == "" {
|
||||
continue
|
||||
}
|
||||
if !SupportedNativeLanguage(value) {
|
||||
return "", ErrNativeLanguageUnsupported
|
||||
}
|
||||
if selected != "" && selected != value {
|
||||
return "", ErrNativeLanguageConflict
|
||||
}
|
||||
selected = value
|
||||
}
|
||||
return selected, nil
|
||||
}
|
||||
|
||||
type AdminOverview struct {
|
||||
@@ -79,17 +102,18 @@ type Lesson struct {
|
||||
}
|
||||
|
||||
type Exercise struct {
|
||||
TrainingReason string `json:"training_reason,omitempty"`
|
||||
TrainingCategory string `json:"training_category,omitempty"`
|
||||
ID string `json:"id"`
|
||||
LessonID string `json:"lesson_id"`
|
||||
TargetLanguage string `json:"target_language"`
|
||||
CEFRLevel string `json:"cefr_level"`
|
||||
Type string `json:"type"`
|
||||
PromptText string `json:"prompt_text"`
|
||||
TargetText string `json:"target_text"`
|
||||
Difficulty int `json:"difficulty"`
|
||||
Source string `json:"source,omitempty"`
|
||||
InstructionLanguage string `json:"instruction_language,omitempty"`
|
||||
TrainingReason string `json:"training_reason,omitempty"`
|
||||
TrainingCategory string `json:"training_category,omitempty"`
|
||||
ID string `json:"id"`
|
||||
LessonID string `json:"lesson_id"`
|
||||
TargetLanguage string `json:"target_language"`
|
||||
CEFRLevel string `json:"cefr_level"`
|
||||
Type string `json:"type"`
|
||||
PromptText string `json:"prompt_text"`
|
||||
TargetText string `json:"target_text"`
|
||||
Difficulty int `json:"difficulty"`
|
||||
Source string `json:"source,omitempty"`
|
||||
}
|
||||
|
||||
type WordScore struct {
|
||||
@@ -173,6 +197,7 @@ type GeneratedExerciseRequest struct {
|
||||
}
|
||||
|
||||
type GeneratedExercise struct {
|
||||
NativeLanguage string `json:"native_language,omitempty"`
|
||||
TrainingPlan *PronunciationPlan `json:"-"`
|
||||
CandidateWord string `json:"candidate_word,omitempty"`
|
||||
ID string `json:"exercise_id"`
|
||||
|
||||
@@ -58,6 +58,7 @@ type PronunciationProfile struct {
|
||||
}
|
||||
|
||||
type PronunciationPlan struct {
|
||||
NativeLanguage string `json:"native_language,omitempty"`
|
||||
ID string `json:"id"`
|
||||
Algorithm string `json:"algorithm"`
|
||||
Language string `json:"language"`
|
||||
|
||||
@@ -39,6 +39,9 @@ func adaptiveError(w http.ResponseWriter, err error) {
|
||||
return
|
||||
}
|
||||
status := http.StatusInternalServerError
|
||||
if errors.Is(err, domain.ErrNativeLanguageUnsupported) || errors.Is(err, domain.ErrNativeLanguageConflict) {
|
||||
status = http.StatusBadRequest
|
||||
}
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
status = http.StatusNotFound
|
||||
}
|
||||
@@ -121,7 +124,7 @@ func (s *Server) adaptiveCatalog(w http.ResponseWriter, r *http.Request) {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
}
|
||||
writeJSON(w, 200, map[string]any{"instruction_language": user.ExplanationLanguage(), "instruction_languages": instructionLanguages, "exam_available": s.course.Mode != "bank" || user.ExplanationLanguage() == "de-DE", "task_mode": s.course.Mode, "grading_available": s.course.EvaluationAvailable(r.Context()), "bank": inventory, "analysis_job": analysisJob, "profile": p, "modules": snap.Modules, "progress": snap.Progress, "analysis": snap.PreviousAnalysis, "facts_version": snap.FactsVersion, "enabled_languages": available, "languages": languages, "exams": exams})
|
||||
writeJSON(w, 200, map[string]any{"native_language": user.ExplanationLanguage(), "native_languages": []string{"de-DE", "ru-RU"}, "instruction_language": user.ExplanationLanguage(), "instruction_languages": instructionLanguages, "exam_available": s.course.Mode != "bank" || bankExamInventoryAvailable(inventory), "task_mode": s.course.Mode, "grading_available": s.course.EvaluationAvailable(r.Context()), "bank": inventory, "analysis_job": analysisJob, "profile": p, "modules": snap.Modules, "progress": snap.Progress, "analysis": snap.PreviousAnalysis, "facts_version": snap.FactsVersion, "enabled_languages": available, "languages": languages, "exams": exams})
|
||||
}
|
||||
func (s *Server) adaptiveNext(w http.ResponseWriter, r *http.Request) {
|
||||
p, ok := s.adaptiveProfile(w, r)
|
||||
@@ -584,7 +587,7 @@ func (s *Server) adaptiveNewExam(w http.ResponseWriter, r *http.Request) {
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
}
|
||||
if user.ExplanationLanguage() != "de-DE" {
|
||||
if !domain.SupportedNativeLanguage(user.ExplanationLanguage()) {
|
||||
exists, err := s.course.Repo.HasExamRequest(r.Context(), user.ID, p.TargetLanguage, input.RequestID)
|
||||
if err != nil {
|
||||
adaptiveError(w, err)
|
||||
@@ -711,5 +714,20 @@ func (s *Server) adaptiveInstructionLanguage(w http.ResponseWriter, r *http.Requ
|
||||
adaptiveError(w, err)
|
||||
return
|
||||
}
|
||||
writeJSON(w, 200, map[string]string{"instruction_language": input.InstructionLanguage})
|
||||
writeJSON(w, 200, map[string]string{"native_language": input.InstructionLanguage, "ui_language": input.InstructionLanguage, "instruction_language": input.InstructionLanguage})
|
||||
}
|
||||
|
||||
func bankExamInventoryAvailable(inventory []store.BankInventoryItem) bool {
|
||||
skills := map[string]bool{}
|
||||
for _, item := range inventory {
|
||||
if item.ModuleID == "a1_review_test_v1" && item.Total >= 2 {
|
||||
skills[item.Skill] = true
|
||||
}
|
||||
}
|
||||
for _, skill := range domain.CourseSkills {
|
||||
if !skills[skill] {
|
||||
return false
|
||||
}
|
||||
}
|
||||
return true
|
||||
}
|
||||
|
||||
@@ -404,9 +404,9 @@ func TestBankBrowserSmoke(t *testing.T) {
|
||||
}
|
||||
for _, check := range []struct{ script, language string }{
|
||||
{"tests/languages.e2e.cjs", "de-DE"},
|
||||
{"tests/course-variants.e2e.cjs", "en-US"},
|
||||
{"tests/course-variants.e2e.cjs", "ru-RU"},
|
||||
{"tests/course-bank.e2e.cjs", "de-DE"},
|
||||
{"tests/course-bank.e2e.cjs", "en-US"},
|
||||
{"tests/course-bank.e2e.cjs", "ru-RU"},
|
||||
} {
|
||||
node := exec.Command("node", check.script)
|
||||
node.Dir = web
|
||||
|
||||
@@ -4,10 +4,14 @@ import (
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
"speech-learning-api/internal/domain"
|
||||
"speech-learning-api/internal/services"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type errorResponse struct {
|
||||
Error string `json:"error"`
|
||||
Code string `json:"code"`
|
||||
}
|
||||
|
||||
func writeJSON(w http.ResponseWriter, status int, value any) {
|
||||
@@ -20,7 +24,49 @@ func writeError(w http.ResponseWriter, status int, err error) {
|
||||
if err == nil {
|
||||
err = errors.New(http.StatusText(status))
|
||||
}
|
||||
writeJSON(w, status, errorResponse{Error: err.Error()})
|
||||
writeJSON(w, status, errorResponse{Error: err.Error(), Code: errorCode(status, err)})
|
||||
}
|
||||
|
||||
// Codes are presentation contracts; provider diagnostics remain in the error field.
|
||||
func errorCode(status int, err error) string {
|
||||
switch {
|
||||
case errors.Is(err, domain.ErrNativeLanguageUnsupported):
|
||||
return "native_language_unsupported"
|
||||
case errors.Is(err, domain.ErrNativeLanguageConflict):
|
||||
return "native_language_conflict"
|
||||
case errors.Is(err, services.ErrInvalidCredentials):
|
||||
return "invalid_credentials"
|
||||
case err.Error() == "valid email is required":
|
||||
return "invalid_email"
|
||||
case err.Error() == "password must be at least 8 characters":
|
||||
return "password_too_short"
|
||||
case strings.Contains(err.Error(), "duplicate key") && strings.Contains(err.Error(), "email"):
|
||||
return "email_in_use"
|
||||
}
|
||||
switch status {
|
||||
case 400, 422:
|
||||
return "invalid_request"
|
||||
case 401:
|
||||
return "authentication_required"
|
||||
case 403:
|
||||
return "access_denied"
|
||||
case 404:
|
||||
return "not_found"
|
||||
case 409:
|
||||
return "operation_conflict"
|
||||
case 413:
|
||||
return "upload_too_large"
|
||||
case 415:
|
||||
return "unsupported_audio_format"
|
||||
case 429:
|
||||
return "rate_limited"
|
||||
case 502, 503:
|
||||
return "service_unavailable"
|
||||
case 408, 504:
|
||||
return "request_timeout"
|
||||
default:
|
||||
return "internal_error"
|
||||
}
|
||||
}
|
||||
|
||||
func decodeJSON(r *http.Request, dst any) error {
|
||||
|
||||
@@ -0,0 +1,28 @@
|
||||
package httpapi
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
"speech-learning-api/internal/domain"
|
||||
"speech-learning-api/internal/services"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestStablePresentationErrorCodes(t *testing.T) {
|
||||
for _, test := range []struct {
|
||||
status int
|
||||
err error
|
||||
code string
|
||||
}{
|
||||
{400, domain.ErrNativeLanguageUnsupported, "native_language_unsupported"},
|
||||
{400, domain.ErrNativeLanguageConflict, "native_language_conflict"},
|
||||
{401, services.ErrInvalidCredentials, "invalid_credentials"},
|
||||
{503, errors.New("provider diagnostic"), "service_unavailable"},
|
||||
{500, errors.New("private database detail"), "internal_error"},
|
||||
{http.StatusUnauthorized, errors.New("expired token"), "authentication_required"},
|
||||
} {
|
||||
if got := errorCode(test.status, test.err); got != test.code {
|
||||
t.Errorf("code=%s want=%s", got, test.code)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -128,17 +128,24 @@ func (s *Server) health(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
func (s *Server) register(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
Email string `json:"email"`
|
||||
Password string `json:"password"`
|
||||
UILanguage string `json:"ui_language"`
|
||||
TargetLanguage string `json:"target_language"`
|
||||
DailyGoalMinutes int `json:"daily_goal_minutes"`
|
||||
Email string `json:"email"`
|
||||
Password string `json:"password"`
|
||||
NativeLanguage string `json:"native_language"`
|
||||
InstructionLanguage string `json:"instruction_language"`
|
||||
UILanguage string `json:"ui_language"`
|
||||
TargetLanguage string `json:"target_language"`
|
||||
DailyGoalMinutes int `json:"daily_goal_minutes"`
|
||||
}
|
||||
if err := decodeJSON(r, &req); err != nil {
|
||||
writeError(w, http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
result, err := s.auth.Register(r.Context(), req.Email, req.Password, req.UILanguage, req.TargetLanguage, req.DailyGoalMinutes)
|
||||
native, err := domain.ResolveNativeLanguage(req.NativeLanguage, req.UILanguage, req.InstructionLanguage)
|
||||
if err != nil {
|
||||
writeError(w, 400, err)
|
||||
return
|
||||
}
|
||||
result, err := s.auth.Register(r.Context(), req.Email, req.Password, native, req.TargetLanguage, req.DailyGoalMinutes)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusBadRequest, err)
|
||||
return
|
||||
@@ -187,16 +194,23 @@ func (s *Server) me(w http.ResponseWriter, r *http.Request) {
|
||||
|
||||
func (s *Server) updatePreferences(w http.ResponseWriter, r *http.Request) {
|
||||
var req struct {
|
||||
UILanguage string `json:"ui_language"`
|
||||
TargetLanguage string `json:"target_language"`
|
||||
CEFRLevel string `json:"cefr_level"`
|
||||
DailyGoalMinutes int `json:"daily_goal_minutes"`
|
||||
NativeLanguage string `json:"native_language"`
|
||||
InstructionLanguage string `json:"instruction_language"`
|
||||
UILanguage string `json:"ui_language"`
|
||||
TargetLanguage string `json:"target_language"`
|
||||
CEFRLevel string `json:"cefr_level"`
|
||||
DailyGoalMinutes int `json:"daily_goal_minutes"`
|
||||
}
|
||||
if err := decodeJSON(r, &req); err != nil {
|
||||
writeError(w, http.StatusBadRequest, err)
|
||||
return
|
||||
}
|
||||
profile, err := s.store.UpdatePreferences(r.Context(), currentUserID(r), req.UILanguage, req.TargetLanguage, req.CEFRLevel, req.DailyGoalMinutes)
|
||||
native, err := domain.ResolveNativeLanguage(req.NativeLanguage, req.UILanguage, req.InstructionLanguage)
|
||||
if err != nil {
|
||||
writeError(w, 400, err)
|
||||
return
|
||||
}
|
||||
profile, err := s.store.UpdatePreferences(r.Context(), currentUserID(r), native, req.TargetLanguage, req.CEFRLevel, req.DailyGoalMinutes)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusBadRequest, err)
|
||||
return
|
||||
@@ -348,6 +362,7 @@ func (s *Server) nextAgentExercise(ctx context.Context, user domain.User, profil
|
||||
AvoidReferenceTexts: avoidReferenceTexts,
|
||||
})
|
||||
if err == nil && (generated.Source == "flowise" || generated.Source == "ai") && strings.TrimSpace(generated.ReferenceText) != "" {
|
||||
generated.NativeLanguage = user.ExplanationLanguage()
|
||||
generated.TrainingPlan = plan
|
||||
if plan != nil && plan.Mode == "transfer" {
|
||||
plan.CandidateWord = generated.CandidateWord
|
||||
@@ -469,7 +484,7 @@ func (s *Server) createAttempt(w http.ResponseWriter, r *http.Request) {
|
||||
writeError(w, http.StatusBadGateway, err)
|
||||
return
|
||||
}
|
||||
teacher, err := s.teacher.FeedbackForAttempt(r.Context(), exercise.TargetText, result, weakWords(result.WordScores))
|
||||
teacher, err := s.teacher.FeedbackForAttempt(s.nativeContext(r), exercise.TargetText, result, weakWords(result.WordScores))
|
||||
if err != nil {
|
||||
writeError(w, http.StatusBadGateway, err)
|
||||
return
|
||||
@@ -511,7 +526,7 @@ func (s *Server) startConversation(w http.ResponseWriter, r *http.Request) {
|
||||
writeError(w, http.StatusInternalServerError, err)
|
||||
return
|
||||
}
|
||||
teacher, err := s.teacher.StartConversation(r.Context(), profile.TargetLanguage, profile.CEFRLevel)
|
||||
teacher, err := s.teacher.StartConversation(s.nativeContext(r), profile.TargetLanguage, profile.CEFRLevel)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusBadGateway, err)
|
||||
return
|
||||
@@ -546,7 +561,7 @@ func (s *Server) conversationTurn(w http.ResponseWriter, r *http.Request) {
|
||||
writeError(w, http.StatusInternalServerError, err)
|
||||
return
|
||||
}
|
||||
teacher, err := s.teacher.ContinueConversation(r.Context(), profile.TargetLanguage, profile.CEFRLevel, req.Text)
|
||||
teacher, err := s.teacher.ContinueConversation(s.nativeContext(r), profile.TargetLanguage, profile.CEFRLevel, req.Text)
|
||||
if err != nil {
|
||||
writeError(w, http.StatusBadGateway, err)
|
||||
return
|
||||
@@ -605,3 +620,11 @@ func valueOr(value, fallback string) string {
|
||||
}
|
||||
return value
|
||||
}
|
||||
|
||||
func (s *Server) nativeContext(r *http.Request) context.Context {
|
||||
user, err := s.store.GetUser(r.Context(), currentUserID(r))
|
||||
if err != nil {
|
||||
return r.Context()
|
||||
}
|
||||
return services.WithNativeLanguage(r.Context(), user.ExplanationLanguage())
|
||||
}
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
package pronunciation
|
||||
|
||||
import (
|
||||
"speech-learning-api/internal/domain"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestNativePlanReasonPreservesEvidence(t *testing.T) {
|
||||
for _, mode := range []string{"general", "targeted", "transfer"} {
|
||||
target := &domain.PronunciationTarget{Kind: "phoneme", Symbol: "θ", Samples: 3, Mean: 64, State: "needs_practice"}
|
||||
plan := domain.PronunciationPlan{Mode: mode, Category: "targeted", Target: target, RequiredWords: []string{"three"}, Reason: "historical German reason"}
|
||||
if mode == "general" {
|
||||
plan.Target = nil
|
||||
}
|
||||
SetNativeLanguage(&plan, "ru-RU")
|
||||
if plan.NativeLanguage != "ru-RU" || plan.Reason == "historical German reason" || plan.RequiredWords[0] != "three" || target.Samples != 3 || target.Mean != 64 {
|
||||
t.Fatal(plan)
|
||||
}
|
||||
if mode == "transfer" && !strings.Contains(plan.Reason, "ещё должно быть проверено Azure") {
|
||||
t.Fatal("transfer presented as confirmed", plan.Reason)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -408,3 +408,34 @@ func label(t domain.PronunciationTarget) string {
|
||||
}
|
||||
return "Wort „" + t.Symbol + "“"
|
||||
}
|
||||
|
||||
// SetNativeLanguage formats only the reason of a newly selected plan. Evidence,
|
||||
// priority, required words and historical plans remain unchanged.
|
||||
func SetNativeLanguage(plan *domain.PronunciationPlan, native string) {
|
||||
plan.NativeLanguage = native
|
||||
if native != "ru-RU" {
|
||||
return
|
||||
}
|
||||
if plan.Target == nil {
|
||||
plan.Reason = "Общая практика произношения: пока нет подтверждённой цели тренировки."
|
||||
return
|
||||
}
|
||||
target := plan.Target
|
||||
label := "Слово «" + target.Symbol + "»"
|
||||
if target.Kind == "phoneme" {
|
||||
label = "Звук /" + target.Symbol + "/"
|
||||
}
|
||||
if target.Kind == "omission" {
|
||||
label = "Полнота произнесения слова «" + target.Symbol + "»"
|
||||
}
|
||||
switch {
|
||||
case plan.Mode == "transfer":
|
||||
plan.Reason = fmt.Sprintf("Потренируйте измеренный звук /%s/ в новом слове; соответствие ещё должно быть проверено Azure.", target.Symbol)
|
||||
case plan.Category == "review":
|
||||
plan.Reason = fmt.Sprintf("Повторение после перерыва: %s. Ранее наблюдалось улучшение.", label)
|
||||
case target.State == "needs_practice":
|
||||
plan.Reason = fmt.Sprintf("%s: повторные затруднения в независимых наблюдениях (%d).", label, target.Samples)
|
||||
default:
|
||||
plan.Reason = fmt.Sprintf("%s: нужна дополнительная проверка, пока наблюдений мало или они неоднородны.", label)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -141,17 +141,17 @@ func (e *CourseEngine) Process(ctx context.Context, j domain.CourseJob) (*domain
|
||||
}
|
||||
return &t, err
|
||||
case "exam":
|
||||
if j.InstructionLanguage != "" && j.InstructionLanguage != "de-DE" {
|
||||
if j.InstructionLanguage != "" && !domain.SupportedNativeLanguage(j.InstructionLanguage) {
|
||||
return nil, store.ErrCourseVariantUnavailable
|
||||
}
|
||||
tasks, err := e.Repo.BankExam(ctx, j.UserID, j.Language, j.ModuleID)
|
||||
tasks, err := e.Repo.BankExam(ctx, j.UserID, j.Language, j.ModuleID, j.InstructionLanguage)
|
||||
if errors.Is(err, store.ErrNotFound) {
|
||||
tasks, err = e.Repo.ReserveExam(ctx, j.UserID, j.Language, j.ModuleID)
|
||||
}
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err = ValidateExamTasks(tasks, j.Language, j.ModuleID); err != nil {
|
||||
if err = validateReviewedExamTasks(tasks, j.Language, j.ModuleID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return nil, e.Repo.SaveExamTasks(ctx, j.UserID, j.Language, j.SubjectID, tasks)
|
||||
@@ -585,3 +585,30 @@ func (e *CourseEngine) completeBankExam(ctx context.Context, user, language, id
|
||||
}
|
||||
return e.Repo.EnsureBankExamSummary(ctx, user, id)
|
||||
}
|
||||
|
||||
// Reviewed packages carry server-owned metadata that the model contract forbids.
|
||||
// Validate their renderer/test coverage without treating trusted metadata as model output.
|
||||
func validateReviewedExamTasks(tasks []domain.AdaptiveTask, language, module string) error {
|
||||
plain := make([]domain.AdaptiveTask, len(tasks))
|
||||
for i, task := range tasks {
|
||||
task.InstructionLanguage = ""
|
||||
task.Instruction = ""
|
||||
task.Stimulus = nil
|
||||
task.VariantID = ""
|
||||
task.ContentRevision = ""
|
||||
task.CanonicalTaskID = ""
|
||||
task.EvidenceTaskID = ""
|
||||
task.Options = append([]domain.TaskOption(nil), task.Options...)
|
||||
for j := range task.Options {
|
||||
task.Options[j].Language = ""
|
||||
task.Options[j].Role = ""
|
||||
}
|
||||
if task.AnswerKey != nil {
|
||||
key := *task.AnswerKey
|
||||
key.ReferenceAnswerLanguage = ""
|
||||
task.AnswerKey = &key
|
||||
}
|
||||
plain[i] = task
|
||||
}
|
||||
return ValidateExamTasks(plain, language, module)
|
||||
}
|
||||
|
||||
@@ -631,7 +631,7 @@ func (a *AIService) NextExercise(ctx context.Context, input domain.GeneratedExer
|
||||
|
||||
// Preserve the existing non-AI feedback and demo conversation behavior.
|
||||
func (a *AIService) FeedbackForAttempt(ctx context.Context, text string, r domain.PronunciationResult, weak []domain.WordScore) (domain.TeacherResponse, error) {
|
||||
return mockFeedback(text, r), nil
|
||||
return localizedFeedback(ctx, text, r), nil
|
||||
}
|
||||
func (a *AIService) StartConversation(ctx context.Context, lang, level string) (domain.TeacherResponse, error) {
|
||||
return (&FlowiseTeacher{}).StartConversation(ctx, lang, level)
|
||||
|
||||
@@ -54,7 +54,7 @@ func (s *AuthService) Register(ctx context.Context, email, password, uiLanguage,
|
||||
uiLanguage = "de-DE"
|
||||
}
|
||||
if !domain.SupportedUILanguage(uiLanguage) {
|
||||
return AuthResult{}, errors.New("unsupported UI language")
|
||||
return AuthResult{}, domain.ErrNativeLanguageUnsupported
|
||||
}
|
||||
if targetLanguage == "" {
|
||||
targetLanguage = "en-US"
|
||||
|
||||
@@ -11,6 +11,7 @@ import (
|
||||
"speech-learning-api/internal/config"
|
||||
"speech-learning-api/internal/domain"
|
||||
"speech-learning-api/internal/store"
|
||||
"strings"
|
||||
"sync"
|
||||
"testing"
|
||||
)
|
||||
@@ -163,9 +164,14 @@ func TestBankPostgresSelectionAndOptionalEvaluation(t *testing.T) {
|
||||
}
|
||||
|
||||
func TestBankPostgresExamSubmissionAndLaterGrades(t *testing.T) {
|
||||
for _, native := range []string{"de-DE", "ru-RU"} {
|
||||
t.Run(native, func(t *testing.T) { testBankExamNative(t, native) })
|
||||
}
|
||||
}
|
||||
func testBankExamNative(t *testing.T, native string) {
|
||||
db, profiles := adaptiveTestDB(t)
|
||||
ctx := context.Background()
|
||||
user, err := profiles.CreateUser(ctx, store.NewID("exam-bank")+"@example.test", "hash", "de-DE")
|
||||
user, err := profiles.CreateUser(ctx, store.NewID("exam-bank")+"@example.test", "hash", native)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -195,8 +201,15 @@ func TestBankPostgresExamSubmissionAndLaterGrades(t *testing.T) {
|
||||
if err != nil || len(exam.Tasks) != 12 {
|
||||
t.Fatal(err, exam)
|
||||
}
|
||||
if err = engine.Repo.SetInstructionLanguage(ctx, user.ID, "en-US", "de-DE"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// Task presentations and the final static summary retain the exam language.
|
||||
ungraded := []domain.AdaptiveAttempt{}
|
||||
for n, pub := range exam.Tasks {
|
||||
if pub.InstructionLanguage != native {
|
||||
t.Fatal("exam language not frozen", pub.InstructionLanguage, native)
|
||||
}
|
||||
if pub.AnswerKey != nil || pub.AudioText != "" {
|
||||
t.Fatal("exam key leaked")
|
||||
}
|
||||
@@ -277,7 +290,7 @@ func TestBankPostgresExamSubmissionAndLaterGrades(t *testing.T) {
|
||||
if message.Task != "evaluate_course_attempt" {
|
||||
t.Error("unexpected model action", message.Task)
|
||||
}
|
||||
json.NewEncoder(w).Encode(aiCompletion(domain.CourseEvaluation{Score: 100, Verdict: "correct", Feedback: "Richtig.", Issues: []string{}}, true))
|
||||
json.NewEncoder(w).Encode(aiCompletion(domain.CourseEvaluation{Score: 100, Verdict: "correct", Feedback: map[string]string{"de-DE": "Richtig.", "ru-RU": "Верно."}[native], Issues: []string{}}, true))
|
||||
}))
|
||||
defer server.Close()
|
||||
agent.Keys["mistral"] = "fixture-secret"
|
||||
@@ -311,6 +324,9 @@ func TestBankPostgresExamSubmissionAndLaterGrades(t *testing.T) {
|
||||
if err != nil || exam.Status != "completed" || exam.Score == nil || *exam.Score != 100 || exam.SummaryStatus != "ready" {
|
||||
t.Fatal("later grading failed", err, exam)
|
||||
}
|
||||
if native == "ru-RU" && !strings.HasPrefix(exam.Summary, "Внутренняя") {
|
||||
t.Fatal("wrong summary language", exam.Summary)
|
||||
}
|
||||
// Repair a crash after score completion without invoking a summarizing model.
|
||||
if _, err = db.Exec(`UPDATE course_v2_exams SET result=jsonb_set(result,'{summary_status}','"pending"') WHERE id=$1`, exam.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"testing"
|
||||
@@ -60,7 +61,7 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
|
||||
if _, _, err = engine.Submit(ctx, user.ID, "en-US", old.ID, "old-answer", old.AnswerKey.CorrectOptionID, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "en-US"); err != nil {
|
||||
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "ru-RU"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
run := func(skill, request string, changeAfterEnqueue bool) domain.AdaptiveTask {
|
||||
@@ -69,7 +70,7 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if j.InstructionLanguage != "en-US" {
|
||||
if j.InstructionLanguage != "ru-RU" {
|
||||
t.Fatal("job did not freeze explanation language", j)
|
||||
}
|
||||
if changeAfterEnqueue {
|
||||
@@ -88,24 +89,32 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
|
||||
if err = repo.Finish(ctx, j, task, ""); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if task.InstructionLanguage != "en-US" || task.VariantID == "" || task.ContentRevision == "" || task.Instruction == "" {
|
||||
if task.InstructionLanguage != "ru-RU" || task.VariantID == "" || task.ContentRevision == "" || task.Instruction == "" {
|
||||
t.Fatal("incomplete frozen variant", task)
|
||||
}
|
||||
return *task
|
||||
}
|
||||
first := run("grammar", "english-grammar-first", false)
|
||||
if _, _, err = engine.Submit(ctx, user.ID, "en-US", first.ID, "english-first-answer", first.AnswerKey.CorrectOptionID, nil); err != nil {
|
||||
|
||||
// Limit this fixture to the historical grammar goal so evidence reuse is deterministic.
|
||||
if _, err = db.ExecContext(ctx, `UPDATE course_v2_bank_variants v SET active=false FROM course_v2_bank b WHERE v.base_entry_id=b.id AND b.module_id='a1_introductions_v1' AND b.skill='grammar' AND b.id<>(SELECT bank_entry_id FROM course_v2_tasks WHERE id=$1)`, old.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
translated := run("grammar", "english-grammar-second", true)
|
||||
if !translated.Review || translated.EvidenceTaskID != old.ID {
|
||||
t.Fatal("translation did not reuse existing evidence", translated, old)
|
||||
var translated domain.AdaptiveTask
|
||||
distinct := map[string]bool{old.ID: true}
|
||||
for n := 0; n < 2; n++ {
|
||||
translated = run("grammar", fmt.Sprintf("russian-grammar-%d", n), n == 1)
|
||||
distinct[translated.EvidenceTaskID] = true
|
||||
if _, _, err = engine.Submit(ctx, user.ID, "en-US", translated.ID, fmt.Sprintf("russian-answer-%d", n), translated.AnswerKey.CorrectOptionID, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
if _, _, err = engine.Submit(ctx, user.ID, "en-US", translated.ID, "english-second-answer", translated.AnswerKey.CorrectOptionID, nil); err != nil {
|
||||
t.Fatal(err)
|
||||
// The translated historical task retains its canonical evidence identity.
|
||||
var shared int
|
||||
if err = db.QueryRowContext(ctx, `SELECT count(*) FROM course_v2_tasks WHERE owner_id=$1 AND data->>'evidence_task_id'=$2 AND variant_id IS NOT NULL`, user.ID, old.ID).Scan(&shared); err != nil || shared != 1 {
|
||||
t.Fatal("translation did not share historical evidence", shared, err)
|
||||
}
|
||||
replay, err := repo.Enqueue(ctx, user.ID, "en-US", "next", "a1_introductions_v1", "grammar", "", "english-grammar-second")
|
||||
if err != nil || replay.TaskID != translated.ID || replay.InstructionLanguage != "en-US" {
|
||||
replay, err := repo.Enqueue(ctx, user.ID, "en-US", "next", "a1_introductions_v1", "grammar", "", "russian-grammar-1")
|
||||
if err != nil || replay.TaskID != translated.ID || replay.InstructionLanguage != "ru-RU" {
|
||||
t.Fatal("locale change altered idempotent replay", replay, err)
|
||||
}
|
||||
snapshot, err := repo.Snapshot(ctx, user.ID, "en-US", "de-DE")
|
||||
@@ -116,7 +125,7 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
|
||||
for _, p := range snapshot.Progress {
|
||||
if p.Skill == "grammar" && p.ModuleID == old.ModuleID {
|
||||
found = true
|
||||
if p.Attempts != 3 || p.DistinctTasks != 2 {
|
||||
if p.Attempts != 3 || p.DistinctTasks != len(distinct) {
|
||||
t.Fatalf("translation inflated task evidence: %+v", p)
|
||||
}
|
||||
}
|
||||
@@ -124,7 +133,10 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
|
||||
if !found {
|
||||
t.Fatal("missing graded evidence")
|
||||
}
|
||||
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "en-US"); err != nil {
|
||||
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "ru-RU"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = db.ExecContext(ctx, `UPDATE course_v2_bank_variants SET active=true WHERE instruction_language='ru-RU'`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
inventory, err := repo.BankInventory(ctx, user.ID, "en-US")
|
||||
@@ -134,11 +146,9 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
|
||||
total := 0
|
||||
for _, item := range inventory {
|
||||
total += item.Total
|
||||
if item.ModuleID != "a1_introductions_v1" {
|
||||
t.Fatal("German fallback advertised as English", item)
|
||||
}
|
||||
|
||||
}
|
||||
if total != 12 {
|
||||
if total != 840 {
|
||||
t.Fatal("incorrect locale inventory", inventory)
|
||||
}
|
||||
// Local speech fixtures exercise the real observation path; no Azure is called.
|
||||
@@ -146,13 +156,16 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
|
||||
if _, _, err = engine.Submit(ctx, user.ID, "en-US", oldSpeech.ID, "old-speech", oldSpeech.ReferenceText, &speech); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
localizedSpeech := run("speaking", "localized-speech", false)
|
||||
if localizedSpeech.Kind != "free_speech" { // The existing repeat may be scheduled after the unseen free task.
|
||||
if localizedSpeech.Kind != "repeat_sentence" {
|
||||
t.Fatal(localizedSpeech.Kind)
|
||||
|
||||
if _, err = db.ExecContext(ctx, `UPDATE course_v2_bank_variants v SET active=false FROM course_v2_bank b WHERE v.base_entry_id=b.id AND b.module_id='a1_introductions_v1' AND b.skill='speaking' AND b.id<>(SELECT bank_entry_id FROM course_v2_tasks WHERE id=$1)`, oldSpeech.ID); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
var localizedSpeech domain.AdaptiveTask
|
||||
for n := 0; n < 20; n++ {
|
||||
localizedSpeech = run("speaking", fmt.Sprintf("localized-speech-%d", n), false)
|
||||
if localizedSpeech.EvidenceTaskID == oldSpeech.ID {
|
||||
break
|
||||
}
|
||||
} else {
|
||||
localizedSpeech = run("speaking", "localized-repeat", false)
|
||||
}
|
||||
if localizedSpeech.EvidenceTaskID != oldSpeech.ID {
|
||||
t.Fatal("translated repeat changed evidence identity", localizedSpeech)
|
||||
@@ -182,10 +195,13 @@ func TestCourseVariantSnapshotsAndEvidence(t *testing.T) {
|
||||
if !bytes.Equal(before, after) {
|
||||
t.Fatal("historical snapshot was rewritten")
|
||||
}
|
||||
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "fr-FR"); !errors.Is(err, store.ErrCourseVariantUnavailable) {
|
||||
if err = repo.SetInstructionLanguage(ctx, user.ID, "en-US", "fr-FR"); !errors.Is(err, domain.ErrNativeLanguageUnsupported) {
|
||||
t.Fatal("unsupported locale accepted", err)
|
||||
}
|
||||
// Missing reviewed variants must not silently select a German reserve.
|
||||
if _, err = db.ExecContext(ctx, `UPDATE course_v2_bank_variants v SET active=false FROM course_v2_bank b WHERE v.base_entry_id=b.id AND b.module_id='a1_family_v1'`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if _, err = repo.Enqueue(ctx, user.ID, "en-US", "next", "a1_family_v1", "grammar", "", "missing-variants"); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
@@ -54,6 +54,12 @@ func (f *FlowiseTeacher) NextExercise(ctx context.Context, input domain.Generate
|
||||
ReasonForChoice: "Fallback exercise because Flowise did not return a valid exercise.",
|
||||
Source: "fallback",
|
||||
}
|
||||
if input.UILanguage == "ru-RU" {
|
||||
fallback.DisplayPrompt = "Чётко повторите предложение вслух."
|
||||
fallback.FocusPoints = []string{"ритм", "конечные звуки"}
|
||||
fallback.SuccessCriteria = []string{"точность выше 80"}
|
||||
fallback.ReasonForChoice = "Резервное упражнение: новое упражнение сейчас недоступно."
|
||||
}
|
||||
progress := compactProgressForFlowise(input.Progress)
|
||||
payload := map[string]any{
|
||||
"task": "next_exercise",
|
||||
@@ -96,20 +102,25 @@ func withoutPhonemeScores(words []domain.WordScore) []domain.WordScore {
|
||||
func (f *FlowiseTeacher) FeedbackForAttempt(ctx context.Context, targetText string, result domain.PronunciationResult, weakWords []domain.WordScore) (domain.TeacherResponse, error) {
|
||||
_ = ctx
|
||||
_ = weakWords
|
||||
return mockFeedback(targetText, result), nil
|
||||
return localizedFeedback(ctx, targetText, result), nil
|
||||
}
|
||||
|
||||
func (f *FlowiseTeacher) StartConversation(ctx context.Context, targetLanguage, cefrLevel string) (domain.TeacherResponse, error) {
|
||||
_ = ctx
|
||||
_ = targetLanguage
|
||||
_ = cefrLevel
|
||||
return domain.TeacherResponse{
|
||||
response := domain.TeacherResponse{
|
||||
ExerciseType: "conversation",
|
||||
TargetText: "Hello. What is your name?",
|
||||
TeacherFeedback: "Wir starten sehr einfach. Antworte mit: My name is ...",
|
||||
TTSText: "Hello. What is your name?",
|
||||
NextRecommendation: "Antworten: My name is ...",
|
||||
}, nil
|
||||
}
|
||||
if nativeLanguage(ctx) == "ru-RU" {
|
||||
response.TeacherFeedback = "Начнём с простого. Ответьте: My name is ..."
|
||||
response.NextRecommendation = "Ответьте: My name is ..."
|
||||
}
|
||||
return response, nil
|
||||
}
|
||||
|
||||
func (f *FlowiseTeacher) ContinueConversation(ctx context.Context, targetLanguage, cefrLevel, userText string) (domain.TeacherResponse, error) {
|
||||
@@ -117,13 +128,18 @@ func (f *FlowiseTeacher) ContinueConversation(ctx context.Context, targetLanguag
|
||||
_ = targetLanguage
|
||||
_ = cefrLevel
|
||||
_ = userText
|
||||
return domain.TeacherResponse{
|
||||
response := domain.TeacherResponse{
|
||||
ExerciseType: "conversation",
|
||||
TargetText: "Nice to meet you. Where are you from?",
|
||||
TeacherFeedback: "Gut. Jetzt uebe einen kurzen Satz mit Herkunft.",
|
||||
TTSText: "Nice to meet you. Where are you from?",
|
||||
NextRecommendation: "Antworten: I am from ...",
|
||||
}, nil
|
||||
}
|
||||
if nativeLanguage(ctx) == "ru-RU" {
|
||||
response.TeacherFeedback = "Теперь потренируйте короткое предложение о том, откуда вы."
|
||||
response.NextRecommendation = "Ответьте: I am from ..."
|
||||
}
|
||||
return response, nil
|
||||
}
|
||||
|
||||
func (f *FlowiseTeacher) askExercise(ctx context.Context, payload map[string]any, input domain.GeneratedExerciseRequest, fallback domain.GeneratedExercise) (domain.GeneratedExercise, error) {
|
||||
|
||||
@@ -19,7 +19,7 @@ func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
updated, err := profiles.UpdatePreferences(ctx, user.ID, "en-US", "", "", 0)
|
||||
updated, err := profiles.UpdatePreferences(ctx, user.ID, "ru-RU", "", "", 0)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
@@ -30,7 +30,7 @@ func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if loaded.UILanguage != "en-US" || loaded.InstructionLanguage != "de-DE" {
|
||||
if loaded.NativeLanguage != "ru-RU" || loaded.UILanguage != "ru-RU" || loaded.InstructionLanguage != "ru-RU" {
|
||||
t.Fatalf("language roles conflated: %+v", loaded)
|
||||
}
|
||||
_, _, err = profiles.GetPasswordHashByEmail(ctx, user.Email)
|
||||
@@ -42,7 +42,7 @@ func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if snapshot.UILanguage != "de-DE" {
|
||||
if snapshot.UILanguage != "ru-RU" {
|
||||
t.Fatalf("model instructions follow interface language: %q", snapshot.UILanguage)
|
||||
}
|
||||
if _, err = profiles.UpdatePreferences(ctx, user.ID, "unsupported", "en-US", "A1", 10); err == nil {
|
||||
@@ -60,7 +60,7 @@ func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
|
||||
t.Fatal("expected profile constraint failure")
|
||||
}
|
||||
loaded, err = profiles.GetUser(ctx, user.ID)
|
||||
if err != nil || loaded.UILanguage != "en-US" {
|
||||
if err != nil || loaded.UILanguage != "ru-RU" {
|
||||
t.Fatalf("failed update changed interface: %+v %v", loaded, err)
|
||||
}
|
||||
active, err = profiles.GetPrimaryProfile(ctx, user.ID)
|
||||
@@ -69,39 +69,48 @@ func TestLanguagePreferencesPreserveCourseAndExplanations(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestInstructionLanguageMigrationPreservesLegacyPreference(t *testing.T) {
|
||||
func TestNativeLanguageMigrationAndCompatibility(t *testing.T) {
|
||||
db, profiles := adaptiveTestDB(t)
|
||||
ctx := context.Background()
|
||||
user, err := profiles.CreateUser(ctx, "legacy-language@example.test", "hash", "fr-FR")
|
||||
user, err := profiles.CreateUser(ctx, "legacy-language@example.test", "hash", "de-DE")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
// Simulate the previous schema in this disposable test schema only.
|
||||
if _, err = db.ExecContext(ctx, `ALTER TABLE users DROP COLUMN instruction_language`); err != nil {
|
||||
// Simulate the old independent settings in this disposable schema only.
|
||||
if _, err = db.ExecContext(ctx, `ALTER TABLE users DROP CONSTRAINT users_native_language_coupled; ALTER TABLE users DROP COLUMN native_language; UPDATE users SET ui_language='ru-RU',instruction_language='de-DE'`); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = profiles.Init(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
loaded, err := profiles.GetUser(ctx, user.ID)
|
||||
if err != nil || loaded.InstructionLanguage != "fr-FR" {
|
||||
t.Fatalf("legacy instruction preference lost: %+v %v", loaded, err)
|
||||
if err != nil || loaded.NativeLanguage != "ru-RU" || loaded.UILanguage != "ru-RU" || loaded.InstructionLanguage != "ru-RU" {
|
||||
t.Fatalf("migration did not couple native language: %+v %v", loaded, err)
|
||||
}
|
||||
if _, err = profiles.UpdatePreferences(ctx, user.ID, "en-US", "", "", 0); err != nil {
|
||||
if _, err = profiles.UpdatePreferences(ctx, user.ID, "de-DE", "", "", 0); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = profiles.Init(ctx); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
loaded, err = profiles.GetUser(ctx, user.ID)
|
||||
if err != nil || loaded.UILanguage != "en-US" || loaded.InstructionLanguage != "fr-FR" {
|
||||
t.Fatalf("repeated migration changed instruction preference: %+v %v", loaded, err)
|
||||
if err != nil || loaded.NativeLanguage != "de-DE" || loaded.UILanguage != "de-DE" || loaded.InstructionLanguage != "de-DE" {
|
||||
t.Fatalf("restart changed preference: %+v %v", loaded, err)
|
||||
}
|
||||
result, err := NewAuthService(profiles, "language-test-only").Register(ctx, "new-language@example.test", "test-password", "en-US", "en-US", 15)
|
||||
if _, err = db.ExecContext(ctx, `UPDATE users SET instruction_language='ru-RU' WHERE id=$1`, user.ID); err == nil {
|
||||
t.Fatal("database allowed divergent language roles")
|
||||
}
|
||||
result, err := NewAuthService(profiles, "language-test-only").Register(ctx, "new-language@example.test", "test-password", "ru-RU", "en-US", 15)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if result.User.UILanguage != "en-US" || result.User.InstructionLanguage != "de-DE" {
|
||||
t.Fatalf("new account did not keep German course explanations: %+v", result.User)
|
||||
if result.User.NativeLanguage != "ru-RU" || result.User.UILanguage != "ru-RU" || result.User.InstructionLanguage != "ru-RU" {
|
||||
t.Fatal(result.User)
|
||||
}
|
||||
if _, err = profiles.CreateUser(ctx, "unsupported@example.test", "hash", "en-US"); err == nil {
|
||||
t.Fatal("English native language accepted")
|
||||
}
|
||||
if _, err = domain.ResolveNativeLanguage("de-DE", "ru-RU"); err != domain.ErrNativeLanguageConflict {
|
||||
t.Fatal("conflicting aliases accepted", err)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,59 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"context"
|
||||
"fmt"
|
||||
"speech-learning-api/internal/domain"
|
||||
"strings"
|
||||
)
|
||||
|
||||
type nativeLanguageKey struct{}
|
||||
|
||||
// Request-scoped native language also applies to deterministic feedback; target
|
||||
// texts and Azure measurements are never translated by this presentation step.
|
||||
func WithNativeLanguage(ctx context.Context, language string) context.Context {
|
||||
return context.WithValue(ctx, nativeLanguageKey{}, language)
|
||||
}
|
||||
func nativeLanguage(ctx context.Context) string {
|
||||
language, _ := ctx.Value(nativeLanguageKey{}).(string)
|
||||
return language
|
||||
}
|
||||
|
||||
func localizedFeedback(ctx context.Context, text string, result domain.PronunciationResult) domain.TeacherResponse {
|
||||
if nativeLanguage(ctx) != "ru-RU" {
|
||||
return mockFeedback(text, result)
|
||||
}
|
||||
response := domain.TeacherResponse{ExerciseType: "repeat_sentence", TargetText: text, TTSText: text,
|
||||
TeacherFeedback: "Предложение стоит ещё потренировать. Повторите его вслух.", NextRecommendation: "Повторите это упражнение."}
|
||||
weakWord, phonemeWord := "", ""
|
||||
var weak domain.PhonemeScore
|
||||
for _, word := range result.WordScores {
|
||||
if word.Highlight == "weak" && weakWord == "" {
|
||||
weakWord = word.Word
|
||||
}
|
||||
if strings.EqualFold(word.ErrorType, "Omission") {
|
||||
continue
|
||||
}
|
||||
for _, phoneme := range word.PhonemeScores {
|
||||
if phoneme.Accuracy < 75 && (phonemeWord == "" || phoneme.Accuracy < weak.Accuracy) {
|
||||
weak = phoneme
|
||||
phonemeWord = word.Word
|
||||
}
|
||||
}
|
||||
}
|
||||
switch {
|
||||
case result.OverallScore >= 95 && result.AccuracyScore >= 95 && result.FluencyScore >= 95 && result.CompletenessScore >= 95:
|
||||
response.TeacherFeedback = "Отлично! Произношение этого предложения получило очень высокую оценку."
|
||||
response.NextRecommendation = "Можно перейти к новому упражнению."
|
||||
case phonemeWord != "":
|
||||
response.TeacherFeedback = fmt.Sprintf("В слове %q звук /%s/ получил %.0f из 100 баллов.", phonemeWord, weak.Phoneme, weak.Accuracy)
|
||||
response.NextRecommendation = fmt.Sprintf("Повторите предложение, уделяя внимание слову %q.", phonemeWord)
|
||||
case weakWord != "":
|
||||
response.TeacherFeedback = fmt.Sprintf("Слово %q получило невысокую оценку. Потренируйте его ещё раз в предложении.", weakWord)
|
||||
response.NextRecommendation = fmt.Sprintf("Повторите предложение, уделяя внимание слову %q.", weakWord)
|
||||
case result.OverallScore >= 85:
|
||||
response.TeacherFeedback = "Хорошо! Произношение этого предложения получило высокую оценку."
|
||||
response.NextRecommendation = "Можно перейти к новому упражнению."
|
||||
}
|
||||
return response
|
||||
}
|
||||
@@ -0,0 +1,30 @@
|
||||
package services
|
||||
|
||||
import (
|
||||
"context"
|
||||
"speech-learning-api/internal/domain"
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestRussianDeterministicFeedbackKeepsMeasurementsAndTarget(t *testing.T) {
|
||||
ctx := WithNativeLanguage(context.Background(), "ru-RU")
|
||||
result := domain.PronunciationResult{OverallScore: 86, WordScores: []domain.WordScore{{Word: "name", PhonemeScores: []domain.PhonemeScore{{Phoneme: "n", Accuracy: 62}}}}}
|
||||
response := localizedFeedback(ctx, "My name is Anna.", result)
|
||||
if response.TargetText != "My name is Anna." || response.TTSText != response.TargetText || !strings.Contains(response.TeacherFeedback, "/n/") || !strings.Contains(response.TeacherFeedback, "62 из 100") {
|
||||
t.Fatal(response)
|
||||
}
|
||||
if result.WordScores[0].PhonemeScores[0].Accuracy != 62 {
|
||||
t.Fatal("measurement changed")
|
||||
}
|
||||
result.WordScores[0].ErrorType = "Omission"
|
||||
response = localizedFeedback(ctx, "My name is Anna.", result)
|
||||
if strings.Contains(response.TeacherFeedback, "/n/") {
|
||||
t.Fatal("omission treated as phoneme error")
|
||||
}
|
||||
teacher := &FlowiseTeacher{}
|
||||
start, err := teacher.StartConversation(ctx, "en-US", "A1")
|
||||
if err != nil || start.TargetText != "Hello. What is your name?" || !strings.Contains(start.TeacherFeedback, "Ответьте") {
|
||||
t.Fatal(start, err)
|
||||
}
|
||||
}
|
||||
@@ -241,6 +241,11 @@ func (s *AdaptiveStore) SaveExamTasks(ctx context.Context, user, language, exam
|
||||
return err
|
||||
}
|
||||
defer tx.Rollback()
|
||||
// Serialize equivalent assignments with ordinary bank selection, so a
|
||||
// concurrent exam and exercise share the same first evidence identity.
|
||||
if _, err = tx.ExecContext(ctx, `SELECT pg_advisory_xact_lock(hashtextextended($1,0))`, user+":"+language+":"+domain.CourseVersion); err != nil {
|
||||
return err
|
||||
}
|
||||
var status string
|
||||
err = tx.QueryRowContext(ctx, `SELECT status FROM course_v2_exams WHERE id=$1 AND user_id=$2 AND language=$3 FOR UPDATE`, exam, user, language).Scan(&status)
|
||||
if err != nil {
|
||||
@@ -259,11 +264,26 @@ func (s *AdaptiveStore) SaveExamTasks(ctx context.Context, user, language, exam
|
||||
fp = "bank-exam:" + t.BriefID
|
||||
t.BriefID = ""
|
||||
}
|
||||
bankID := ""
|
||||
if t.Source == "curated" {
|
||||
bankID = t.CanonicalTaskID
|
||||
if t.VariantID != "" {
|
||||
if err = tx.QueryRowContext(ctx, `SELECT base_entry_id FROM course_v2_bank_variants WHERE id=$1`, t.VariantID).Scan(&bankID); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
err = tx.QueryRowContext(ctx, `SELECT COALESCE(NULLIF(data->>'evidence_task_id',''),id) FROM course_v2_tasks WHERE owner_id=$1 AND language=$2 AND version=$3 AND COALESCE(NULLIF(data->>'canonical_task_id',''),bank_entry_id)=$4 ORDER BY created_at,id LIMIT 1`, user, language, domain.CourseVersion, t.CanonicalTaskID).Scan(&t.EvidenceTaskID)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
t.EvidenceTaskID = t.ID
|
||||
} else if err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
data, err := json.Marshal(t)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
_, err = tx.ExecContext(ctx, `INSERT INTO course_v2_tasks(id,module_id,language,version,owner_id,source,skill,kind,data,fingerprint,exam_id) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11)`, t.ID, t.ModuleID, language, domain.CourseVersion, user, t.Source, t.Skill, t.Kind, data, fp, exam)
|
||||
_, err = tx.ExecContext(ctx, `INSERT INTO course_v2_tasks(id,module_id,language,version,owner_id,source,skill,kind,data,fingerprint,exam_id,bank_entry_id,variant_id) VALUES($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11,NULLIF($12,''),NULLIF($13,''))`, t.ID, t.ModuleID, language, domain.CourseVersion, user, t.Source, t.Skill, t.Kind, data, fp, exam, bankID, t.VariantID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -389,7 +389,7 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
|
||||
t.CanonicalTaskID = chosen.bankEntryID
|
||||
}
|
||||
// Reuse the earliest evidence identity without editing any historic snapshot.
|
||||
err = tx.QueryRowContext(ctx, `SELECT COALESCE(NULLIF(data->>'evidence_task_id',''),id) FROM course_v2_tasks WHERE owner_id=$1 AND language=$2 AND version=$3 AND exam_id IS NULL AND COALESCE(NULLIF(data->>'canonical_task_id',''),bank_entry_id)=$4 ORDER BY created_at,id LIMIT 1`, j.UserID, j.Language, domain.CourseVersion, t.CanonicalTaskID).Scan(&t.EvidenceTaskID)
|
||||
err = tx.QueryRowContext(ctx, `SELECT COALESCE(NULLIF(data->>'evidence_task_id',''),id) FROM course_v2_tasks WHERE owner_id=$1 AND language=$2 AND version=$3 AND COALESCE(NULLIF(data->>'canonical_task_id',''),bank_entry_id)=$4 ORDER BY created_at,id LIMIT 1`, j.UserID, j.Language, domain.CourseVersion, t.CanonicalTaskID).Scan(&t.EvidenceTaskID)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
t.EvidenceTaskID = t.ID
|
||||
} else if err != nil {
|
||||
@@ -415,8 +415,12 @@ func (s *AdaptiveStore) AssignBankTask(ctx context.Context, j domain.CourseJob)
|
||||
return out, err
|
||||
}
|
||||
|
||||
func (s *AdaptiveStore) BankExam(ctx context.Context, user, language, module string) ([]domain.AdaptiveTask, error) {
|
||||
func (s *AdaptiveStore) BankExam(ctx context.Context, user, language, module string, native ...string) ([]domain.AdaptiveTask, error) {
|
||||
out := []domain.AdaptiveTask{}
|
||||
mother := "de-DE"
|
||||
if len(native) > 0 && native[0] != "" {
|
||||
mother = native[0]
|
||||
}
|
||||
mods, err := s.Modules(ctx, language)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -428,7 +432,7 @@ func (s *AdaptiveStore) BankExam(ctx context.Context, user, language, module str
|
||||
for n := 0; n < 2; n++ {
|
||||
origin := mods[(i+n+1)%6].Key
|
||||
var data []byte
|
||||
err = s.db.QueryRowContext(ctx, `SELECT b.data FROM course_v2_bank b WHERE b.active AND b.language=$1 AND b.version=$2 AND b.module_id=$3 AND b.skill=$4 AND b.data->'task'->>'origin_module_key'=$5 ORDER BY (SELECT count(*) FROM course_v2_tasks t WHERE t.owner_id=$6 AND (t.bank_entry_id=b.id OR t.fingerprint='bank-exam:'||b.id)),md5(b.id||$6) LIMIT 1`, language, domain.CourseVersion, module, skill, origin, user).Scan(&data)
|
||||
err = s.db.QueryRowContext(ctx, availableBank+` SELECT av.entry FROM available av WHERE av.module_id=$5 AND av.skill=$6 AND av.entry->'task'->>'origin_module_key'=$7 ORDER BY (SELECT count(*) FROM course_v2_tasks t WHERE t.owner_id=$1 AND (t.bank_entry_id=av.base_id OR t.fingerprint='bank-exam:'||(CASE WHEN av.variant_id='' THEN av.base_id ELSE av.variant_id END))),md5((av.entry->>'id')||$1) LIMIT 1`, user, language, domain.CourseVersion, mother, module, skill, origin).Scan(&data)
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
@@ -442,6 +446,12 @@ func (s *AdaptiveStore) BankExam(ctx context.Context, user, language, module str
|
||||
t := entry.Task
|
||||
t.Source = "curated"
|
||||
t.BriefID = entry.ID
|
||||
if t.CanonicalTaskID == "" {
|
||||
t.CanonicalTaskID = entry.ID
|
||||
}
|
||||
if t.InstructionLanguage == "" {
|
||||
t.InstructionLanguage = "de-DE"
|
||||
}
|
||||
out = append(out, t)
|
||||
}
|
||||
}
|
||||
@@ -483,6 +493,8 @@ func (s *AdaptiveStore) BankInventory(ctx context.Context, user, language string
|
||||
// Also repairs a crash between completing scores and storing the static summary.
|
||||
// Existing ready/historical summaries are not overwritten.
|
||||
func (s *AdaptiveStore) EnsureBankExamSummary(ctx context.Context, user, id string) error {
|
||||
_, err := s.db.ExecContext(ctx, `UPDATE course_v2_exams SET result=result||jsonb_build_object('summary',$3::text,'summary_status','ready') WHERE id=$1 AND user_id=$2 AND status='completed' AND result->>'summary_status'='pending'`, id, user, "Interne A1-Lerneinschätzung aus den gespeicherten Bewertungen. Kein Zertifikat.")
|
||||
_, err := s.db.ExecContext(ctx, `UPDATE course_v2_exams e SET result=result||jsonb_build_object('summary',CASE WHEN (SELECT t.data->>'instruction_language' FROM course_v2_tasks t WHERE t.owner_id=$2 AND t.exam_id=e.id ORDER BY t.id LIMIT 1)='ru-RU' THEN $3::text ELSE $4::text END,'summary_status','ready') WHERE e.id=$1 AND e.user_id=$2 AND e.status='completed' AND e.result->>'summary_status'='pending'`, id, user,
|
||||
"Внутренняя оценка уровня A1 на основе сохранённых результатов. Это не сертификат.",
|
||||
"Interne A1-Lerneinschätzung aus den gespeicherten Bewertungen. Kein Zertifikat.")
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -223,15 +223,20 @@ func (s *AdaptiveStore) InstructionLanguages(ctx context.Context, language strin
|
||||
return out, rows.Err()
|
||||
}
|
||||
|
||||
// Deprecated endpoint compatibility: changing explanations changes the entire
|
||||
// native language, even for a target language without installed course content.
|
||||
func (s *AdaptiveStore) SetInstructionLanguage(ctx context.Context, user, language, instruction string) error {
|
||||
options, err := s.InstructionLanguages(ctx, language)
|
||||
if !domain.SupportedNativeLanguage(instruction) {
|
||||
return domain.ErrNativeLanguageUnsupported
|
||||
}
|
||||
result, err := s.db.ExecContext(ctx, `UPDATE users SET native_language=$2,ui_language=$2,instruction_language=$2 WHERE id=$1`, user, instruction)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
if !bankMember(instruction, options) {
|
||||
return ErrCourseVariantUnavailable
|
||||
n, err := result.RowsAffected()
|
||||
if err == nil && n == 0 {
|
||||
return ErrNotFound
|
||||
}
|
||||
_, err = s.db.ExecContext(ctx, `UPDATE users SET instruction_language=$2 WHERE id=$1`, user, instruction)
|
||||
return err
|
||||
}
|
||||
|
||||
|
||||
@@ -16,8 +16,8 @@ func TestReviewedVariantsRejectChangedIdentityAndLeakedMedia(t *testing.T) {
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if len(variants) != 12 {
|
||||
t.Fatal("unexpected pilot count", len(variants))
|
||||
if len(variants) != 840 {
|
||||
t.Fatal("unexpected Russian count", len(variants))
|
||||
}
|
||||
copyVariants := func() []domain.BankVariant {
|
||||
raw, _ := json.Marshal(variants)
|
||||
@@ -29,12 +29,8 @@ func TestReviewedVariantsRejectChangedIdentityAndLeakedMedia(t *testing.T) {
|
||||
}
|
||||
t.Run("changed requirement is not a translation", func(t *testing.T) {
|
||||
v := copyVariants()
|
||||
for i := range v {
|
||||
if v[i].Equivalence == "adaptation" {
|
||||
v[i].Equivalence = "translation"
|
||||
break
|
||||
}
|
||||
}
|
||||
v[0].CanonicalTaskID = v[0].ID
|
||||
v[0].Task.CanonicalTaskID = v[0].ID
|
||||
if ValidateVariants(base, v) == nil {
|
||||
t.Fatal("adaptation with shared identity accepted")
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -1,630 +0,0 @@
|
||||
[
|
||||
{
|
||||
"id": "intro_en_explanations_v1_grammar_01",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v1_introductions_grammar_01",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_grammar_01",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "translation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "grammar",
|
||||
"kind": "choice",
|
||||
"prompt": "Complete the sentence. I ___ Anna.",
|
||||
"options": [
|
||||
{
|
||||
"id": "o1",
|
||||
"label": "am",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o2",
|
||||
"label": "is",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o3",
|
||||
"label": "are",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
}
|
||||
],
|
||||
"answer_key": {
|
||||
"correct_option_id": "o1",
|
||||
"reference_answer": "am",
|
||||
"rubric": [
|
||||
"Choose the one answer supported by the sentence, word meaning or supplied text."
|
||||
],
|
||||
"explanation": "Use am after I.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_grammar_01",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_grammar_01",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "Complete the sentence.",
|
||||
"stimulus": {
|
||||
"role": "target",
|
||||
"language": "en-US",
|
||||
"text": "I ___ Anna."
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_grammar_02",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v1_introductions_grammar_02",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_grammar_02",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "translation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "grammar",
|
||||
"kind": "choice",
|
||||
"prompt": "Complete the sentence. You ___ my friend.",
|
||||
"options": [
|
||||
{
|
||||
"id": "o1",
|
||||
"label": "is",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o2",
|
||||
"label": "are",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o3",
|
||||
"label": "am",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
}
|
||||
],
|
||||
"answer_key": {
|
||||
"correct_option_id": "o2",
|
||||
"reference_answer": "are",
|
||||
"rubric": [
|
||||
"Choose the one answer supported by the sentence, word meaning or supplied text."
|
||||
],
|
||||
"explanation": "Use are after you.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_grammar_02",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_grammar_02",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "Complete the sentence.",
|
||||
"stimulus": {
|
||||
"role": "target",
|
||||
"language": "en-US",
|
||||
"text": "You ___ my friend."
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_vocabulary_01",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v1_introductions_vocabulary_01",
|
||||
"canonical_task_id": "intro_en_explanations_v1_vocabulary_01",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "adaptation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "vocabulary",
|
||||
"kind": "choice",
|
||||
"prompt": "What does hello mean in this sentence? Hello, I am Anna.",
|
||||
"options": [
|
||||
{
|
||||
"id": "o1",
|
||||
"label": "a greeting",
|
||||
"role": "meaning",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o2",
|
||||
"label": "a farewell",
|
||||
"role": "meaning",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o3",
|
||||
"label": "a polite request",
|
||||
"role": "meaning",
|
||||
"language": "en-US"
|
||||
}
|
||||
],
|
||||
"answer_key": {
|
||||
"correct_option_id": "o1",
|
||||
"reference_answer": "a greeting",
|
||||
"rubric": [
|
||||
"Choose the one answer supported by the sentence, word meaning or supplied text."
|
||||
],
|
||||
"explanation": "Hello is a greeting. We use it when we meet someone.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_vocabulary_01",
|
||||
"canonical_task_id": "intro_en_explanations_v1_vocabulary_01",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "What does hello mean in this sentence?",
|
||||
"stimulus": {
|
||||
"role": "target",
|
||||
"language": "en-US",
|
||||
"text": "Hello, I am Anna."
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_vocabulary_02",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v1_introductions_vocabulary_02",
|
||||
"canonical_task_id": "intro_en_explanations_v1_vocabulary_02",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "adaptation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "vocabulary",
|
||||
"kind": "choice",
|
||||
"prompt": "What does name mean in this sentence? My name is Ben.",
|
||||
"options": [
|
||||
{
|
||||
"id": "o1",
|
||||
"label": "where someone lives",
|
||||
"role": "meaning",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o2",
|
||||
"label": "what a person is called",
|
||||
"role": "meaning",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o3",
|
||||
"label": "how old someone is",
|
||||
"role": "meaning",
|
||||
"language": "en-US"
|
||||
}
|
||||
],
|
||||
"answer_key": {
|
||||
"correct_option_id": "o2",
|
||||
"reference_answer": "what a person is called",
|
||||
"rubric": [
|
||||
"Choose the one answer supported by the sentence, word meaning or supplied text."
|
||||
],
|
||||
"explanation": "A name is what a person is called. The person's name here is Ben.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_vocabulary_02",
|
||||
"canonical_task_id": "intro_en_explanations_v1_vocabulary_02",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "What does name mean in this sentence?",
|
||||
"stimulus": {
|
||||
"role": "target",
|
||||
"language": "en-US",
|
||||
"text": "My name is Ben."
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_reading_01",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v1_introductions_reading_01",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_reading_01",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "translation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "reading",
|
||||
"kind": "choice",
|
||||
"prompt": "What is the person's name?",
|
||||
"passage": "My name is Anna. I am from Spain.",
|
||||
"options": [
|
||||
{
|
||||
"id": "o1",
|
||||
"label": "Anna",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o2",
|
||||
"label": "Mia",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o3",
|
||||
"label": "Eva",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
}
|
||||
],
|
||||
"answer_key": {
|
||||
"correct_option_id": "o1",
|
||||
"reference_answer": "Anna",
|
||||
"rubric": [
|
||||
"Choose the one answer supported by the sentence, word meaning or supplied text."
|
||||
],
|
||||
"explanation": "The text says: My name is Anna. The correct answer is Anna.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_reading_01",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_reading_01",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "What is the person's name?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_reading_02",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v1_introductions_reading_02",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_reading_02",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "translation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "reading",
|
||||
"kind": "choice",
|
||||
"prompt": "Which country is Ben from?",
|
||||
"passage": "Ben is from Canada. He lives in London.",
|
||||
"options": [
|
||||
{
|
||||
"id": "o1",
|
||||
"label": "Italy",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o2",
|
||||
"label": "Canada",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o3",
|
||||
"label": "Germany",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
}
|
||||
],
|
||||
"answer_key": {
|
||||
"correct_option_id": "o2",
|
||||
"reference_answer": "Canada",
|
||||
"rubric": [
|
||||
"Choose the one answer supported by the sentence, word meaning or supplied text."
|
||||
],
|
||||
"explanation": "The text says: Ben is from Canada. The correct answer is Canada.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_reading_02",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_reading_02",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "Which country is Ben from?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_listening_01",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v1_introductions_listening_01",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_listening_01",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "translation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "listening",
|
||||
"kind": "choice",
|
||||
"prompt": "Which country is Anna from?",
|
||||
"audio_text": "My name is Anna. I am from Spain.",
|
||||
"options": [
|
||||
{
|
||||
"id": "o1",
|
||||
"label": "Spain",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o2",
|
||||
"label": "France",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o3",
|
||||
"label": "Italy",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
}
|
||||
],
|
||||
"answer_key": {
|
||||
"correct_option_id": "o1",
|
||||
"reference_answer": "Spain",
|
||||
"rubric": [
|
||||
"Choose the one answer supported by the sentence, word meaning or supplied text."
|
||||
],
|
||||
"explanation": "The recording says: I am from Spain. The correct answer is Spain.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_listening_01",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_listening_01",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "Which country is Anna from?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_listening_02",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v1_introductions_listening_02",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_listening_02",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "translation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "listening",
|
||||
"kind": "choice",
|
||||
"prompt": "Where does Ben live?",
|
||||
"audio_text": "Ben is from Canada. He lives in London.",
|
||||
"options": [
|
||||
{
|
||||
"id": "o1",
|
||||
"label": "Rome",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o2",
|
||||
"label": "London",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
},
|
||||
{
|
||||
"id": "o3",
|
||||
"label": "Paris",
|
||||
"role": "target",
|
||||
"language": "en-US"
|
||||
}
|
||||
],
|
||||
"answer_key": {
|
||||
"correct_option_id": "o2",
|
||||
"reference_answer": "London",
|
||||
"rubric": [
|
||||
"Choose the one answer supported by the sentence, word meaning or supplied text."
|
||||
],
|
||||
"explanation": "The recording says: He lives in London. The correct answer is London.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_listening_02",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_listening_02",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "Where does Ben live?"
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_speaking_01",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v1_introductions_speaking_01",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_speaking_01",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "translation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "speaking",
|
||||
"kind": "repeat_sentence",
|
||||
"prompt": "Repeat the English sentence.",
|
||||
"reference_text": "My name is Anna.",
|
||||
"answer_key": {
|
||||
"reference_answer": "My name is Anna.",
|
||||
"rubric": [
|
||||
"Repeat the displayed English sentence clearly.",
|
||||
"Do not claim pronunciation or fluency errors without actual Azure measurements."
|
||||
],
|
||||
"explanation": "Repeat the complete sentence clearly. Pronunciation feedback uses only available speech measurements.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_speaking_01",
|
||||
"canonical_task_id": "a1bank_en_v1_introductions_speaking_01",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "Repeat the English sentence."
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_speaking_11",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v2_introductions_speaking_11",
|
||||
"canonical_task_id": "a1bank_en_v2_introductions_speaking_11",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "translation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "speaking",
|
||||
"kind": "free_speech",
|
||||
"prompt": "Introduce yourself. Give a name and the country you are from. You may use real or invented details. Say two or three short English sentences in at most 30 seconds.",
|
||||
"answer_key": {
|
||||
"reference_answer": "My name is Nina. I am not from Germany. I am from Poland.",
|
||||
"rubric": [
|
||||
"Introduce one person with a name and country of origin.",
|
||||
"Two or three short, understandable English sentences meet the required length.",
|
||||
"Real or invented names and countries are allowed. Facts in the example are not mandatory.",
|
||||
"Assess only the explicitly requested content and actual language errors. Do not penalise ambiguity in the task.",
|
||||
"For this free-speech response, assess content and English formulations only. Azure pronunciation is displayed separately and is not part of this score."
|
||||
],
|
||||
"explanation": "The example is only one possible answer. You may choose your own name and country. Content and language are assessed separately from Azure pronunciation.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_speaking_11",
|
||||
"canonical_task_id": "a1bank_en_v2_introductions_speaking_11",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "Introduce yourself. Give a name and the country you are from. You may use real or invented details. Say two or three short English sentences in at most 30 seconds."
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_writing_01",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v1_introductions_writing_01",
|
||||
"canonical_task_id": "intro_en_explanations_v1_writing_01",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "adaptation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "writing",
|
||||
"kind": "short_text",
|
||||
"prompt": "Write one short English sentence to introduce yourself. For this exercise, use the name Anna. Name: Anna",
|
||||
"answer_key": {
|
||||
"reference_answer": "My name is Anna.",
|
||||
"rubric": [
|
||||
"Write one understandable English sentence to introduce yourself using the explicitly requested name Anna.",
|
||||
"Accept My name is Anna., I am Anna. and other correct equivalent formulations.",
|
||||
"Consider actual A1 language errors proportionately. Do not invent additional requirements."
|
||||
],
|
||||
"explanation": "My name is Anna. and I am Anna. are both valid answers. Use the name Anna as requested; other correct ways to introduce yourself are allowed.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_writing_01",
|
||||
"canonical_task_id": "intro_en_explanations_v1_writing_01",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "Write one short English sentence to introduce yourself. For this exercise, use the name Anna.",
|
||||
"stimulus": {
|
||||
"role": "context",
|
||||
"language": "en-US",
|
||||
"text": "Name: Anna"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"id": "intro_en_explanations_v1_writing_11",
|
||||
"revision": "introductions-en-explanations-v1",
|
||||
"base_entry_id": "a1bank_en_v2_introductions_writing_11",
|
||||
"canonical_task_id": "a1bank_en_v2_introductions_writing_11",
|
||||
"instruction_language": "en-US",
|
||||
"module_title": "Greetings & introductions",
|
||||
"module_description": "Greet people, introduce a name and origin; I am, my name is",
|
||||
"equivalence": "translation",
|
||||
"reviewed": true,
|
||||
"task": {
|
||||
"schema_version": 2,
|
||||
"module_id": "a1_introductions_v1",
|
||||
"origin_module_key": "introductions",
|
||||
"target_language": "en-US",
|
||||
"course_version": "a1-v2",
|
||||
"cefr_level": "A1",
|
||||
"skill": "writing",
|
||||
"kind": "free_text",
|
||||
"prompt": "Introduce yourself. Give a name and the country you are from. You may use real or invented details. Write two or three short English sentences.",
|
||||
"answer_key": {
|
||||
"reference_answer": "My name is Nina. I am not from Germany. I am from Poland.",
|
||||
"rubric": [
|
||||
"Introduce one person with a name and country of origin.",
|
||||
"Two or three short, understandable English sentences meet the required length.",
|
||||
"Real or invented names and countries are allowed. Facts in the example are not mandatory.",
|
||||
"Assess only the explicitly requested content and actual language errors. Do not penalise ambiguity in the task."
|
||||
],
|
||||
"explanation": "The example is only one possible answer. You may choose your own name and country. Only the explicitly requested information is required.",
|
||||
"reference_answer_language": "en-US"
|
||||
},
|
||||
"instruction_language": "en-US",
|
||||
"variant_id": "intro_en_explanations_v1_writing_11",
|
||||
"canonical_task_id": "a1bank_en_v2_introductions_writing_11",
|
||||
"content_revision": "introductions-en-explanations-v1",
|
||||
"instruction": "Introduce yourself. Give a name and the country you are from. You may use real or invented details. Write two or three short English sentences."
|
||||
}
|
||||
}
|
||||
]
|
||||
@@ -1,7 +1,13 @@
|
||||
{
|
||||
"total": 12,
|
||||
"editorial_review_sha256": "05cf8e999f341338101fa42d667e031ea6509a19f56b116b5af7329457a75368",
|
||||
"total": 840,
|
||||
"editorial_review_sha256": "bf482411a30c9e6096e9ab7f34785b844541f40bdb70d725a8a465696d53ee75",
|
||||
"files": {
|
||||
"introductions.en-US.v1.json": "07f3a3935290760bd64935ca66825c6321654aa017cd45c5651b86ddd9fbdc39"
|
||||
"a1_daily_life_v1.ru-RU.v1.json": "83120bc77948d6c3b0ede8fd7ca013302bf7f570fe17db09195fa00ab24dcc4f",
|
||||
"a1_family_v1.ru-RU.v1.json": "2d439fba0686cdd29794affa32a29f145bc101375e36c4dc550d434839f6c135",
|
||||
"a1_food_shopping_v1.ru-RU.v1.json": "e13f1aa36f1ace664305947382b965ad6e01029e9363ce34b2ae9b31a049777c",
|
||||
"a1_home_city_v1.ru-RU.v1.json": "783179d50cb197bd28310cbd7a605c43216bfcb9f691cadd3dd5b7c77dcebbbe",
|
||||
"a1_introductions_v1.ru-RU.v1.json": "6458a0fc052c615f5a11b87f6a2a6ce9be67c4e03e1c6532092009bef2841bd0",
|
||||
"a1_numbers_time_v1.ru-RU.v1.json": "403d758af8264eaa98a0f6b869f35e45a519efd7727daed68bc3f179ed9f1fdc",
|
||||
"a1_review_test_v1.ru-RU.v1.json": "4b89bc0ecdb283cc49e75ee3d6113bd49f9d678b2261af682dbcd6a7edd308ae"
|
||||
}
|
||||
}
|
||||
|
||||
@@ -259,6 +259,11 @@ func (s *PostgresStore) PlanPronunciation(ctx context.Context, user, language st
|
||||
return domain.PronunciationPlan{}, err
|
||||
}
|
||||
plan := pronunciation.Select(p, history, now)
|
||||
var native string
|
||||
if err = tx.QueryRowContext(ctx, `SELECT native_language FROM users WHERE id=$1`, user).Scan(&native); err != nil {
|
||||
return plan, err
|
||||
}
|
||||
pronunciation.SetNativeLanguage(&plan, native)
|
||||
plan.ID = NewID("pronplan")
|
||||
raw, err := json.Marshal(plan)
|
||||
if err != nil {
|
||||
|
||||
@@ -98,15 +98,16 @@ func (s *PostgresStore) SaveGeneratedExercise(ctx context.Context, userID string
|
||||
return domain.Lesson{}, domain.Exercise{}, err
|
||||
}
|
||||
exercise := domain.Exercise{
|
||||
ID: NewID("exg"),
|
||||
LessonID: lesson.ID,
|
||||
TargetLanguage: targetLanguage,
|
||||
CEFRLevel: cefrLevel,
|
||||
Type: valueOr(generated.ExerciseType, "repeat_sentence"),
|
||||
PromptText: valueOr(generated.DisplayPrompt, "Sprich den Satz klar nach."),
|
||||
TargetText: generated.ReferenceText,
|
||||
Difficulty: 1,
|
||||
Source: valueOr(generated.Source, "flowise"),
|
||||
ID: NewID("exg"),
|
||||
LessonID: lesson.ID,
|
||||
TargetLanguage: targetLanguage,
|
||||
CEFRLevel: cefrLevel,
|
||||
Type: valueOr(generated.ExerciseType, "repeat_sentence"),
|
||||
PromptText: valueOr(generated.DisplayPrompt, "Sprich den Satz klar nach."),
|
||||
InstructionLanguage: valueOr(generated.NativeLanguage, "de-DE"),
|
||||
TargetText: generated.ReferenceText,
|
||||
Difficulty: 1,
|
||||
Source: valueOr(generated.Source, "flowise"),
|
||||
}
|
||||
if strings.TrimSpace(exercise.TargetText) == "" {
|
||||
return domain.Lesson{}, domain.Exercise{}, errors.New("generated exercise reference_text is required")
|
||||
@@ -178,13 +179,16 @@ func (s *PostgresStore) DebugStatus(ctx context.Context) domain.DebugDBStatus {
|
||||
}
|
||||
|
||||
func (s *PostgresStore) CreateUser(ctx context.Context, email, passwordHash, uiLanguage string) (domain.User, error) {
|
||||
if !domain.SupportedNativeLanguage(uiLanguage) {
|
||||
return domain.User{}, domain.ErrNativeLanguageUnsupported
|
||||
}
|
||||
user := domain.User{ID: NewID("usr"), Email: strings.ToLower(strings.TrimSpace(email)), UILanguage: uiLanguage}
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
INSERT INTO users (id, email, password_hash, ui_language)
|
||||
VALUES ($1, $2, $3, $4)
|
||||
RETURNING id, email, ui_language, instruction_language, role, created_at
|
||||
INSERT INTO users (id, email, password_hash, native_language, ui_language, instruction_language)
|
||||
VALUES ($1, $2, $3, $4, $4, $4)
|
||||
RETURNING id, email, native_language, ui_language, instruction_language, role, created_at
|
||||
`, user.ID, user.Email, passwordHash, uiLanguage)
|
||||
if err := row.Scan(&user.ID, &user.Email, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
if err := row.Scan(&user.ID, &user.Email, &user.NativeLanguage, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
return domain.User{}, err
|
||||
}
|
||||
return user, nil
|
||||
@@ -194,11 +198,11 @@ func (s *PostgresStore) GetPasswordHashByEmail(ctx context.Context, email string
|
||||
var user domain.User
|
||||
var hash string
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
SELECT id, email, password_hash, ui_language, instruction_language, role, created_at
|
||||
SELECT id, email, password_hash, native_language, ui_language, instruction_language, role, created_at
|
||||
FROM users
|
||||
WHERE email = $1
|
||||
`, strings.ToLower(strings.TrimSpace(email)))
|
||||
if err := row.Scan(&user.ID, &user.Email, &hash, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
if err := row.Scan(&user.ID, &user.Email, &hash, &user.NativeLanguage, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return domain.User{}, "", ErrNotFound
|
||||
}
|
||||
@@ -210,11 +214,11 @@ func (s *PostgresStore) GetPasswordHashByEmail(ctx context.Context, email string
|
||||
func (s *PostgresStore) GetUser(ctx context.Context, id string) (domain.User, error) {
|
||||
var user domain.User
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
SELECT id, email, ui_language, instruction_language, role, created_at
|
||||
SELECT id, email, native_language, ui_language, instruction_language, role, created_at
|
||||
FROM users
|
||||
WHERE id = $1
|
||||
`, id)
|
||||
if err := row.Scan(&user.ID, &user.Email, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
if err := row.Scan(&user.ID, &user.Email, &user.NativeLanguage, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return domain.User{}, ErrNotFound
|
||||
}
|
||||
@@ -266,7 +270,7 @@ func (s *PostgresStore) GetPrimaryProfile(ctx context.Context, userID string) (d
|
||||
|
||||
func (s *PostgresStore) UpdatePreferences(ctx context.Context, userID, uiLanguage, targetLanguage, cefrLevel string, dailyGoalMinutes int) (domain.LearnerProfile, error) {
|
||||
if uiLanguage != "" && !domain.SupportedUILanguage(uiLanguage) {
|
||||
return domain.LearnerProfile{}, errors.New("unsupported UI language")
|
||||
return domain.LearnerProfile{}, domain.ErrNativeLanguageUnsupported
|
||||
}
|
||||
tx, err := s.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
@@ -302,7 +306,7 @@ func (s *PostgresStore) UpdatePreferences(ctx context.Context, userID, uiLanguag
|
||||
if err != nil {
|
||||
return profile, err
|
||||
}
|
||||
_, err = tx.ExecContext(ctx, `UPDATE users SET active_profile_id=$2,ui_language=CASE WHEN $3='' THEN ui_language ELSE $3 END WHERE id=$1`, userID, profile.ID, uiLanguage)
|
||||
_, err = tx.ExecContext(ctx, `UPDATE users SET active_profile_id=$2,native_language=CASE WHEN $3='' THEN native_language ELSE $3 END,ui_language=CASE WHEN $3='' THEN native_language ELSE $3 END,instruction_language=CASE WHEN $3='' THEN native_language ELSE $3 END WHERE id=$1`, userID, profile.ID, uiLanguage)
|
||||
if err != nil {
|
||||
return profile, err
|
||||
}
|
||||
@@ -414,11 +418,11 @@ func (s *PostgresStore) RecentPronunciationTexts(ctx context.Context, userID, la
|
||||
func (s *PostgresStore) GetExercise(ctx context.Context, id, userID string) (domain.Exercise, error) {
|
||||
var e domain.Exercise
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
SELECT id, lesson_id, target_language, cefr_level, type, prompt_text, target_text, difficulty, COALESCE(source, 'seed'), COALESCE((SELECT data->>'reason' FROM pronunciation_plans WHERE exercise_id=exercises.id),''), COALESCE((SELECT data->>'category' FROM pronunciation_plans WHERE exercise_id=exercises.id),'')
|
||||
SELECT id, lesson_id, target_language, cefr_level, type, prompt_text, target_text, difficulty, COALESCE(source, 'seed'), COALESCE((SELECT data->>'reason' FROM pronunciation_plans WHERE exercise_id=exercises.id),''), COALESCE((SELECT data->>'category' FROM pronunciation_plans WHERE exercise_id=exercises.id),''), COALESCE(NULLIF(agent_context_json->>'native_language',''),'de-DE')
|
||||
FROM exercises
|
||||
WHERE id = $1 AND (COALESCE(source, 'seed') = 'seed' OR created_by_user_id = $2)
|
||||
`, id, userID)
|
||||
if err := row.Scan(&e.ID, &e.LessonID, &e.TargetLanguage, &e.CEFRLevel, &e.Type, &e.PromptText, &e.TargetText, &e.Difficulty, &e.Source, &e.TrainingReason, &e.TrainingCategory); err != nil {
|
||||
if err := row.Scan(&e.ID, &e.LessonID, &e.TargetLanguage, &e.CEFRLevel, &e.Type, &e.PromptText, &e.TargetText, &e.Difficulty, &e.Source, &e.TrainingReason, &e.TrainingCategory, &e.InstructionLanguage); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return domain.Exercise{}, ErrNotFound
|
||||
}
|
||||
@@ -699,6 +703,19 @@ ALTER TABLE users ADD COLUMN IF NOT EXISTS instruction_language TEXT;
|
||||
UPDATE users SET instruction_language=ui_language WHERE instruction_language IS NULL;
|
||||
ALTER TABLE users ALTER COLUMN instruction_language SET DEFAULT 'de-DE';
|
||||
ALTER TABLE users ALTER COLUMN instruction_language SET NOT NULL;
|
||||
-- The product has two roles: native language (GUI and explanations together)
|
||||
-- and target language. Old unsupported GUI preferences become German once.
|
||||
ALTER TABLE users ADD COLUMN IF NOT EXISTS native_language TEXT;
|
||||
UPDATE users SET native_language=CASE WHEN ui_language IN ('de-DE','ru-RU') THEN ui_language ELSE 'de-DE' END WHERE native_language IS NULL;
|
||||
ALTER TABLE users ALTER COLUMN native_language SET DEFAULT 'de-DE';
|
||||
ALTER TABLE users ALTER COLUMN native_language SET NOT NULL;
|
||||
UPDATE users SET ui_language=native_language,instruction_language=native_language WHERE ui_language IS DISTINCT FROM native_language OR instruction_language IS DISTINCT FROM native_language;
|
||||
DO $$ BEGIN
|
||||
IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conrelid='users'::regclass AND conname='users_native_language_coupled') THEN
|
||||
ALTER TABLE users ADD CONSTRAINT users_native_language_coupled CHECK(native_language IN ('de-DE','ru-RU') AND ui_language=native_language AND instruction_language=native_language);
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
|
||||
CREATE TABLE IF NOT EXISTS learner_profiles (
|
||||
id TEXT PRIMARY KEY,
|
||||
|
||||
@@ -26,7 +26,7 @@ export type CourseAnalysis = {
|
||||
modules: { module_id: string; strengths: string[]; weaknesses: string[]; recommendation: string; reason: string; ready_for_completion: boolean }[];
|
||||
};
|
||||
export type CourseCatalog = {
|
||||
instruction_language?: string; instruction_languages?: string[]; exam_available?: boolean;
|
||||
native_language?: string; native_languages?: string[]; exam_available?: boolean;
|
||||
task_mode?: string; grading_available?: boolean; bank?: {module_id:string;skill:CourseSkill;total:number;unseen:number}[];
|
||||
profile: LearnerProfile; modules: AdaptiveModule[];
|
||||
progress: { module_id: string; skill: CourseSkill; attempts: number; distinct_tasks: number; average_score: number }[];
|
||||
|
||||
@@ -5,13 +5,13 @@ export function fetchMe() {
|
||||
return request<{ user: User; profile: LearnerProfile }>('/me');
|
||||
}
|
||||
|
||||
export async function register(email: string, password: string, uiLanguage: string) {
|
||||
export async function register(email: string, password: string, nativeLanguage: string) {
|
||||
const result = await request<AuthResult>('/auth/register', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({
|
||||
email,
|
||||
password,
|
||||
ui_language: uiLanguage,
|
||||
native_language: nativeLanguage,
|
||||
target_language: 'en-US',
|
||||
daily_goal_minutes: 10
|
||||
})
|
||||
|
||||
@@ -2,12 +2,15 @@ const API_BASE = import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:8080';
|
||||
|
||||
export class ApiError extends Error {
|
||||
status: number;
|
||||
code: string;
|
||||
requestId: string;
|
||||
payload: unknown;
|
||||
|
||||
constructor(status: number, message: string, requestId = '', payload: unknown = null) {
|
||||
super(message);
|
||||
this.status = status;
|
||||
this.code = typeof payload === 'object' && payload !== null && 'code' in payload && typeof payload.code === 'string'
|
||||
? payload.code : ({ 400: 'invalid_request', 401: 'authentication_required', 403: 'access_denied', 404: 'not_found', 409: 'operation_conflict', 413: 'upload_too_large', 415: 'unsupported_audio_format', 429: 'rate_limited', 502: 'service_unavailable', 503: 'service_unavailable', 504: 'request_timeout' } as Record<number, string>)[status] ?? 'internal_error';
|
||||
this.requestId = requestId;
|
||||
this.payload = payload;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
export type User = {
|
||||
id: string;
|
||||
email: string;
|
||||
native_language: string;
|
||||
ui_language: string;
|
||||
instruction_language: string;
|
||||
role: 'learner' | 'admin';
|
||||
@@ -48,6 +49,7 @@ export type Lesson = {
|
||||
};
|
||||
|
||||
export type Exercise = {
|
||||
instruction_language?: string;
|
||||
training_reason?: string;
|
||||
training_category?: string;
|
||||
id: string;
|
||||
|
||||
+10
-13
@@ -1,3 +1,4 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { BookOpen, Bug, ChartNoAxesColumnIncreasing, LogOut, Mic, MessageCircle, Shield } from 'lucide-react';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { fetchMe } from '../api/auth';
|
||||
@@ -22,7 +23,7 @@ export function App() {
|
||||
const [route, setRoute] = useHashRoute(getToken() ? 'dashboard' : 'login');
|
||||
const [debugAvailable, setDebugAvailable] = useState(false);
|
||||
const [user, setUser] = useState<User | null>(null);
|
||||
const [authError, setAuthError] = useState('');
|
||||
const [authError, setAuthError] = useLocalizedMessage();
|
||||
const [authRevision, setAuthRevision] = useState(0);
|
||||
const [practiceSelection, setPracticeSelection] = useState<{ lesson: Lesson; exercise: Exercise } | null>(null);
|
||||
const authed = Boolean(getToken());
|
||||
@@ -37,7 +38,7 @@ export function App() {
|
||||
fetchMe().then(({ user: currentUser }) => {
|
||||
if (!cancelled) {
|
||||
setUser(currentUser);
|
||||
setLanguage(isUILanguage(currentUser.ui_language) ? currentUser.ui_language : 'de-DE');
|
||||
setLanguage(isUILanguage(currentUser.native_language) ? currentUser.native_language : 'de-DE');
|
||||
setAuthError('');
|
||||
}
|
||||
}).catch((error) => {
|
||||
@@ -46,7 +47,7 @@ export function App() {
|
||||
clearToken();
|
||||
setRoute('login');
|
||||
} else {
|
||||
setAuthError(error instanceof Error ? error.message : t('auth.loadError'));
|
||||
setAuthError(errorMessage(error, 'auth.loadError'));
|
||||
}
|
||||
});
|
||||
return () => { cancelled = true; };
|
||||
@@ -80,15 +81,11 @@ export function App() {
|
||||
setRoute('dashboard');
|
||||
}
|
||||
|
||||
async function changeUILanguage(next: UILanguage) {
|
||||
await request('/me/preferences', { method: 'PATCH', body: JSON.stringify({ ui_language: next }) });
|
||||
setUser((current) => current?.id === user?.id && current ? { ...current, ui_language: next } : current);
|
||||
async function changeNativeLanguage(next: UILanguage) {
|
||||
await request('/me/preferences', { method: 'PATCH', body: JSON.stringify({ native_language: next }) });
|
||||
setUser((current) => current?.id === user?.id && current ? { ...current, native_language: next, ui_language: next, instruction_language: next } : current);
|
||||
}
|
||||
|
||||
async function changeInstructionLanguage(next: string) {
|
||||
await request('/course/instruction-language', { method: 'PUT', body: JSON.stringify({ instruction_language: next }) });
|
||||
setUser((current) => current?.id === user?.id && current ? { ...current, instruction_language: next } : current);
|
||||
}
|
||||
|
||||
function logout() {
|
||||
clearToken();
|
||||
@@ -180,14 +177,14 @@ export function App() {
|
||||
|
||||
<main className="main-view">
|
||||
<div className="language-settings">
|
||||
<LanguagePicker onChange={changeUILanguage} />
|
||||
<p className="muted">{t('language.instructions', { language: user.instruction_language === 'en-US' ? t('language.en-US') : user.instruction_language === 'de-DE' ? t('language.de-DE') : user.instruction_language || t('language.de-DE') })}</p>
|
||||
<LanguagePicker onChange={changeNativeLanguage} />
|
||||
|
||||
<p className="muted">{t('language.bank')}</p>
|
||||
<p className="muted">{t('language.content')}</p>
|
||||
</div>
|
||||
{route === 'dashboard' && <DashboardPage onLoaded={(lesson, exercise) => setPracticeSelection({ lesson, exercise })} onPractice={openDashboardExercise} />}
|
||||
{route === 'practice' && <PracticePage initialSelection={practiceSelection} />}
|
||||
{route === 'course' && <CoursePage onInstructionLanguageChange={changeInstructionLanguage} />}
|
||||
{route === 'course' && <CoursePage />}
|
||||
{route === 'conversation' && <ConversationPage />}
|
||||
{route === 'progress' && <ProgressPage />}
|
||||
{route === 'admin' && (user.role === 'admin' ? <AdminPage /> : <p className="form-error">{t('auth.denied')}</p>)}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useAIActionNames } from '../i18n/labels';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
@@ -19,8 +19,8 @@ export function AIAdmin(){
|
||||
const [detailLoading,setDetailLoading]=useState(false),[detailError, setDetailError] = useLocalizedMessage();
|
||||
useEffect(()=>{if(detail||detailLoading||detailError){detailPanel.current?.focus({preventScroll:true});detailPanel.current?.scrollIntoView({block:'start',behavior:'smooth'});}},[detail,detailLoading,detailError]);
|
||||
function closeDetail(){setDetail(null);setDetailError('');detailTrigger.current?.focus();}
|
||||
async function openDetail(id:string,trigger:HTMLButtonElement){if(busy)return;detailTrigger.current=trigger;setDetail(null);setDetailError('');setDetailLoading(true);await run(async()=>{try{setDetail(await getAICall(id));setResolveCost('');setReason('')}catch(e){setDetailError(e instanceof Error?e.message:{ key: 'ui.unable_to_load_call_details' })}finally{setDetailLoading(false)}});}
|
||||
const fail=(e:unknown)=>setError(e instanceof Error?e.message:{ key: 'ui.ai_administration_unavailable' });
|
||||
async function openDetail(id:string,trigger:HTMLButtonElement){if(busy)return;detailTrigger.current=trigger;setDetail(null);setDetailError('');setDetailLoading(true);await run(async()=>{try{setDetail(await getAICall(id));setResolveCost('');setReason('')}catch(e){setDetailError(errorMessage(e, 'ui.unable_to_load_call_details'))}finally{setDetailLoading(false)}});}
|
||||
const fail=(e:unknown)=>setError(errorMessage(e, 'ui.ai_administration_unavailable'));
|
||||
async function refresh(){const s=await getAISettings();setSettings(s);setMonth(String(s.budget.monthly_limit_microusd/1000000));setDay(String(s.budget.daily_limit_microusd/1000000));return s;}
|
||||
async function refreshUsage(){const q=new URLSearchParams({offset:String(offset)});for(const [k,v]of Object.entries(filters)){if(v)q.set(k,k==='from'||k==='to'?new Date(v).toISOString():v);}setUsage(await getAIUsage(q));}
|
||||
useEffect(()=>{let valid=true;getAISettings().then(s=>{if(valid){setSettings(s);setMonth(String(s.budget.monthly_limit_microusd/1000000));setDay(String(s.budget.daily_limit_microusd/1000000));}}).catch(e=>{if(valid)fail(e)});return()=>{valid=false}},[]);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useCourseSkillNames } from '../i18n/labels';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
@@ -27,7 +27,7 @@ export function AdaptiveExercise({ task, attempt, locked, onAttempt, onRecording
|
||||
async function play() {
|
||||
setError(''); setBusy(true);
|
||||
try { stopPlayback(); const blob = await getAdaptiveAudio(task.id); const url = URL.createObjectURL(blob); const player = new Audio(url); playback.current = { audio: player, url }; player.onended = stopPlayback; player.onerror = () => { stopPlayback(); setError({ key: 'ui.unable_to_play_audio' }); }; await player.play(); }
|
||||
catch (err) { stopPlayback(); setError(err instanceof Error ? err.message : { key: 'ui.audio_unavailable' }); }
|
||||
catch (err) { stopPlayback(); setError(errorMessage(err, 'ui.audio_unavailable')); }
|
||||
finally { setBusy(false); }
|
||||
}
|
||||
async function submit() {
|
||||
@@ -37,12 +37,12 @@ export function AdaptiveExercise({ task, attempt, locked, onAttempt, onRecording
|
||||
requestID.current ??= courseRequestID();
|
||||
const result = isSpeech ? await answerCourseAudio(task.id, audio!, requestID.current) : await answerCourseTask(task.id, answer, requestID.current);
|
||||
requestID.current = null; onAttempt(result.attempt); setAudio(null);
|
||||
} catch (err) { setError(err instanceof Error ? err.message : { key: 'ui.unable_to_save_your_answer' }); }
|
||||
} catch (err) { setError(errorMessage(err, 'ui.unable_to_save_your_answer')); }
|
||||
finally { setBusy(false); }
|
||||
}
|
||||
return <div className="view-stack">
|
||||
<p className="eyebrow">{courseSkillNames[task.skill]} · {task.source === 'curated' ? t('ui.from_the_reviewed_exercise_bank') : task.source === 'ai' ? t('ui.created_with_ai') : task.source === 'flowise' ? t('ui.created_with_flowise') : t('ui.reviewed_fallback_exercise')}{task.review ? t('ui.review') : ''}</p>
|
||||
{task.instruction_language && <p className="muted">{t('course.taskLanguage', { language: task.instruction_language === 'de-DE' ? t('language.de-DE') : task.instruction_language === 'en-US' ? t('language.en-US') : task.instruction_language })}</p>}
|
||||
{task.instruction_language && <p className="muted">{t('course.taskLanguage', { language: task.instruction_language === 'de-DE' ? t('language.de-DE') : task.instruction_language === 'ru-RU' ? t('language.ru-RU') : task.instruction_language === 'en-US' ? t('language.en-US') : task.instruction_language })}</p>}
|
||||
<h2 lang={task.instruction_language ?? (task.source === 'curated' ? 'de-DE' : undefined)} dir="auto">{task.instruction ?? task.prompt}</h2>
|
||||
{task.stimulus && <p className="course-passage" lang={task.stimulus.language} dir="auto">{task.stimulus.text}</p>}
|
||||
{task.kind==='free_speech'&&<p className="muted">{t('ui.ai_evaluates_content_and_language_the_azure_pronunciation_score_is')}</p>}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { Mic, Square } from 'lucide-react';
|
||||
import { useEffect, useId, useRef, useState } from 'react';
|
||||
@@ -106,7 +106,7 @@ export function AudioRecorder({ onRecorded, onRecordingStart, onRecordingChange,
|
||||
} catch (err) {
|
||||
stream?.getTracks().forEach((track) => track.stop());
|
||||
if (audioContext) void audioContext.close();
|
||||
setError(err instanceof Error ? err.message : { key: 'ui.microphone_unavailable' });
|
||||
setError(errorMessage(err, 'ui.microphone_unavailable'));
|
||||
onRecordingChange?.(false);
|
||||
} finally {
|
||||
startingRef.current = false;
|
||||
|
||||
@@ -21,7 +21,7 @@ export function LanguagePicker({ onChange }: Props) {
|
||||
return <div className="language-picker" aria-busy={saving}>
|
||||
<label>{t('language.label')}
|
||||
<select value={language} disabled={saving} onChange={(event) => void change(event.target.value as UILanguage)}>
|
||||
{uiLanguages.map((code) => <option key={code} value={code} lang={code}>{code === 'de-DE' ? 'Deutsch' : 'English'}</option>)}
|
||||
{uiLanguages.map((code) => <option key={code} value={code} lang={code}>{code === 'de-DE' ? 'Deutsch' : 'Русский'}</option>)}
|
||||
</select>
|
||||
</label>
|
||||
{failed && <p className="form-error" role="alert">{t('language.saveError')}</p>}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { fetchPronunciationProfile, type PronunciationProfile, type PronunciationTarget } from '../api/pronunciation';
|
||||
import { useI18n, type MessageKey } from '../i18n/I18n';
|
||||
@@ -14,18 +15,19 @@ const trends: Record<string, MessageKey> = {
|
||||
export function PronunciationOverview() {
|
||||
const { t, language } = useI18n();
|
||||
const [profile, setProfile] = useState<PronunciationProfile | null>(null);
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [all, setAll] = useState(false);
|
||||
useEffect(() => {
|
||||
let valid = true;
|
||||
fetchPronunciationProfile().then((value) => { if (valid) setProfile(value); })
|
||||
.catch((err) => { if (valid) setError(err instanceof Error ? err.message : t('profile.error')); });
|
||||
.catch((err) => { if (valid) setError(errorMessage(err, 'profile.error')); });
|
||||
return () => { valid = false; };
|
||||
}, []);
|
||||
if (error) return <section className="panel result-panel" aria-label={t('profile.title')}><h2>{t('profile.title')}</h2><p className="form-error" role="alert">{error}</p></section>;
|
||||
if (!profile) return <section className="panel result-panel" aria-label={t('profile.title')}><p>{t('profile.loading')}</p></section>;
|
||||
function count(noun: 'observations' | 'contexts' | 'tasks', value: number) {
|
||||
const form = new Intl.PluralRules(language).select(value) === 'one' ? 'one' : 'other';
|
||||
const category = new Intl.PluralRules(language).select(value);
|
||||
const form = category === 'one' || category === 'few' || category === 'many' ? category : 'other';
|
||||
return t(`profile.${noun}.${form}`, { count: value.toLocaleString(language) });
|
||||
}
|
||||
function group(kind: PronunciationTarget['kind'], title: string) {
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
import { createContext, useContext, useEffect, useMemo, useState, type ReactNode } from 'react';
|
||||
import de from './de-DE.json';
|
||||
import en from './en-US.json';
|
||||
import ru from './ru-RU.json';
|
||||
|
||||
export const uiLanguages = ['de-DE', 'en-US'] as const;
|
||||
export const uiLanguages = ['de-DE', 'ru-RU'] as const;
|
||||
export type UILanguage = typeof uiLanguages[number];
|
||||
export type MessageKey = keyof typeof de;
|
||||
type Parameters = Record<string, string | number>;
|
||||
const messages: Record<UILanguage, Record<MessageKey, string>> = { 'de-DE': de, 'en-US': en };
|
||||
const storageKey = 'speech_ui_language';
|
||||
const messages: Record<UILanguage, Record<MessageKey, string>> = { 'de-DE': de, 'ru-RU': ru };
|
||||
const storageKey = 'speech_native_language';
|
||||
|
||||
export function isUILanguage(value: string): value is UILanguage {
|
||||
return uiLanguages.some((language) => language === value);
|
||||
@@ -15,7 +15,7 @@ export function isUILanguage(value: string): value is UILanguage {
|
||||
|
||||
function initialLanguage(): UILanguage {
|
||||
try {
|
||||
const saved = localStorage.getItem(storageKey);
|
||||
const saved = localStorage.getItem(storageKey) ?? localStorage.getItem('speech_ui_language');
|
||||
if (saved && isUILanguage(saved)) return saved;
|
||||
} catch { /* Ignore an inaccessible optional language preference. */ }
|
||||
return 'de-DE';
|
||||
|
||||
@@ -24,12 +24,12 @@
|
||||
"auth.busy": "Bitte warten…",
|
||||
"auth.denied": "Kein Zugriff auf den Adminbereich.",
|
||||
"common.retry": "Erneut versuchen",
|
||||
"language.label": "Oberflächensprache",
|
||||
"language.label": "Muttersprache",
|
||||
"language.saveError": "Die Sprache konnte nicht gespeichert werden.",
|
||||
"language.instructions": "Bevorzugte Erklärungssprache: {language}.",
|
||||
"language.instructions": "Muttersprache: {language}.",
|
||||
"language.de-DE": "Deutsch",
|
||||
"language.en-US": "Englisch",
|
||||
"language.registerInfo": "Der Englischkurs verwendet derzeit deutsche Aufgabenanweisungen und Erklärungen.",
|
||||
"language.registerInfo": "Die Muttersprache bestimmt Bedienung und Erklärungen. Du lernst Englisch.",
|
||||
"dashboard.error": "Dashboard konnte nicht geladen werden",
|
||||
"dashboard.loading": "Lade Dashboard…",
|
||||
"dashboard.title": "A1 Aussprachetraining",
|
||||
@@ -43,7 +43,7 @@
|
||||
"progress.overview": "Lernübersicht",
|
||||
"progress.average": "Historischer Durchschnitt",
|
||||
"progress.recent": "Letzte Versuche",
|
||||
"language.bank": "Die Erklärungssprache neuer Kursaufgaben wird im A1-Kurs gewählt.",
|
||||
"language.bank": "Neue Aufgaben und Erklärungen verwenden deine Muttersprache. Die Lernsprache bleibt unverändert.",
|
||||
"profile.title": "Ausspracheprofil",
|
||||
"profile.yours": "Dein Ausspracheprofil · {language}",
|
||||
"profile.error": "Ausspracheprofil nicht verfügbar",
|
||||
@@ -94,7 +94,7 @@
|
||||
"ui.adaptive_language_course_a1": "Adaptiver Sprachkurs · A1",
|
||||
"ui.your_a1_course": "Dein A1-Kurs",
|
||||
"ui.seven_modules_six_learning_areas_and_new_exercises_suited_to": "Sieben Module, sechs Lernbereiche und neue Aufgaben passend zu deinem Lernstand.",
|
||||
"ui.learning_language": "Kurssprache",
|
||||
"ui.learning_language": "Lernsprache",
|
||||
"ui.course_not_yet_available": " – Kurs noch nicht verfügbar",
|
||||
"ui.a_reviewed_a1_course_pack_is_not_yet_available_for": "Für diese Zielsprache ist noch kein geprüftes A1-Sprachpaket freigeschaltet. Dein bisheriger Lernstand bleibt gespeichert.",
|
||||
"ui.your_learning_progress": "Dein Lernstand",
|
||||
@@ -403,11 +403,45 @@
|
||||
"language.content": "Lerninhalte und gespeicherte Rückmeldungen behalten ihre ursprüngliche Sprache.",
|
||||
"conversation.answer": "Deine Dialogantwort",
|
||||
"conversation.audioError": "Audio konnte nicht abgespielt werden.",
|
||||
"course.instructionLanguage": "Erklärungssprache der Aufgaben",
|
||||
"course.instructionScope": "Gilt für neue Aufgaben und KI-Erklärungen. Bereits zugewiesene Aufgaben, Lösungen und Bewertungen behalten ihre ursprüngliche Sprache.",
|
||||
"course.englishPilot": "Englischer Pilot: zwölf Aufgaben in „Begrüßung & Vorstellung“, je zwei pro Lernbereich. Die übrigen Module und der A1-Test sind vorerst nur mit deutschen Erklärungen verfügbar.",
|
||||
"course.noVariant": "Für diesen Bereich gibt es noch keine geprüften Aufgaben in der gewählten Erklärungssprache. Wähle das Vorstellungsmodul oder Deutsch als Erklärungssprache. Dein Verlauf bleibt zugänglich.",
|
||||
"course.examUnavailable": "Für den A1-Test fehlt noch ein vollständiger Bestand in dieser Erklärungssprache. Bereits begonnene Tests behalten ihre Aufgaben.",
|
||||
"course.noVariant": "Für diese Lernsprache ist noch kein vollständiger Aufgabenbestand in deiner Muttersprache verfügbar. Dein bisheriger Verlauf bleibt zugänglich.",
|
||||
"course.examUnavailable": "Für den A1-Test fehlt noch ein vollständiger Bestand in dieser Muttersprache. Bereits begonnene Tests behalten ihre Aufgaben.",
|
||||
"course.taskLanguage": "Sprache dieser Aufgabe: {language}",
|
||||
"api.courseVariantUnavailable": "Für diese Erklärungssprache ist hier noch kein geprüfter Aufgabenbestand verfügbar."
|
||||
"api.courseVariantUnavailable": "Für diese Muttersprache ist hier noch kein geprüfter Aufgabenbestand verfügbar.",
|
||||
"language.ru-RU": "Russisch",
|
||||
"api.native_language_unsupported": "Diese Muttersprache wird noch nicht unterstützt.",
|
||||
"api.native_language_conflict": "Oberfläche und Erklärungen müssen dieselbe Muttersprache verwenden.",
|
||||
"api.invalid_credentials": "E-Mail oder Passwort ist falsch.",
|
||||
"api.invalid_email": "Bitte gib eine gültige E-Mail-Adresse ein.",
|
||||
"api.password_too_short": "Das Passwort muss mindestens acht Zeichen enthalten.",
|
||||
"api.email_in_use": "Diese E-Mail-Adresse ist bereits registriert.",
|
||||
"api.invalid_request": "Die Anfrage ist ungültig. Bitte prüfe deine Eingaben.",
|
||||
"api.authentication_required": "Bitte melde dich erneut an.",
|
||||
"api.access_denied": "Du hast keinen Zugriff auf diese Funktion.",
|
||||
"api.not_found": "Der angeforderte Inhalt wurde nicht gefunden.",
|
||||
"api.operation_conflict": "Die Aktion ist im aktuellen Zustand nicht möglich. Bitte lade die Daten neu.",
|
||||
"api.upload_too_large": "Die hochgeladene Datei ist zu groß.",
|
||||
"api.unsupported_audio_format": "Dieses Audioformat wird nicht unterstützt.",
|
||||
"api.rate_limited": "Zu viele Anfragen. Bitte versuche es später erneut.",
|
||||
"api.service_unavailable": "Der Dienst ist vorübergehend nicht verfügbar.",
|
||||
"api.request_timeout": "Die Anfrage hat zu lange gedauert. Bitte versuche es erneut.",
|
||||
"api.internal_error": "Die Anfrage konnte nicht verarbeitet werden. Bitte versuche es später erneut.",
|
||||
"api.network_error": "Die Verbindung zum Server ist fehlgeschlagen.",
|
||||
"api.invalid_json": "Die JSON-Daten sind ungültig.",
|
||||
"api.microphone_permission_denied": "Bitte erlaube den Mikrofonzugriff im Browser.",
|
||||
"profile.observations.few": "{count} unabhängige Beobachtungen",
|
||||
"profile.observations.many": "{count} unabhängige Beobachtungen",
|
||||
"profile.contexts.few": "{count} Wortkontexte",
|
||||
"profile.contexts.many": "{count} Wortkontexte",
|
||||
"profile.tasks.few": "{count} Aufgaben",
|
||||
"profile.tasks.many": "{count} Aufgaben",
|
||||
"seed.hello": "Sprich den Satz klar nach.",
|
||||
"seed.from": "Achte auf den Rhythmus im Satz.",
|
||||
"seed.coffee": "Sprich langsam und deutlich.",
|
||||
"seed.water": "Achte auf die Endlaute.",
|
||||
"seed.phone": "Sprich jede Zahl einzeln sauber.",
|
||||
"seed.intro.title": "Sich vorstellen",
|
||||
"seed.cafe.title": "Im Café",
|
||||
"seed.numbers.title": "Zahlen",
|
||||
"seed.generated.title": "Ausspracheübung",
|
||||
"seed.historical": "Historischer fester Kurs: Die gespeicherten Aufgaben und Erklärungen bleiben in ihrer ursprünglichen Sprache. Für neue Aufgaben in deiner Muttersprache nutze den aktuellen A1-Kurs."
|
||||
}
|
||||
|
||||
@@ -1,413 +0,0 @@
|
||||
{
|
||||
"app.name": "Speech Learning",
|
||||
"app.level": "A1 language learning",
|
||||
"nav.today": "Today",
|
||||
"nav.practice": "Pronunciation",
|
||||
"nav.course": "A1 course",
|
||||
"nav.conversation": "Conversation",
|
||||
"nav.progress": "Progress",
|
||||
"nav.admin": "Administration",
|
||||
"nav.debug": "Debug",
|
||||
"nav.label": "Navigation",
|
||||
"auth.email": "Email",
|
||||
"auth.password": "Password",
|
||||
"auth.login": "Log in",
|
||||
"auth.register": "Create account",
|
||||
"auth.register.submit": "Register",
|
||||
"auth.back": "Back to login",
|
||||
"auth.logout": "Log out",
|
||||
"auth.loading": "Loading account",
|
||||
"auth.wait": "Please wait a moment.",
|
||||
"auth.loadError": "Unable to load account.",
|
||||
"auth.loginError": "Login failed",
|
||||
"auth.registerError": "Registration failed",
|
||||
"auth.busy": "Please wait…",
|
||||
"auth.denied": "No access to administration.",
|
||||
"common.retry": "Try again",
|
||||
"language.label": "Interface language",
|
||||
"language.saveError": "Unable to save the language.",
|
||||
"language.instructions": "Preferred explanation language: {language}.",
|
||||
"language.de-DE": "German",
|
||||
"language.en-US": "English",
|
||||
"language.registerInfo": "The English course currently uses German task instructions and explanations.",
|
||||
"dashboard.error": "Unable to load dashboard",
|
||||
"dashboard.loading": "Loading dashboard…",
|
||||
"dashboard.title": "A1 pronunciation practice",
|
||||
"dashboard.next": "Next exercise",
|
||||
"dashboard.dailyGoal": "Daily goal",
|
||||
"dashboard.average": "Average",
|
||||
"dashboard.attempts": "Attempts",
|
||||
"dashboard.minutes": "{count} min",
|
||||
"progress.error": "Unable to load progress",
|
||||
"progress.loading": "Loading progress…",
|
||||
"progress.overview": "Learning overview",
|
||||
"progress.average": "Historical average",
|
||||
"progress.recent": "Recent attempts",
|
||||
"language.bank": "Choose the explanation language for new course exercises in the A1 course.",
|
||||
"profile.title": "Pronunciation profile",
|
||||
"profile.yours": "Your pronunciation profile · {language}",
|
||||
"profile.error": "Pronunciation profile unavailable",
|
||||
"profile.loading": "Loading pronunciation profile…",
|
||||
"profile.state.limited": "Limited evidence – check again",
|
||||
"profile.state.observed": "Results still vary",
|
||||
"profile.state.needs_practice": "Repeated difficulty",
|
||||
"profile.state.improved": "Improved",
|
||||
"profile.state.stable": "Stable with review",
|
||||
"profile.trend.insufficient": "Not enough evidence of a trend",
|
||||
"profile.trend.improving": "Improving",
|
||||
"profile.trend.declining": "More difficult recently",
|
||||
"profile.trend.steady": "Similar recent results",
|
||||
"profile.none": "No confirmed measurements in this area yet.",
|
||||
"profile.omission": "{count}% weighted omission rate",
|
||||
"profile.observations.one": "{count} independent observation",
|
||||
"profile.observations.other": "{count} independent observations",
|
||||
"profile.contexts.one": "{count} word context",
|
||||
"profile.contexts.other": "{count} word contexts",
|
||||
"profile.tasks.one": "{count} task",
|
||||
"profile.tasks.other": "{count} tasks",
|
||||
"profile.last": "{trend}. Last recorded: {date}.",
|
||||
"profile.examples": "Example words: {words}",
|
||||
"profile.due": "Review due: {date}",
|
||||
"profile.next": "Next review: {date}",
|
||||
"profile.intro": "Actual Azure measurements from sentence repetition in pronunciation practice and the course are considered together. Recent results carry more weight; a single outlier does not establish a pronunciation difficulty.",
|
||||
"profile.evidence": "{recordings} recordings considered within {days} days. Repeating the same task on the same day counts as one observation per word or sound.",
|
||||
"profile.history": "{count} older attempts remain in your history. Their measurement source is unverified, so they do not determine this profile.",
|
||||
"profile.start": "Your new pronunciation profile needs confirmed measurements. Repeat a sentence in pronunciation practice to get started.",
|
||||
"profile.sounds": "Sounds across different words",
|
||||
"profile.words": "Words",
|
||||
"profile.completeness": "Completeness – omitted words",
|
||||
"profile.less": "Show less",
|
||||
"profile.all": "Show all observations",
|
||||
"profile.limits": "These states are learning aids, not certification. Word accuracy and sound scores are not statistical probabilities.",
|
||||
"ui.job_saved": "Job saved",
|
||||
"ui.preparing": "Preparing",
|
||||
"ui.analysing_learning_progress": "Analysing learning progress",
|
||||
"ui.planning_an_exercise": "Planning an exercise",
|
||||
"ui.creating_and_reviewing_an_exercise": "Creating and reviewing an exercise",
|
||||
"ui.evaluating_your_answer": "Evaluating your answer",
|
||||
"ui.creating_and_reviewing_twelve_test_questions": "Creating and reviewing twelve test questions",
|
||||
"ui.unable_to_load_the_course": "Unable to load the course.",
|
||||
"ui.unable_to_complete_the_job": "Unable to complete the job.",
|
||||
"ui.back_to_the_adaptive_course": "Back to the adaptive course",
|
||||
"ui.loading_a1_course": "Loading A1 course…",
|
||||
"ui.reload": "Reload",
|
||||
"ui.adaptive_language_course_a1": "Adaptive language course · A1",
|
||||
"ui.your_a1_course": "Your A1 course",
|
||||
"ui.seven_modules_six_learning_areas_and_new_exercises_suited_to": "Seven modules, six learning areas and new exercises suited to your progress.",
|
||||
"ui.learning_language": "Learning language",
|
||||
"ui.course_not_yet_available": " – Course not yet available",
|
||||
"ui.a_reviewed_a1_course_pack_is_not_yet_available_for": "A reviewed A1 course pack is not yet available for this learning language. Your previous progress remains saved.",
|
||||
"ui.your_learning_progress": "Your learning progress",
|
||||
"ui.exercises_are_selected_using_your_saved_evaluations_new_exercises_come": "Exercises are selected using your saved evaluations. New exercises come first, followed by practice and reviews where needed. Ungraded answers do not count as graded learning evidence.",
|
||||
"ui.no_ai_learning_analysis_yet_the_teacher_agent_creates_it": "No AI learning analysis yet. The teacher agent creates it from your saved answers.",
|
||||
"ui.the_learning_analysis_is_being_updated_after_your_latest_answer": "The learning analysis is being updated after your latest answer.",
|
||||
"ui.request_learning_analysis_again": "Request learning analysis again",
|
||||
"ui.ai_assessment_based_on_saved_learning_evidence_all_modules_remain": "AI assessment based on saved learning evidence. All modules remain accessible.",
|
||||
"ui.module": "Module",
|
||||
"ui.recommended": " · Recommended",
|
||||
"ui.learning_objective_achieved_according_to_ai_and_evidence_across_learning": "Learning objective achieved according to AI and evidence across learning areas",
|
||||
"ui.continue_learning": "Continue learning",
|
||||
"ui.more_practice": "More practice:",
|
||||
"ui.learning_area": "Learning area",
|
||||
"ui.ai_recommendation": "AI recommendation",
|
||||
"ui.preparing_exercise": "Preparing exercise…",
|
||||
"ui.next_exercise": "Next exercise",
|
||||
"ui.start_a_new_a1_test_12_questions": "Start a new A1 test · 12 questions",
|
||||
"ui.you_can_keep_practising_the_number_of_generated_exercises_does": "You can keep practising. The number of generated exercises does not determine module completion.",
|
||||
"ui.retry_job": "Retry job",
|
||||
"ui.no_graded_learning_evidence_yet": "No graded learning evidence yet",
|
||||
"ui.a1_test": "A1 test",
|
||||
"ui.test_completed": "Test completed",
|
||||
"ui.submitted_evaluation_pending_an_overall_score_appears_once_all_open": "Submitted – evaluation pending. An overall score appears once all open answers have been evaluated.",
|
||||
"ui.value_of_12_answers_saved_feedback_appears_at_the_end": "{value0} of 12 answers saved. Feedback appears at the end.",
|
||||
"ui.evaluate_pending_answers": "Evaluate pending answers",
|
||||
"ui.ai_evaluation_is_currently_unavailable_all_answers_remain_saved": "AI evaluation is currently unavailable. All answers remain saved.",
|
||||
"ui.overall_result": "Overall result:",
|
||||
"ui.request_ai_overall_assessment_again": "Request AI overall assessment again",
|
||||
"ui.internal_a1_learning_assessment": "Internal A1 learning assessment.",
|
||||
"ui.saved_exercises": "Saved exercises",
|
||||
"ui.your_exercises": "Your exercises",
|
||||
"ui.your_selected_exercises_are_saved_here": "Your selected exercises are saved here.",
|
||||
"ui.load_more_exercises": "Load more exercises",
|
||||
"ui.a1_test_2": "A1 test ·",
|
||||
"ui.result": "Result",
|
||||
"ui.resume": "Resume",
|
||||
"ui.current_course_exercise": "Current course exercise",
|
||||
"ui.request_evaluation": "Request evaluation",
|
||||
"ui.request_evaluation_again": "Request evaluation again",
|
||||
"ui.ai_evaluation_is_currently_unavailable_you_can_compare_your_answer": "AI evaluation is currently unavailable. You can compare your answer with the example without a grade.",
|
||||
"ui.your_answer_remains_saved_even_if_you_leave_this_page": "Your answer remains saved even if you leave this page.",
|
||||
"ui.choose_a_module_and_request_your_next_exercise": "Choose a module and request your next exercise.",
|
||||
"ui.open_the_original_fixed_course": "Open the original fixed course",
|
||||
"ui.unable_to_play_audio": "Unable to play audio.",
|
||||
"ui.audio_unavailable": "Audio unavailable.",
|
||||
"ui.unable_to_save_your_answer": "Unable to save your answer.",
|
||||
"ui.from_the_reviewed_exercise_bank": "From the reviewed exercise bank",
|
||||
"ui.created_with_ai": "Created with AI",
|
||||
"ui.created_with_flowise": "Created with Flowise",
|
||||
"ui.reviewed_fallback_exercise": "Reviewed fallback exercise",
|
||||
"ui.review": " · Review",
|
||||
"ui.ai_evaluates_content_and_language_the_azure_pronunciation_score_is": "AI evaluates content and language. The Azure pronunciation score is shown separately.",
|
||||
"ui.listen": "Listen",
|
||||
"ui.answer_options": "Answer options",
|
||||
"ui.your_answer": "Your answer",
|
||||
"ui.up_to_30_seconds_you_can_listen_to_your_recording": "Up to 30 seconds. You can listen to your recording before submitting it.",
|
||||
"ui.processing_answer": "Processing answer…",
|
||||
"ui.save_test_answer": "Save test answer",
|
||||
"ui.check_answer": "Check answer",
|
||||
"ui.demo_measurement_does_not_count_as_learning_evidence": "Demo measurement: does not count as learning evidence.",
|
||||
"ui.test_answer_saved_feedback_appears_once_all_twelve_answers_have": "Test answer saved. Feedback appears once all twelve answers have been evaluated.",
|
||||
"ui.answer_saved_the_teacher_agent_is_evaluating_it": "Answer saved. The teacher agent is evaluating it.",
|
||||
"ui.answer_saved_without_a_grade_you_can_request_an_ai": "Answer saved without a grade. You can request an AI evaluation later.",
|
||||
"ui.evaluation_is_still_pending_you_can_request_it_again": "Evaluation is still pending. You can request it again.",
|
||||
"ui.content_and_language": "Content and language: ",
|
||||
"ui.correct": "Correct",
|
||||
"ui.partially_correct": "Partially correct",
|
||||
"ui.keep_practising": "Keep practising",
|
||||
"ui.recognised_text": "Recognised text:",
|
||||
"ui.pronunciation": "Pronunciation:",
|
||||
"ui.for_self_comparison_without_grading": "For self-comparison, without grading:",
|
||||
"ui.example": "Example:",
|
||||
"ui.listening_transcript": "Listening transcript:",
|
||||
"ui.unable_to_play_the_sentence_please_try_again": "Unable to play the sentence. Please try again.",
|
||||
"ui.the_agent_generated_the_same_sentence_again_please_try_once": "The agent generated the same sentence again. Please try once more.",
|
||||
"ui.unable_to_load_exercise": "Unable to load exercise",
|
||||
"ui.evaluation_failed": "Evaluation failed",
|
||||
"ui.loading_exercise": "Loading exercise…",
|
||||
"ui.loading_new_exercise": "Loading new exercise…",
|
||||
"ui.different_exercise": "Different exercise",
|
||||
"ui.why_this_exercise": "Why this exercise:",
|
||||
"ui.loading_sentence": "Loading sentence…",
|
||||
"ui.listen_to_sentence": "Listen to sentence",
|
||||
"ui.listen_slowly": "Listen slowly",
|
||||
"ui.listen_to_these_practice_words": "Listen to these practice words:",
|
||||
"ui.loading_word": "Loading word…",
|
||||
"ui.practise_value_slowly": "Practise {value0} slowly",
|
||||
"ui.evaluating": "Evaluating…",
|
||||
"ui.record_again": "Record again",
|
||||
"ui.record": "Record",
|
||||
"ui.evaluate": "Evaluate",
|
||||
"ui.recording_not_yet_submitted_listen_record_again_or_request_evaluation": "Recording not yet submitted. Listen, record again or request evaluation.",
|
||||
"ui.listen_to_your_recording": "Listen to your recording",
|
||||
"ui.evaluating_pronunciation": "Evaluating pronunciation…",
|
||||
"ui.evaluation": "Evaluation",
|
||||
"ui.overall": "Overall",
|
||||
"ui.accuracy": "Accuracy",
|
||||
"ui.fluency": "Fluency",
|
||||
"ui.completeness": "Completeness",
|
||||
"ui.teacher_feedback": "Teacher feedback",
|
||||
"ui.microphone_unavailable": "Microphone unavailable",
|
||||
"ui.no_recording_detected_please_try_again": "No recording detected. Please try again.",
|
||||
"ui.stop": "Stop",
|
||||
"ui.starting_microphone": "Starting microphone…",
|
||||
"ui.audio_monitoring": "Audio monitoring",
|
||||
"ui.monitor_your_own_voice": "Monitor your own voice",
|
||||
"ui.monitoring_volume": "Monitoring volume:",
|
||||
"ui.monitoring_volume_2": "Monitoring volume",
|
||||
"ui.use_headphones_while_recording_you_may_hear_your_voice_with": "Use headphones while recording. You may hear your voice with a slight delay.",
|
||||
"ui.sound_analysis": "Sound analysis",
|
||||
"ui.no_sound_scores_are_available_for_this_recording": "No sound scores are available for this recording.",
|
||||
"ui.azure_scores_each_sound_from_0_to_100_scores_below": "Azure scores each sound from 0 to 100. Scores below 75 indicate practice needs in this display.",
|
||||
"ui.unable_to_start_conversation": "Unable to start conversation",
|
||||
"ui.reply_failed": "Reply failed",
|
||||
"ui.a1_role_play": "A1 role play",
|
||||
"ui.start": "Start",
|
||||
"ui.start_a_short_a1_conversation": "Start a short A1 conversation.",
|
||||
"ui.teacher": "Teacher",
|
||||
"ui.you": "You",
|
||||
"ui.send": "Send",
|
||||
"ui.play_audio": "Play audio",
|
||||
"ui.no_attempts_yet": "No attempts yet",
|
||||
"ui.unable_to_load_metrics": "Unable to load metrics.",
|
||||
"ui.unable_to_load_users": "Unable to load users.",
|
||||
"ui.administration": "Administration",
|
||||
"ui.an_overview_of_users_and_learning_activity": "An overview of users and learning activity.",
|
||||
"ui.product_metrics": "Product metrics",
|
||||
"ui.total_users": "Total users",
|
||||
"ui.active_in_7_days": "Active in 7 days",
|
||||
"ui.speaking_attempts": "Speaking attempts",
|
||||
"ui.ai_pronunciation_exercises": "AI pronunciation exercises",
|
||||
"ui.average_score": "Average score",
|
||||
"ui.users": "Users",
|
||||
"ui.accounts_and_learning_activity_search_by_email_address": "Accounts and learning activity. Search by email address.",
|
||||
"ui.search_email": "Search email",
|
||||
"ui.search": "Search",
|
||||
"ui.role": "Role",
|
||||
"ui.registered": "Registered",
|
||||
"ui.latest_attempt": "Latest attempt",
|
||||
"ui.admin": "Admin",
|
||||
"ui.learners": "Learners",
|
||||
"ui.no_matching_users_found": "No matching users found.",
|
||||
"ui.loading_users": "Loading users…",
|
||||
"ui.back": "Back",
|
||||
"ui.next": "Next",
|
||||
"ui.product_operations": "Product operations",
|
||||
"ui.sales_and_access": "Sales and access",
|
||||
"ui.plans_payments_and_access_to_purchased_content_are_not_connected": "Plans, payments and access to purchased content are not connected yet. Revenue and subscription figures are therefore not shown.",
|
||||
"ui.next_product_catalogue": "Next: product catalogue",
|
||||
"ui.then_payment_provider_and_webhooks": "Then: payment provider and webhooks",
|
||||
"ui.after_that_access_rights_per_purchase": "After that: access rights per purchase",
|
||||
"ui.unable_to_load_call_details": "Unable to load call details.",
|
||||
"ui.ai_administration_unavailable": "AI administration unavailable",
|
||||
"ui.ai_administration": "AI administration",
|
||||
"ui.ai_settings_and_usage": "AI settings and usage",
|
||||
"ui.direct_model_calls_from_go_amounts_are_usd_estimates_the": "Direct model calls from Go. Amounts are USD estimates; the provider invoice is authoritative. Daily and monthly limits use UTC.",
|
||||
"ui.loading_ai_settings": "Loading AI settings…",
|
||||
"ui.budget": "Budget",
|
||||
"ui.configured": "configured",
|
||||
"ui.not_configured": "not configured",
|
||||
"ui.at_least_80_of_a_budget_is_committed": "At least 80% of a budget is committed.",
|
||||
"ui.ai_calls_are_blocked_until_a_positive_monthly_budget_is": "AI calls are blocked until a positive monthly budget is configured.",
|
||||
"ui.monthly_limit_in_usd": "Monthly limit in USD",
|
||||
"ui.daily_limit_in_usd_0_no_daily_limit": "Daily limit in USD · 0 = no daily limit",
|
||||
"ui.budget_saved": "Budget saved.",
|
||||
"ui.save_budget": "Save budget",
|
||||
"ui.a_conservative_upper_limit_is_reserved_before_each_call_unknown": "A conservative upper limit is reserved before each call. Unknown usage stays committed until reconciled with the provider invoice. A new exercise may require several calls.",
|
||||
"ui.model_profiles": "Model profiles",
|
||||
"ui.action": "Action",
|
||||
"ui.provider": "Provider",
|
||||
"ui.model_id": "Model ID",
|
||||
"ui.maximum_output_tokens": "Maximum output tokens",
|
||||
"ui.context_budget_input_and_output": "Context budget · input and output",
|
||||
"ui.temperature_empty_do_not_send": "Temperature · empty = do not send",
|
||||
"ui.reasoning_effort_only_when_supported": "Reasoning effort · only when supported",
|
||||
"ui.do_not_send": "Do not send",
|
||||
"ui.timeout_in_seconds": "Timeout in seconds",
|
||||
"ui.value_models_loaded_connection_successful_a_test_run_incurs_additional": "{value0} models loaded. Connection successful. A test run incurs additional recorded costs.",
|
||||
"ui.load_model_list_check_connection": "Load model list / check connection",
|
||||
"ui.check_model_names_and_supported_parameters_with_the_provider_the": "Check model names and supported parameters with the provider. The context budget is conservatively limited before sending. Configure a sufficiently large profile for twelve-question tests.",
|
||||
"ui.prices_in_usd_per_million_tokens": "Prices in USD per million tokens",
|
||||
"ui.input": "Input",
|
||||
"ui.cached_input": "Cached input",
|
||||
"ui.output": "Output",
|
||||
"ui.prices_checked_against_current_provider_pricing": "Prices checked against current provider pricing",
|
||||
"ui.json_schema_mode_only_for_supported_mistral_models": "JSON schema mode · only for supported Mistral models",
|
||||
"ui.enable_profile_for_new_ai_jobs": "Enable profile for new AI jobs",
|
||||
"ui.new_profile_version_saved_test_with_correct_and_incorrect_answers": "New profile version saved. Test with correct and incorrect answers before enabling it.",
|
||||
"ui.save_model_profile": "Save model profile",
|
||||
"ui.system_prompt_and_output_schema": "System prompt and output schema",
|
||||
"ui.no_separate_schema_contract_validation_in_go": "No separate schema; contract validation in Go.",
|
||||
"ui.check_evaluation_quality_2_paid_test_cases": "Check evaluation quality · 2 paid test cases",
|
||||
"ui.check_writing_evaluation_2_paid_test_cases": "Check writing evaluation · 2 paid test cases",
|
||||
"ui.test_saved_profile_incurs_api_costs": "Test saved profile · incurs API costs",
|
||||
"ui.paste_only_the_content_of_input_here_this_call_does": "Paste only the content of input here. This call does not change course progress and is recorded even for a disabled profile. Save profile changes first.",
|
||||
"ui.ai_test_input": "AI test input",
|
||||
"ui.run_paid_test": "Run paid test",
|
||||
"ui.ai_usage": "AI usage",
|
||||
"ui.from": "From",
|
||||
"ui.to": "To",
|
||||
"ui.model": "Model",
|
||||
"ui.user_id": "User ID",
|
||||
"ui.all": "All",
|
||||
"ui.refresh_usage": "Refresh usage",
|
||||
"ui.ai_call_details": "AI call details",
|
||||
"ui.call_details": "Call details",
|
||||
"ui.close": "Close",
|
||||
"ui.loading_call_details": "Loading call details…",
|
||||
"ui.reconcile_unknown_usage_with_the_provider_invoice_the_record_and": "Reconcile unknown usage with the provider invoice. The record and reason are retained.",
|
||||
"ui.actual_cost_in_usd": "Actual cost in USD",
|
||||
"ui.reason": "Reason",
|
||||
"ui.save_reconciliation": "Save reconciliation",
|
||||
"ui.time_user": "Time / user",
|
||||
"ui.model_action": "Model / action",
|
||||
"ui.status": "Status",
|
||||
"ui.tokens_in_out": "Tokens in / out",
|
||||
"ui.cost": "Cost",
|
||||
"ui.details": "Details",
|
||||
"ui.unknown": "Unknown",
|
||||
"ui.show": "Show",
|
||||
"ui.test": " · Test",
|
||||
"ui.system_diagnostics": "System diagnostics",
|
||||
"ui.check_again": "Check again",
|
||||
"ui.error": "Error",
|
||||
"ui.no_http_status": "No HTTP status",
|
||||
"ui.request_id_value": "Request ID {value0}",
|
||||
"ui.database": "Database",
|
||||
"ui.ai_connection": "AI connection",
|
||||
"ui.azure_speech": "Azure Speech",
|
||||
"ui.runtime": "Runtime",
|
||||
"ui.configuration": "Configuration",
|
||||
"ui.problem": "Problem",
|
||||
"ui.not_checked_yet": "Not checked yet.",
|
||||
"ui.no_data": "No data.",
|
||||
"ui.unknown_error": "Unknown error",
|
||||
"ui.check_value": "Check {value0}",
|
||||
"ui.vocabulary": "Vocabulary",
|
||||
"ui.listening": "Listening",
|
||||
"ui.reading": "Reading",
|
||||
"ui.grammar": "Grammar",
|
||||
"ui.writing": "Writing",
|
||||
"ui.speaking": "Speaking",
|
||||
"ui.unable_to_load_course": "Unable to load course.",
|
||||
"ui.an_exercise_from_the_reviewed_bank_is_ready": "An exercise from the reviewed bank is ready.",
|
||||
"ui.an_additional_ai_exercise_is_ready": "An additional AI exercise is ready.",
|
||||
"ui.a_fixed_course_exercise_is_ready_for_review": "A fixed course exercise is ready for review.",
|
||||
"ui.unable_to_load_additional_exercise": "Unable to load additional exercise.",
|
||||
"ui.unable_to_play_audio_please_try_again": "Unable to play audio. Please try again.",
|
||||
"ui.unable_to_evaluate_your_answer": "Unable to evaluate your answer.",
|
||||
"ui.unable_to_evaluate_pronunciation": "Unable to evaluate pronunciation.",
|
||||
"ui.no_course_module_is_available_for_your_current_language_and": "No course module is available for your current language and level yet.",
|
||||
"ui.loading_a1_course_2": "Loading A1 course…",
|
||||
"ui.guided_a1_course": "Guided A1 course",
|
||||
"ui.module_progress": "Module progress",
|
||||
"ui.additional_practice": "Additional practice",
|
||||
"ui.review_vocabulary_and_grammar_your_progress_in_the_fixed_course": "Review vocabulary and grammar. Your progress in the fixed course is tracked separately.",
|
||||
"ui.new_additional_exercise": "New additional exercise",
|
||||
"ui.loading_additional_exercises": "Loading additional exercises…",
|
||||
"ui.preparing_a_suitable_exercise_this_can_take_up_to_25": "Preparing a suitable exercise. This can take up to 25 seconds.",
|
||||
"ui.unable_to_load_additional_exercise_2": "Unable to load additional exercise:",
|
||||
"ui.course_exercises": "Course exercises",
|
||||
"ui.your_additional_exercises": "Your additional exercises",
|
||||
"ui.exercise": "Exercise",
|
||||
"ui.from_the_reviewed_exercise_bank_2": "From the reviewed exercise bank · ",
|
||||
"ui.created_with_ai_2": "Created with AI · ",
|
||||
"ui.created_with_flowise_2": "Created with Flowise · ",
|
||||
"ui.fixed_course_exercise_for_review": "Fixed course exercise for review · ",
|
||||
"ui.additional_practice_2": "Additional practice · ",
|
||||
"ui.listen_first_the_spoken_text_appears_after_your_answer": "Listen first. The spoken text appears after your answer.",
|
||||
"ui.checking": "Checking…",
|
||||
"ui.you_can_listen_to_your_recording_or_record_again_before": "You can listen to your recording or record again before evaluation.",
|
||||
"ui.correct_2": "Correct!",
|
||||
"ui.not_correct_yet": "Not correct yet.",
|
||||
"ui.example_answer": "Example answer:",
|
||||
"ui.listening_transcript_2": "Listening transcript:",
|
||||
"action.analyze_course_progress": "Learning analysis",
|
||||
"action.plan_course_task": "Exercise planning",
|
||||
"action.author_course_task": "Exercise author",
|
||||
"action.review_course_task": "Exercise review",
|
||||
"action.author_course_exam": "Test author · 12 questions",
|
||||
"action.review_course_exam": "Test review · 12 questions",
|
||||
"action.evaluate_course_attempt": "Answer evaluation",
|
||||
"action.summarize_course_exam": "Test summary",
|
||||
"action.next_exercise": "Pronunciation generation",
|
||||
"course.modulesLabel": "A1 modules",
|
||||
"course.inventory": "Reviewed exercise bank: {total} exercises · {unseen} still new. Reviews are available afterwards.",
|
||||
"course.progress": "{tasks} exercises · {attempts} answers · average {score}/100",
|
||||
"admin.matches": "{count} matches",
|
||||
"admin.page": "Page {page} of {total}",
|
||||
"ai.access": "API access: DeepSeek {deepseek} · Mistral {mistral}",
|
||||
"ai.committed": "Monthly committed: {month} · daily committed: {day} · open reservations: {open}",
|
||||
"ai.version": "Version {version}. Changes apply to new jobs; running jobs keep their settings.",
|
||||
"ai.tokens": "{calls} calls · input {input} · output {output} tokens",
|
||||
"ai.costs": "Estimated cost {cost} · open reservations {reserved} · unknown usage for {unknown} calls",
|
||||
"ai.profileVersion": " · profile v{version}",
|
||||
"ai.attempt": "{ms} ms · attempt {attempt}",
|
||||
"ai.reserved": "Reserved {cost}",
|
||||
"ai.range": "{from}–{to} of {total}",
|
||||
"legacy.completed": "{done} of {total} exercises attempted",
|
||||
"legacy.correct": "{count} exercises answered correctly. “Attempted” does not mean “A1 passed”.",
|
||||
"legacy.areaProgress": "{done}/{total} attempted · {correct} objectives achieved",
|
||||
"recorder.percent": "{volume} percent",
|
||||
"recorder.volume": "Monitoring volume: {volume}%",
|
||||
"phoneme.tooltip": "{word}: sound /{phoneme}/, {score} out of 100 points",
|
||||
"language.content": "Learning content and saved feedback keep their original language.",
|
||||
"conversation.answer": "Your conversation reply",
|
||||
"conversation.audioError": "Unable to play audio.",
|
||||
"course.instructionLanguage": "Exercise explanation language",
|
||||
"course.instructionScope": "Applies to new exercises and AI explanations. Assigned exercises, solutions and evaluations retain their original language.",
|
||||
"course.englishPilot": "English pilot: twelve exercises in “Greetings & introductions”, two per learning area. The other modules and the A1 test currently require German explanations.",
|
||||
"course.noVariant": "This area has no reviewed exercises in the selected explanation language yet. Choose the introductions module or German explanations. Your history remains accessible.",
|
||||
"course.examUnavailable": "A complete exercise bank for the A1 test is not available in this explanation language yet. Existing tests keep their assigned questions.",
|
||||
"course.taskLanguage": "This exercise uses: {language}",
|
||||
"api.courseVariantUnavailable": "No reviewed exercise bank is available here for this explanation language yet."
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
import type { Exercise, Lesson } from '../api/types';
|
||||
import { useI18n, type MessageKey } from './I18n';
|
||||
|
||||
const seedPrompts: Record<string, MessageKey> = {
|
||||
ex_a1_hello: 'seed.hello', ex_a1_from: 'seed.from', ex_a1_coffee: 'seed.coffee',
|
||||
ex_a1_water: 'seed.water', ex_a1_phone: 'seed.phone'
|
||||
};
|
||||
const seedLessons: Record<string, MessageKey> = {
|
||||
les_a1_intro: 'seed.intro.title', les_a1_cafe: 'seed.cafe.title', les_a1_numbers: 'seed.numbers.title'
|
||||
};
|
||||
|
||||
// Only the fixed recorder instructions are interface templates. Generated prompts
|
||||
// and stored feedback retain their content and recorded language.
|
||||
export function useExercisePresentation() {
|
||||
const { t, language } = useI18n();
|
||||
return (lesson: Lesson, exercise: Exercise) => {
|
||||
const seed = exercise.source === 'seed' && seedPrompts[exercise.id];
|
||||
return {
|
||||
prompt: seed ? t(seed) : exercise.prompt_text,
|
||||
promptLanguage: seed ? language : exercise.instruction_language ?? 'de-DE',
|
||||
title: seedLessons[lesson.id] ? t(seedLessons[lesson.id]) : lesson.title === 'Agent generated practice' ? t('seed.generated.title') : lesson.title
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,447 @@
|
||||
{
|
||||
"app.name": "Speech Learning",
|
||||
"app.level": "Изучение языков — A1",
|
||||
"nav.today": "Сегодня",
|
||||
"nav.practice": "Произношение",
|
||||
"nav.course": "Курс A1",
|
||||
"nav.conversation": "Диалог",
|
||||
"nav.progress": "Прогресс",
|
||||
"nav.admin": "Администрирование",
|
||||
"nav.debug": "Диагностика",
|
||||
"nav.label": "Навигация",
|
||||
"auth.email": "Электронная почта",
|
||||
"auth.password": "Пароль",
|
||||
"auth.login": "Войти",
|
||||
"auth.register": "Создать аккаунт",
|
||||
"auth.register.submit": "Зарегистрироваться",
|
||||
"auth.back": "Вернуться ко входу",
|
||||
"auth.logout": "Выйти",
|
||||
"auth.loading": "Загрузка аккаунта",
|
||||
"auth.wait": "Пожалуйста, подождите.",
|
||||
"auth.loadError": "Не удалось загрузить аккаунт.",
|
||||
"auth.loginError": "Не удалось войти",
|
||||
"auth.registerError": "Не удалось зарегистрироваться",
|
||||
"auth.busy": "Подождите…",
|
||||
"auth.denied": "Нет доступа к администрированию.",
|
||||
"common.retry": "Повторить",
|
||||
"language.label": "Родной язык",
|
||||
"language.saveError": "Не удалось сохранить язык.",
|
||||
"language.instructions": "Родной язык: {language}.",
|
||||
"language.de-DE": "Немецкий",
|
||||
"language.en-US": "Английский",
|
||||
"language.registerInfo": "Родной язык используется в интерфейсе и объяснениях. Вы изучаете английский язык.",
|
||||
"dashboard.error": "Не удалось загрузить главную страницу",
|
||||
"dashboard.loading": "Загрузка главной страницы…",
|
||||
"dashboard.title": "Тренировка произношения — A1",
|
||||
"dashboard.next": "Следующее упражнение",
|
||||
"dashboard.dailyGoal": "Цель на день",
|
||||
"dashboard.average": "Средний балл",
|
||||
"dashboard.attempts": "Попытки",
|
||||
"dashboard.minutes": "{count} мин",
|
||||
"progress.error": "Не удалось загрузить прогресс",
|
||||
"progress.loading": "Загрузка прогресса…",
|
||||
"progress.overview": "Обзор обучения",
|
||||
"progress.average": "Средний балл за всё время",
|
||||
"progress.recent": "Последние попытки",
|
||||
"language.bank": "Новые задания и объяснения используют ваш родной язык. Изучаемый язык не меняется.",
|
||||
"profile.title": "Профиль произношения",
|
||||
"profile.yours": "Ваш профиль произношения · {language}",
|
||||
"profile.error": "Профиль произношения недоступен",
|
||||
"profile.loading": "Загрузка профиля произношения…",
|
||||
"profile.state.limited": "Мало данных — нужна повторная проверка",
|
||||
"profile.state.observed": "Результаты пока неоднородны",
|
||||
"profile.state.needs_practice": "Повторяющиеся трудности",
|
||||
"profile.state.improved": "Есть улучшение",
|
||||
"profile.state.stable": "Стабильный результат с повторением",
|
||||
"profile.trend.insufficient": "Недостаточно данных для оценки динамики",
|
||||
"profile.trend.improving": "Результаты улучшаются",
|
||||
"profile.trend.declining": "В последнее время снова труднее",
|
||||
"profile.trend.steady": "Последние результаты похожи",
|
||||
"profile.none": "В этом разделе пока нет подтверждённых измерений.",
|
||||
"profile.omission": "Взвешенная доля пропусков: {count} %",
|
||||
"profile.observations.one": "{count} наблюдение",
|
||||
"profile.observations.other": "{count} независимых наблюдений",
|
||||
"profile.contexts.one": "{count} слово",
|
||||
"profile.contexts.other": "{count} словесных контекстов",
|
||||
"profile.tasks.one": "{count} задание",
|
||||
"profile.tasks.other": "{count} заданий",
|
||||
"profile.last": "{trend}. Последнее измерение: {date}.",
|
||||
"profile.examples": "Примеры слов: {words}",
|
||||
"profile.due": "Пора повторить: {date}",
|
||||
"profile.next": "Следующее повторение: {date}",
|
||||
"profile.intro": "Настоящие измерения Azure при повторении фраз в тренировке произношения и в курсе рассматриваются вместе. Более свежие результаты имеют больший вес; одного отклонения недостаточно, чтобы установить проблему со звуком.",
|
||||
"profile.evidence": "Учтено записей: {recordings}, период: {days} дней. Повторения одного задания в один день считаются одним наблюдением для каждого слова или звука.",
|
||||
"profile.history": "Старые попытки ({count}) сохранены в истории. Источник их измерений не подтверждён, поэтому они не определяют этот профиль.",
|
||||
"profile.start": "Для нового профиля произношения пока не хватает подтверждённых измерений. Начните с повторения фразы в разделе произношения.",
|
||||
"profile.sounds": "Звуки в разных словах",
|
||||
"profile.words": "Слова",
|
||||
"profile.completeness": "Полнота — пропущенные слова",
|
||||
"profile.less": "Показать меньше",
|
||||
"profile.all": "Показать все наблюдения",
|
||||
"profile.limits": "Эти состояния помогают учиться и не являются сертификацией. Баллы точности слов и звуков не являются статистическими вероятностями.",
|
||||
"ui.job_saved": "Запрос сохранён",
|
||||
"ui.preparing": "Подготовка",
|
||||
"ui.analysing_learning_progress": "Анализ прогресса",
|
||||
"ui.planning_an_exercise": "Подготовка учебного задания",
|
||||
"ui.creating_and_reviewing_an_exercise": "Создание и проверка задания",
|
||||
"ui.evaluating_your_answer": "Оценка ответа",
|
||||
"ui.creating_and_reviewing_twelve_test_questions": "Создание и проверка двенадцати заданий теста",
|
||||
"ui.unable_to_load_the_course": "Не удалось загрузить курс.",
|
||||
"ui.unable_to_complete_the_job": "Не удалось выполнить запрос.",
|
||||
"ui.back_to_the_adaptive_course": "Вернуться к адаптивному курсу",
|
||||
"ui.loading_a1_course": "Загрузка курса A1…",
|
||||
"ui.reload": "Загрузить заново",
|
||||
"ui.adaptive_language_course_a1": "Адаптивный языковой курс · A1",
|
||||
"ui.your_a1_course": "Ваш курс A1",
|
||||
"ui.seven_modules_six_learning_areas_and_new_exercises_suited_to": "Семь модулей, шесть направлений и новые задания с учётом вашего прогресса.",
|
||||
"ui.learning_language": "Изучаемый язык",
|
||||
"ui.course_not_yet_available": " — Курс пока недоступен",
|
||||
"ui.a_reviewed_a1_course_pack_is_not_yet_available_for": "Для этого изучаемого языка пока нет проверенного курса A1. Ваш прежний прогресс сохранён.",
|
||||
"ui.your_learning_progress": "Ваш прогресс в обучении",
|
||||
"ui.exercises_are_selected_using_your_saved_evaluations_new_exercises_come": "Задания подбираются по сохранённым оценкам. Сначала предлагаются новые задания, затем подходящие упражнения и повторения. Ответы без оценки не считаются оценёнными результатами обучения.",
|
||||
"ui.no_ai_learning_analysis_yet_the_teacher_agent_creates_it": "Анализа ИИ пока нет. Учитель создаёт его на основе ваших сохранённых ответов.",
|
||||
"ui.the_learning_analysis_is_being_updated_after_your_latest_answer": "Анализ прогресса обновляется после последнего ответа.",
|
||||
"ui.request_learning_analysis_again": "Запросить анализ прогресса повторно",
|
||||
"ui.ai_assessment_based_on_saved_learning_evidence_all_modules_remain": "Оценка ИИ основана на сохранённых результатах обучения. Все модули остаются доступными.",
|
||||
"ui.module": "Модуль",
|
||||
"ui.recommended": " · Рекомендуется",
|
||||
"ui.learning_objective_achieved_according_to_ai_and_evidence_across_learning": "По оценке ИИ и результатам по направлениям цель достигнута",
|
||||
"ui.continue_learning": "Продолжить обучение",
|
||||
"ui.more_practice": "Ещё потренировать:",
|
||||
"ui.learning_area": "Направление обучения",
|
||||
"ui.ai_recommendation": "Рекомендация ИИ",
|
||||
"ui.preparing_exercise": "Подготовка задания…",
|
||||
"ui.next_exercise": "Следующее задание",
|
||||
"ui.start_a_new_a1_test_12_questions": "Начать новый тест A1 · 12 заданий",
|
||||
"ui.you_can_keep_practising_the_number_of_generated_exercises_does": "Вы можете продолжать заниматься. Количество созданных заданий не определяет завершение модуля.",
|
||||
"ui.retry_job": "Повторить запрос",
|
||||
"ui.no_graded_learning_evidence_yet": "Пока нет оценённых результатов обучения",
|
||||
"ui.a1_test": "Тест A1",
|
||||
"ui.test_completed": "Тест завершён",
|
||||
"ui.submitted_evaluation_pending_an_overall_score_appears_once_all_open": "Ответы отправлены — ожидается оценка. Итоговый балл появится после оценки всех открытых ответов.",
|
||||
"ui.value_of_12_answers_saved_feedback_appears_at_the_end": "Сохранено ответов: {value0} из 12. Обратная связь появится в конце.",
|
||||
"ui.evaluate_pending_answers": "Оценить ожидающие ответы",
|
||||
"ui.ai_evaluation_is_currently_unavailable_all_answers_remain_saved": "Оценка ИИ сейчас недоступна. Все ответы сохранены.",
|
||||
"ui.overall_result": "Итоговый результат:",
|
||||
"ui.request_ai_overall_assessment_again": "Запросить итоговую оценку ИИ повторно",
|
||||
"ui.internal_a1_learning_assessment": "Внутренняя оценка уровня A1.",
|
||||
"ui.saved_exercises": "Сохранённые задания",
|
||||
"ui.your_exercises": "Ваши задания",
|
||||
"ui.your_selected_exercises_are_saved_here": "Выбранные задания сохраняются здесь.",
|
||||
"ui.load_more_exercises": "Загрузить ещё задания",
|
||||
"ui.a1_test_2": "Тест A1 ·",
|
||||
"ui.result": "Результат",
|
||||
"ui.resume": "Продолжить",
|
||||
"ui.current_course_exercise": "Текущее задание курса",
|
||||
"ui.request_evaluation": "Запросить оценку",
|
||||
"ui.request_evaluation_again": "Запросить оценку повторно",
|
||||
"ui.ai_evaluation_is_currently_unavailable_you_can_compare_your_answer": "Оценка ИИ сейчас недоступна. Вы можете сравнить ответ с примером без выставления балла.",
|
||||
"ui.your_answer_remains_saved_even_if_you_leave_this_page": "Ответ останется сохранённым, даже если вы уйдёте со страницы.",
|
||||
"ui.choose_a_module_and_request_your_next_exercise": "Выберите модуль и запросите следующее задание.",
|
||||
"ui.open_the_original_fixed_course": "Открыть прежний фиксированный курс",
|
||||
"ui.unable_to_play_audio": "Не удалось воспроизвести аудио.",
|
||||
"ui.audio_unavailable": "Аудио недоступно.",
|
||||
"ui.unable_to_save_your_answer": "Не удалось сохранить ответ.",
|
||||
"ui.from_the_reviewed_exercise_bank": "Из проверенного банка заданий",
|
||||
"ui.created_with_ai": "Создано с помощью ИИ",
|
||||
"ui.created_with_flowise": "Создано с помощью Flowise",
|
||||
"ui.reviewed_fallback_exercise": "Проверенное резервное задание",
|
||||
"ui.review": " · Повторение",
|
||||
"ui.ai_evaluates_content_and_language_the_azure_pronunciation_score_is": "ИИ оценивает содержание и язык. Балл произношения Azure показывается отдельно.",
|
||||
"ui.listen": "Прослушать",
|
||||
"ui.answer_options": "Варианты ответа",
|
||||
"ui.your_answer": "Ваш ответ",
|
||||
"ui.up_to_30_seconds_you_can_listen_to_your_recording": "До 30 секунд. Перед отправкой запись можно прослушать.",
|
||||
"ui.processing_answer": "Обработка ответа…",
|
||||
"ui.save_test_answer": "Сохранить ответ теста",
|
||||
"ui.check_answer": "Проверить ответ",
|
||||
"ui.demo_measurement_does_not_count_as_learning_evidence": "Демонстрационное измерение: не считается результатом обучения.",
|
||||
"ui.test_answer_saved_feedback_appears_once_all_twelve_answers_have": "Ответ теста сохранён. Обратная связь появится после оценки всех двенадцати ответов.",
|
||||
"ui.answer_saved_the_teacher_agent_is_evaluating_it": "Ответ сохранён. Учитель оценивает его.",
|
||||
"ui.answer_saved_without_a_grade_you_can_request_an_ai": "Ответ сохранён без оценки. Позже можно запросить оценку ИИ.",
|
||||
"ui.evaluation_is_still_pending_you_can_request_it_again": "Оценка ещё ожидается. Вы можете запросить её повторно.",
|
||||
"ui.content_and_language": "Содержание и язык: ",
|
||||
"ui.correct": "Верно",
|
||||
"ui.partially_correct": "Частично верно",
|
||||
"ui.keep_practising": "Нужно ещё потренироваться",
|
||||
"ui.recognised_text": "Распознанный текст:",
|
||||
"ui.pronunciation": "Произношение:",
|
||||
"ui.for_self_comparison_without_grading": "Для самостоятельного сравнения, без оценки:",
|
||||
"ui.example": "Пример:",
|
||||
"ui.listening_transcript": "Текст аудиозаписи:",
|
||||
"ui.unable_to_play_the_sentence_please_try_again": "Не удалось воспроизвести фразу. Повторите попытку.",
|
||||
"ui.the_agent_generated_the_same_sentence_again_please_try_once": "Учитель снова создал ту же фразу. Попробуйте ещё раз.",
|
||||
"ui.unable_to_load_exercise": "Не удалось загрузить упражнение",
|
||||
"ui.evaluation_failed": "Не удалось выполнить оценку",
|
||||
"ui.loading_exercise": "Загрузка упражнения…",
|
||||
"ui.loading_new_exercise": "Загрузка нового упражнения…",
|
||||
"ui.different_exercise": "Другое упражнение",
|
||||
"ui.why_this_exercise": "Почему это упражнение:",
|
||||
"ui.loading_sentence": "Загрузка фразы…",
|
||||
"ui.listen_to_sentence": "Прослушать фразу",
|
||||
"ui.listen_slowly": "Прослушать медленно",
|
||||
"ui.listen_to_these_practice_words": "Эти слова можно прослушать отдельно:",
|
||||
"ui.loading_word": "Загрузка слова…",
|
||||
"ui.practise_value_slowly": "Медленно потренировать {value0}",
|
||||
"ui.evaluating": "Выполняется оценка…",
|
||||
"ui.record_again": "Записать заново",
|
||||
"ui.record": "Записать",
|
||||
"ui.evaluate": "Оценить",
|
||||
"ui.recording_not_yet_submitted_listen_record_again_or_request_evaluation": "Запись ещё не отправлена. Прослушайте её, запишите заново или запросите оценку.",
|
||||
"ui.listen_to_your_recording": "Прослушать свою запись",
|
||||
"ui.evaluating_pronunciation": "Оценка произношения…",
|
||||
"ui.evaluation": "Оценка",
|
||||
"ui.overall": "Общий балл",
|
||||
"ui.accuracy": "Точность",
|
||||
"ui.fluency": "Беглость",
|
||||
"ui.completeness": "Полнота",
|
||||
"ui.teacher_feedback": "Обратная связь учителя",
|
||||
"ui.microphone_unavailable": "Микрофон недоступен",
|
||||
"ui.no_recording_detected_please_try_again": "Запись не обнаружена. Повторите попытку.",
|
||||
"ui.stop": "Остановить",
|
||||
"ui.starting_microphone": "Запуск микрофона…",
|
||||
"ui.audio_monitoring": "Мониторинг звука",
|
||||
"ui.monitor_your_own_voice": "Слышать свой голос",
|
||||
"ui.monitoring_volume": "Громкость мониторинга:",
|
||||
"ui.monitoring_volume_2": "Громкость мониторинга",
|
||||
"ui.use_headphones_while_recording_you_may_hear_your_voice_with": "Используйте наушники во время записи. Собственный голос может звучать с небольшой задержкой.",
|
||||
"ui.sound_analysis": "Анализ звуков",
|
||||
"ui.no_sound_scores_are_available_for_this_recording": "Для этой записи нет оценок отдельных звуков.",
|
||||
"ui.azure_scores_each_sound_from_0_to_100_scores_below": "Azure оценивает каждый звук от 0 до 100. Баллы ниже 75 здесь обозначают необходимость практики.",
|
||||
"ui.unable_to_start_conversation": "Не удалось начать диалог",
|
||||
"ui.reply_failed": "Не удалось получить ответ",
|
||||
"ui.a1_role_play": "Ролевая игра A1",
|
||||
"ui.start": "Начать",
|
||||
"ui.start_a_short_a1_conversation": "Начните короткий диалог уровня A1.",
|
||||
"ui.teacher": "Учитель",
|
||||
"ui.you": "Вы",
|
||||
"ui.send": "Отправить",
|
||||
"ui.play_audio": "Воспроизвести аудио",
|
||||
"ui.no_attempts_yet": "Попыток пока нет",
|
||||
"ui.unable_to_load_metrics": "Не удалось загрузить показатели.",
|
||||
"ui.unable_to_load_users": "Не удалось загрузить пользователей.",
|
||||
"ui.administration": "Управление",
|
||||
"ui.an_overview_of_users_and_learning_activity": "Обзор пользователей и учебной активности.",
|
||||
"ui.product_metrics": "Показатели продукта",
|
||||
"ui.total_users": "Всего пользователей",
|
||||
"ui.active_in_7_days": "Активны за 7 дней",
|
||||
"ui.speaking_attempts": "Речевые попытки",
|
||||
"ui.ai_pronunciation_exercises": "Упражнения ИИ на произношение",
|
||||
"ui.average_score": "Средний балл",
|
||||
"ui.users": "Пользователи",
|
||||
"ui.accounts_and_learning_activity_search_by_email_address": "Аккаунты и учебная активность. Поиск по электронной почте.",
|
||||
"ui.search_email": "Найти по электронной почте",
|
||||
"ui.search": "Найти",
|
||||
"ui.role": "Роль",
|
||||
"ui.registered": "Дата регистрации",
|
||||
"ui.latest_attempt": "Последняя попытка",
|
||||
"ui.admin": "Администратор",
|
||||
"ui.learners": "Учащиеся",
|
||||
"ui.no_matching_users_found": "Подходящие пользователи не найдены.",
|
||||
"ui.loading_users": "Загрузка пользователей…",
|
||||
"ui.back": "Назад",
|
||||
"ui.next": "Далее",
|
||||
"ui.product_operations": "Работа продукта",
|
||||
"ui.sales_and_access": "Продажи и доступ",
|
||||
"ui.plans_payments_and_access_to_purchased_content_are_not_connected": "Тарифы, платежи и доступ к купленным материалам пока не подключены. Поэтому выручка и число подписок не показываются.",
|
||||
"ui.next_product_catalogue": "Следующий шаг: каталог продуктов",
|
||||
"ui.then_payment_provider_and_webhooks": "Затем: платёжный провайдер и вебхуки",
|
||||
"ui.after_that_access_rights_per_purchase": "После этого: права доступа по покупке",
|
||||
"ui.unable_to_load_call_details": "Не удалось загрузить сведения о вызове.",
|
||||
"ui.ai_administration_unavailable": "Управление ИИ недоступно",
|
||||
"ui.ai_administration": "Управление ИИ",
|
||||
"ui.ai_settings_and_usage": "Настройки ИИ и расход",
|
||||
"ui.direct_model_calls_from_go_amounts_are_usd_estimates_the": "Прямые вызовы моделей из Go. Суммы указаны как оценки в USD; окончателен счёт провайдера. Суточные и месячные лимиты действуют по UTC.",
|
||||
"ui.loading_ai_settings": "Загрузка настроек ИИ…",
|
||||
"ui.budget": "Бюджет",
|
||||
"ui.configured": "настроен",
|
||||
"ui.not_configured": "не настроен",
|
||||
"ui.at_least_80_of_a_budget_is_committed": "Занято не менее 80 % одного из бюджетов.",
|
||||
"ui.ai_calls_are_blocked_until_a_positive_monthly_budget_is": "Вызовы ИИ заблокированы, пока не задан положительный месячный бюджет.",
|
||||
"ui.monthly_limit_in_usd": "Месячный лимит в USD",
|
||||
"ui.daily_limit_in_usd_0_no_daily_limit": "Суточный лимит в USD · 0 = без суточного лимита",
|
||||
"ui.budget_saved": "Бюджет сохранён.",
|
||||
"ui.save_budget": "Сохранить бюджет",
|
||||
"ui.a_conservative_upper_limit_is_reserved_before_each_call_unknown": "Перед каждым вызовом резервируется консервативная верхняя граница расходов. Неизвестный расход остаётся зарезервированным до сверки со счётом провайдера. Для одного задания может потребоваться несколько вызовов.",
|
||||
"ui.model_profiles": "Профили моделей",
|
||||
"ui.action": "Действие",
|
||||
"ui.provider": "Провайдер",
|
||||
"ui.model_id": "ID модели",
|
||||
"ui.maximum_output_tokens": "Максимум выходных токенов",
|
||||
"ui.context_budget_input_and_output": "Бюджет контекста · ввод и вывод",
|
||||
"ui.temperature_empty_do_not_send": "Температура · пусто = не отправлять",
|
||||
"ui.reasoning_effort_only_when_supported": "Усилие рассуждения · только при поддержке",
|
||||
"ui.do_not_send": "Не отправлять",
|
||||
"ui.timeout_in_seconds": "Тайм-аут в секундах",
|
||||
"ui.value_models_loaded_connection_successful_a_test_run_incurs_additional": "Загружено моделей: {value0}. Соединение установлено. Тестовый запуск создаёт дополнительные учитываемые расходы.",
|
||||
"ui.load_model_list_check_connection": "Загрузить модели / проверить соединение",
|
||||
"ui.check_model_names_and_supported_parameters_with_the_provider_the": "Проверьте названия моделей и поддерживаемые параметры у провайдера. Бюджет контекста консервативно ограничивается перед отправкой. Для тестов из двенадцати заданий настройте достаточно большой профиль.",
|
||||
"ui.prices_in_usd_per_million_tokens": "Цены в USD за миллион токенов",
|
||||
"ui.input": "Ввод",
|
||||
"ui.cached_input": "Кэшированный ввод",
|
||||
"ui.output": "Вывод",
|
||||
"ui.prices_checked_against_current_provider_pricing": "Цены сверены с текущими ценами провайдера",
|
||||
"ui.json_schema_mode_only_for_supported_mistral_models": "Режим JSON Schema · только для поддерживаемых моделей Mistral",
|
||||
"ui.enable_profile_for_new_ai_jobs": "Включить профиль для новых запросов ИИ",
|
||||
"ui.new_profile_version_saved_test_with_correct_and_incorrect_answers": "Новая версия профиля сохранена. Перед включением проверьте правильные и неправильные ответы.",
|
||||
"ui.save_model_profile": "Сохранить профиль модели",
|
||||
"ui.system_prompt_and_output_schema": "Системная инструкция и схема ответа",
|
||||
"ui.no_separate_schema_contract_validation_in_go": "Отдельной схемы нет; контракт проверяется в Go.",
|
||||
"ui.check_evaluation_quality_2_paid_test_cases": "Проверить качество оценки · 2 платных теста",
|
||||
"ui.check_writing_evaluation_2_paid_test_cases": "Проверить письменную оценку · 2 платных теста",
|
||||
"ui.test_saved_profile_incurs_api_costs": "Проверить сохранённый профиль · создаёт расходы API",
|
||||
"ui.paste_only_the_content_of_input_here_this_call_does": "Вставьте только содержимое input. Вызов не меняет прогресс курса и учитывается даже для выключенного профиля. Сначала сохраните изменения профиля.",
|
||||
"ui.ai_test_input": "Тестовый ввод ИИ",
|
||||
"ui.run_paid_test": "Запустить платный тест",
|
||||
"ui.ai_usage": "Расход ИИ",
|
||||
"ui.from": "С",
|
||||
"ui.to": "По",
|
||||
"ui.model": "Модель",
|
||||
"ui.user_id": "ID пользователя",
|
||||
"ui.all": "Все",
|
||||
"ui.refresh_usage": "Обновить расход",
|
||||
"ui.ai_call_details": "Сведения о вызове ИИ",
|
||||
"ui.call_details": "Сведения о вызове",
|
||||
"ui.close": "Закрыть",
|
||||
"ui.loading_call_details": "Загрузка сведений о вызове…",
|
||||
"ui.reconcile_unknown_usage_with_the_provider_invoice_the_record_and": "Сверьте неизвестный расход со счётом провайдера. Запись и обоснование сохраняются.",
|
||||
"ui.actual_cost_in_usd": "Фактическая стоимость в USD",
|
||||
"ui.reason": "Обоснование",
|
||||
"ui.save_reconciliation": "Сохранить сверку",
|
||||
"ui.time_user": "Время / пользователь",
|
||||
"ui.model_action": "Модель / действие",
|
||||
"ui.status": "Статус",
|
||||
"ui.tokens_in_out": "Токены: ввод / вывод",
|
||||
"ui.cost": "Стоимость",
|
||||
"ui.details": "Подробности",
|
||||
"ui.unknown": "Неизвестно",
|
||||
"ui.show": "Показать",
|
||||
"ui.test": " · Тест",
|
||||
"ui.system_diagnostics": "Диагностика системы",
|
||||
"ui.check_again": "Проверить снова",
|
||||
"ui.error": "Ошибка",
|
||||
"ui.no_http_status": "Нет HTTP-статуса",
|
||||
"ui.request_id_value": "ID запроса: {value0}",
|
||||
"ui.database": "База данных",
|
||||
"ui.ai_connection": "Подключение ИИ",
|
||||
"ui.azure_speech": "Azure Speech",
|
||||
"ui.runtime": "Среда выполнения",
|
||||
"ui.configuration": "Конфигурация",
|
||||
"ui.problem": "Проблема",
|
||||
"ui.not_checked_yet": "Ещё не проверено.",
|
||||
"ui.no_data": "Нет данных.",
|
||||
"ui.unknown_error": "Неизвестная ошибка",
|
||||
"ui.check_value": "Проверить: {value0}",
|
||||
"ui.vocabulary": "Лексика",
|
||||
"ui.listening": "Аудирование",
|
||||
"ui.reading": "Чтение",
|
||||
"ui.grammar": "Грамматика",
|
||||
"ui.writing": "Письмо",
|
||||
"ui.speaking": "Говорение",
|
||||
"ui.unable_to_load_course": "Не удалось загрузить курс.",
|
||||
"ui.an_exercise_from_the_reviewed_bank_is_ready": "Задание из проверенного банка готово.",
|
||||
"ui.an_additional_ai_exercise_is_ready": "Дополнительное задание ИИ готово.",
|
||||
"ui.a_fixed_course_exercise_is_ready_for_review": "Подготовлено фиксированное задание курса для повторения.",
|
||||
"ui.unable_to_load_additional_exercise": "Не удалось загрузить дополнительное задание.",
|
||||
"ui.unable_to_play_audio_please_try_again": "Не удалось воспроизвести аудио. Повторите попытку.",
|
||||
"ui.unable_to_evaluate_your_answer": "Не удалось оценить ответ.",
|
||||
"ui.unable_to_evaluate_pronunciation": "Не удалось оценить произношение.",
|
||||
"ui.no_course_module_is_available_for_your_current_language_and": "Для вашего изучаемого языка и уровня пока нет модуля курса.",
|
||||
"ui.loading_a1_course_2": "Загрузка курса A1…",
|
||||
"ui.guided_a1_course": "Учебный курс A1",
|
||||
"ui.module_progress": "Прогресс модуля",
|
||||
"ui.additional_practice": "Дополнительная практика",
|
||||
"ui.review_vocabulary_and_grammar_your_progress_in_the_fixed_course": "Повторите лексику и грамматику. Прогресс фиксированного курса учитывается отдельно.",
|
||||
"ui.new_additional_exercise": "Новое дополнительное задание",
|
||||
"ui.loading_additional_exercises": "Загрузка дополнительных заданий…",
|
||||
"ui.preparing_a_suitable_exercise_this_can_take_up_to_25": "Подготавливается подходящее задание. Это может занять до 25 секунд.",
|
||||
"ui.unable_to_load_additional_exercise_2": "Не удалось загрузить дополнительное задание:",
|
||||
"ui.course_exercises": "Задания курса",
|
||||
"ui.your_additional_exercises": "Ваши дополнительные задания",
|
||||
"ui.exercise": "Задание",
|
||||
"ui.from_the_reviewed_exercise_bank_2": "Из проверенного банка заданий · ",
|
||||
"ui.created_with_ai_2": "Создано с помощью ИИ · ",
|
||||
"ui.created_with_flowise_2": "Создано с помощью Flowise · ",
|
||||
"ui.fixed_course_exercise_for_review": "Фиксированное задание для повторения · ",
|
||||
"ui.additional_practice_2": "Дополнительная практика · ",
|
||||
"ui.listen_first_the_spoken_text_appears_after_your_answer": "Сначала прослушайте запись. Текст появится после ответа.",
|
||||
"ui.checking": "Проверка…",
|
||||
"ui.you_can_listen_to_your_recording_or_record_again_before": "Перед оценкой вы можете прослушать запись или записать её заново.",
|
||||
"ui.correct_2": "Верно!",
|
||||
"ui.not_correct_yet": "Пока неверно.",
|
||||
"ui.example_answer": "Пример ответа:",
|
||||
"ui.listening_transcript_2": "Текст аудиозаписи:",
|
||||
"action.analyze_course_progress": "Анализ прогресса",
|
||||
"action.plan_course_task": "Планирование задания",
|
||||
"action.author_course_task": "Создание задания",
|
||||
"action.review_course_task": "Проверка задания",
|
||||
"action.author_course_exam": "Создание теста · 12 заданий",
|
||||
"action.review_course_exam": "Проверка теста · 12 заданий",
|
||||
"action.evaluate_course_attempt": "Оценка ответа",
|
||||
"action.summarize_course_exam": "Итоги теста",
|
||||
"action.next_exercise": "Создание упражнения на произношение",
|
||||
"course.modulesLabel": "Модули A1",
|
||||
"course.inventory": "Проверенный банк: {total} заданий · новых: {unseen}. После них доступны повторения.",
|
||||
"course.progress": "Заданий: {tasks} · ответов: {attempts} · средний балл: {score}/100",
|
||||
"admin.matches": "Найдено: {count}",
|
||||
"admin.page": "Страница {page} из {total}",
|
||||
"ai.access": "Доступ к API: DeepSeek — {deepseek} · Mistral — {mistral}",
|
||||
"ai.committed": "Занято за месяц: {month} · за сутки: {day} · открытые резервы: {open}",
|
||||
"ai.version": "Версия {version}. Изменения действуют для новых запросов; выполняемые запросы сохраняют свои настройки.",
|
||||
"ai.tokens": "Вызовов: {calls} · ввод: {input} · вывод: {output} токенов",
|
||||
"ai.costs": "Оценка стоимости: {cost} · открытые резервы: {reserved} · неизвестный расход у {unknown} вызовов",
|
||||
"ai.profileVersion": " · профиль v{version}",
|
||||
"ai.attempt": "{ms} мс · попытка {attempt}",
|
||||
"ai.reserved": "Зарезервировано: {cost}",
|
||||
"ai.range": "{from}–{to} из {total}",
|
||||
"legacy.completed": "Выполнено заданий: {done} из {total}",
|
||||
"legacy.correct": "Правильно выполнено заданий: {count}. «Выполнено» не означает «уровень A1 сдан».",
|
||||
"legacy.areaProgress": "Выполнено: {done}/{total} · достигнуто целей: {correct}",
|
||||
"recorder.percent": "{volume} %",
|
||||
"recorder.volume": "Громкость мониторинга: {volume} %",
|
||||
"phoneme.tooltip": "{word}: звук /{phoneme}/, {score} из 100 баллов",
|
||||
"language.content": "Ранее назначенные задания и сохранённая обратная связь сохраняют исходный язык.",
|
||||
"conversation.answer": "Ваш ответ в диалоге",
|
||||
"conversation.audioError": "Не удалось воспроизвести аудио.",
|
||||
"course.noVariant": "Для этого изучаемого языка пока нет полного банка заданий на вашем родном языке. История обучения остаётся доступной.",
|
||||
"course.examUnavailable": "Полный банк для теста A1 на вашем родном языке пока недоступен. Уже начатые тесты сохраняют свои задания.",
|
||||
"course.taskLanguage": "Язык этого сохранённого задания: {language}",
|
||||
"api.courseVariantUnavailable": "Для вашего родного языка здесь пока нет проверенного банка заданий.",
|
||||
"language.ru-RU": "Русский",
|
||||
"api.native_language_unsupported": "Этот родной язык пока не поддерживается.",
|
||||
"api.native_language_conflict": "Интерфейс и объяснения должны использовать один родной язык.",
|
||||
"api.invalid_credentials": "Неверная почта или пароль.",
|
||||
"api.invalid_email": "Введите действительный адрес электронной почты.",
|
||||
"api.password_too_short": "Пароль должен содержать не менее восьми символов.",
|
||||
"api.email_in_use": "Этот адрес электронной почты уже зарегистрирован.",
|
||||
"api.invalid_request": "Некорректный запрос. Проверьте введённые данные.",
|
||||
"api.authentication_required": "Войдите в аккаунт ещё раз.",
|
||||
"api.access_denied": "У вас нет доступа к этой функции.",
|
||||
"api.not_found": "Запрошенный материал не найден.",
|
||||
"api.operation_conflict": "В текущем состоянии действие невозможно. Обновите данные.",
|
||||
"api.upload_too_large": "Загружаемый файл слишком большой.",
|
||||
"api.unsupported_audio_format": "Этот аудиоформат не поддерживается.",
|
||||
"api.rate_limited": "Слишком много запросов. Повторите попытку позже.",
|
||||
"api.service_unavailable": "Сервис временно недоступен.",
|
||||
"api.request_timeout": "Время ожидания истекло. Повторите попытку.",
|
||||
"api.internal_error": "Не удалось обработать запрос. Повторите попытку позже.",
|
||||
"api.network_error": "Не удалось подключиться к серверу.",
|
||||
"api.invalid_json": "Некорректные данные JSON.",
|
||||
"api.microphone_permission_denied": "Разрешите доступ к микрофону в браузере.",
|
||||
"profile.observations.few": "{count} наблюдения",
|
||||
"profile.observations.many": "{count} наблюдений",
|
||||
"profile.contexts.few": "{count} слова",
|
||||
"profile.contexts.many": "{count} слов",
|
||||
"profile.tasks.few": "{count} задания",
|
||||
"profile.tasks.many": "{count} заданий",
|
||||
"seed.hello": "Чётко повторите предложение вслух.",
|
||||
"seed.from": "Обратите внимание на ритм предложения.",
|
||||
"seed.coffee": "Говорите медленно и чётко.",
|
||||
"seed.water": "Обратите внимание на конечные звуки.",
|
||||
"seed.phone": "Чётко произнесите каждую цифру отдельно.",
|
||||
"seed.intro.title": "Знакомство",
|
||||
"seed.cafe.title": "В кафе",
|
||||
"seed.numbers.title": "Числа",
|
||||
"seed.generated.title": "Упражнение на произношение",
|
||||
"seed.historical": "Исторический фиксированный курс: сохранённые задания и объяснения остаются на исходном языке. Новые задания на вашем родном языке доступны в текущем курсе A1."
|
||||
}
|
||||
@@ -5,7 +5,7 @@ import { useI18n, type MessageKey } from './I18n';
|
||||
type Message = string | { key: MessageKey; parameters?: Record<string, string | number> };
|
||||
|
||||
// Store local notices as keys so a language switch updates them immediately.
|
||||
// API errors remain original strings; saved feedback is never translated here.
|
||||
// API codes are localized; saved feedback retains its original language.
|
||||
export function useLocalizedMessage() {
|
||||
const { t } = useI18n();
|
||||
const [message, setMessage] = useState<Message>('');
|
||||
@@ -13,8 +13,33 @@ export function useLocalizedMessage() {
|
||||
}
|
||||
|
||||
export function errorMessage(error: unknown, fallback: MessageKey): Message {
|
||||
if (error instanceof ApiError && typeof error.payload === 'object' && error.payload !== null && 'code' in error.payload && error.payload.code === 'course_variant_unavailable') {
|
||||
return { key: 'api.courseVariantUnavailable' };
|
||||
if (error instanceof ApiError) {
|
||||
const key = apiErrors[error.code];
|
||||
return { key: key ?? fallback };
|
||||
}
|
||||
return error instanceof Error ? error.message : { key: fallback };
|
||||
if (error instanceof TypeError) return { key: 'api.network_error' };
|
||||
if (error instanceof SyntaxError) return { key: 'api.invalid_json' };
|
||||
if (error instanceof DOMException && ['NotAllowedError', 'PermissionDeniedError'].includes(error.name)) return { key: 'api.microphone_permission_denied' };
|
||||
return { key: fallback };
|
||||
}
|
||||
|
||||
const apiErrors: Record<string, MessageKey> = {
|
||||
course_variant_unavailable: 'api.courseVariantUnavailable',
|
||||
native_language_unsupported: 'api.native_language_unsupported',
|
||||
native_language_conflict: 'api.native_language_conflict',
|
||||
invalid_credentials: 'api.invalid_credentials',
|
||||
invalid_email: 'api.invalid_email',
|
||||
password_too_short: 'api.password_too_short',
|
||||
email_in_use: 'api.email_in_use',
|
||||
invalid_request: 'api.invalid_request',
|
||||
authentication_required: 'api.authentication_required',
|
||||
access_denied: 'api.access_denied',
|
||||
not_found: 'api.not_found',
|
||||
operation_conflict: 'api.operation_conflict',
|
||||
upload_too_large: 'api.upload_too_large',
|
||||
unsupported_audio_format: 'api.unsupported_audio_format',
|
||||
rate_limited: 'api.rate_limited',
|
||||
service_unavailable: 'api.service_unavailable',
|
||||
request_timeout: 'api.request_timeout',
|
||||
internal_error: 'api.internal_error',
|
||||
};
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { AIAdmin } from '../components/AIAdmin';
|
||||
import { useEffect, useState, type FormEvent } from 'react';
|
||||
@@ -22,7 +22,7 @@ export function AdminPage() {
|
||||
let cancelled = false;
|
||||
fetchAdminOverview()
|
||||
.then((data) => { if (!cancelled) setOverview(data); })
|
||||
.catch((error) => { if (!cancelled) setOverviewError(error instanceof Error ? error.message : { key: 'ui.unable_to_load_metrics' }); });
|
||||
.catch((error) => { if (!cancelled) setOverviewError(errorMessage(error, 'ui.unable_to_load_metrics')); });
|
||||
return () => { cancelled = true; };
|
||||
}, []);
|
||||
|
||||
@@ -30,7 +30,7 @@ export function AdminPage() {
|
||||
let cancelled = false;
|
||||
fetchAdminUsers(search, page)
|
||||
.then((data) => { if (!cancelled) { setUsers(data); setUsersError(''); } })
|
||||
.catch((error) => { if (!cancelled) setUsersError(error instanceof Error ? error.message : { key: 'ui.unable_to_load_users' }); });
|
||||
.catch((error) => { if (!cancelled) setUsersError(errorMessage(error, 'ui.unable_to_load_users')); });
|
||||
return () => { cancelled = true; };
|
||||
}, [search, page]);
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { Play, Send } from 'lucide-react';
|
||||
import { FormEvent, useState } from 'react';
|
||||
@@ -24,7 +24,7 @@ export function ConversationPage() {
|
||||
setLastAudio(response.audio);
|
||||
setTurns([{ speaker: 'teacher', text: response.teacher.tts_text || response.teacher.target_text }]);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : { key: 'ui.unable_to_start_conversation' });
|
||||
setError(errorMessage(err, 'ui.unable_to_start_conversation'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -42,7 +42,7 @@ export function ConversationPage() {
|
||||
setLastAudio(response.audio);
|
||||
setTurns((current) => [...current, { speaker: 'teacher', text: response.teacher.tts_text || response.teacher.target_text }]);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : { key: 'ui.reply_failed' });
|
||||
setError(errorMessage(err, 'ui.reply_failed'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
|
||||
@@ -12,7 +12,7 @@ import { AdaptiveExercise } from '../components/AdaptiveExercise';
|
||||
import { LegacyCoursePage } from './LegacyCoursePage';
|
||||
|
||||
type SavedView = { module: string; task?: string; job?: string; exam?: string };
|
||||
export function CoursePage({ onInstructionLanguageChange }: { onInstructionLanguageChange: (language: string) => Promise<void> }) {
|
||||
export function CoursePage() {
|
||||
const { t, language } = useI18n();
|
||||
const courseSkillNames = useCourseSkillNames();
|
||||
const stageNames: Record<string, string> = { queued: t('ui.job_saved'), starting: t('ui.preparing'), analyzing: t('ui.analysing_learning_progress'), planning: t('ui.planning_an_exercise'), generating_and_reviewing: t('ui.creating_and_reviewing_an_exercise'), evaluating: t('ui.evaluating_your_answer'), generating_and_reviewing_exam: t('ui.creating_and_reviewing_twelve_test_questions') };
|
||||
@@ -48,6 +48,10 @@ export function CoursePage({ onInstructionLanguageChange }: { onInstructionLangu
|
||||
async function refreshCatalog() {
|
||||
const result = await getCourseCatalog(); if (active.current) setCatalog(result);
|
||||
}
|
||||
useEffect(() => {
|
||||
generationID.current = null; examRequestID.current = null;
|
||||
if (catalog) void refreshCatalog().catch(showError);
|
||||
}, [language]);
|
||||
useEffect(() => { active.current = true; return () => { active.current = false; }; }, []);
|
||||
useEffect(() => {
|
||||
let valid = true; setRestored(false); setError('');
|
||||
@@ -92,7 +96,7 @@ export function CoursePage({ onInstructionLanguageChange }: { onInstructionLangu
|
||||
if (current.kind === 'exam' && current.subject_id) { const result = await getCourseExam(current.subject_id); if (!valid) return; setExam(result); if (result.tasks[0]) { setTask(result.tasks[0]); setAttempt(null); } }
|
||||
setJob(null); await refreshCatalog();
|
||||
if (valid) requestAnimationFrame(() => exerciseRef.current?.scrollIntoView({ block: 'center', behavior: 'smooth' }));
|
||||
} else if (current.status === 'failed') { setError(current.error ?? { key: 'ui.unable_to_complete_the_job' }); }
|
||||
} else if (current.status === 'failed') { setError({ key: 'ui.unable_to_complete_the_job' }); }
|
||||
else { timer = window.setTimeout(poll, 1200); }
|
||||
} catch (err) { if (valid) { showError(err); timer = window.setTimeout(poll, 4000); } }
|
||||
}
|
||||
@@ -143,16 +147,6 @@ export function CoursePage({ onInstructionLanguageChange }: { onInstructionLangu
|
||||
try { await request('/me/preferences', { method: 'PATCH', body: JSON.stringify({ target_language: language, cefr_level: 'A1', daily_goal_minutes: catalog?.profile.daily_goal_minutes ?? 10 }) }); setTask(null); setAttempt(null); setJob(null); setExam(null); generationID.current = null; examRequestID.current = null; setRevision((n) => n + 1); }
|
||||
catch (err) { showError(err); } finally { setBusy(false); }
|
||||
}
|
||||
async function changeInstructionLanguage(next: string) {
|
||||
if (locked) return;
|
||||
setBusy(true); setError('');
|
||||
try {
|
||||
await onInstructionLanguageChange(next);
|
||||
generationID.current = null; examRequestID.current = null;
|
||||
await refreshCatalog();
|
||||
} catch (err) { showError(err); }
|
||||
finally { setBusy(false); }
|
||||
}
|
||||
async function startExam() {
|
||||
if (locked) return; setBusy(true); setError('');
|
||||
try { examRequestID.current ??= courseRequestID(); const result = await createCourseExam(examRequestID.current); examRequestID.current = null; setExam(result.exam); setJob(result.job); setTask(null); setAttempt(null); }
|
||||
@@ -177,21 +171,11 @@ export function CoursePage({ onInstructionLanguageChange }: { onInstructionLangu
|
||||
const inventory=(catalog.bank??[]).filter(p=>p.module_id===moduleID && (!skill||p.skill===skill));
|
||||
const evaluating = attempt?.status === 'pending';
|
||||
const noVariant = catalog.task_mode === 'bank' && inventory.reduce((sum, item) => sum + item.total, 0) === 0;
|
||||
const instructionLanguage = catalog.instruction_language ?? 'de-DE';
|
||||
const instructionName = (code: string) => code === 'de-DE' ? t('language.de-DE') : code === 'en-US' ? t('language.en-US') : code;
|
||||
return <div className="view-stack">
|
||||
<header className="view-header"><div><p className="eyebrow">{t('ui.adaptive_language_course_a1')}</p><h1>{t('ui.your_a1_course')}</h1><p className="muted">{t('ui.seven_modules_six_learning_areas_and_new_exercises_suited_to')}</p></div>
|
||||
<label>{t('ui.learning_language')}<select disabled={locked} value={catalog.profile.target_language} onChange={(event) => void changeLanguage(event.target.value)}>{catalog.languages.map((l) => <option key={l.code} value={l.code}>{l.display_name}{catalog.enabled_languages.includes(l.code) ? '' : t('ui.course_not_yet_available')}</option>)}</select></label>
|
||||
</header>
|
||||
{catalog.task_mode === 'bank' && <section className="panel view-stack">
|
||||
<label>{t('course.instructionLanguage')}<select disabled={locked} value={instructionLanguage} onChange={(event) => void changeInstructionLanguage(event.target.value)}>
|
||||
{!(catalog.instruction_languages ?? ['de-DE']).includes(instructionLanguage) && <option value={instructionLanguage}>{instructionName(instructionLanguage)}</option>}
|
||||
{(catalog.instruction_languages ?? ['de-DE']).map((code) => <option key={code} value={code}>{instructionName(code)}</option>)}
|
||||
</select></label>
|
||||
<p className="muted">{t('course.instructionScope')}</p>
|
||||
{instructionLanguage === 'en-US' && <p>{t('course.englishPilot')}</p>}
|
||||
{error && <p className="form-error" role="alert">{error}</p>}
|
||||
</section>}
|
||||
|
||||
{catalog.modules.length === 0 ? <section className="panel"><p>{t('ui.a_reviewed_a1_course_pack_is_not_yet_available_for')}</p></section> : <>
|
||||
<section className="panel course-analysis"><h2>{t('ui.your_learning_progress')}</h2><p>{catalog.task_mode === 'bank' ? t('ui.exercises_are_selected_using_your_saved_evaluations_new_exercises_come') : catalog.analysis?.summary ?? t('ui.no_ai_learning_analysis_yet_the_teacher_agent_creates_it')}</p>
|
||||
{catalog.analysis && catalog.analysis.facts_version < catalog.facts_version && <p className="muted" role="status">{t('ui.the_learning_analysis_is_being_updated_after_your_latest_answer')}</p>}
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import { useExercisePresentation } from '../i18n/exercisePresentation';
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { ArrowRight, Clock, Gauge } from 'lucide-react';
|
||||
import { useEffect, useState } from 'react';
|
||||
@@ -10,9 +12,10 @@ type Props = {
|
||||
};
|
||||
|
||||
export function DashboardPage({ onPractice, onLoaded }: Props) {
|
||||
const presentation = useExercisePresentation();
|
||||
const { t } = useI18n();
|
||||
const [dashboard, setDashboard] = useState<Dashboard | null>(null);
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
|
||||
useEffect(() => {
|
||||
let cancelled = false;
|
||||
@@ -23,7 +26,7 @@ export function DashboardPage({ onPractice, onLoaded }: Props) {
|
||||
onLoaded(data.next_lesson, data.next_exercise);
|
||||
})
|
||||
.catch((err) => {
|
||||
if (!cancelled) setError(err instanceof Error ? err.message : t('dashboard.error'));
|
||||
if (!cancelled) setError(errorMessage(err, 'dashboard.error'));
|
||||
});
|
||||
return () => { cancelled = true; };
|
||||
}, []);
|
||||
@@ -64,10 +67,10 @@ export function DashboardPage({ onPractice, onLoaded }: Props) {
|
||||
<section className="panel lesson-panel">
|
||||
<div>
|
||||
<p className="eyebrow">{dashboard.next_lesson.topic}</p>
|
||||
<h2>{dashboard.next_lesson.title}</h2>
|
||||
<h2>{presentation(dashboard.next_lesson, dashboard.next_exercise).title}</h2>
|
||||
<p className="target-text" lang={dashboard.next_exercise.target_language} dir="auto">{dashboard.next_exercise.target_text}</p>
|
||||
</div>
|
||||
<p className="muted" lang={dashboard.user.instruction_language} dir="auto">{dashboard.next_exercise.prompt_text}</p>
|
||||
<p className="muted" lang={presentation(dashboard.next_lesson, dashboard.next_exercise).promptLanguage} dir="auto">{presentation(dashboard.next_lesson, dashboard.next_exercise).prompt}</p>
|
||||
</section>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
import { fetchCourseAudio, fetchCourseModule, fetchCourseModules, fetchCoursePractice, nextCoursePractice, submitCourseAnswer } from '../api/course';
|
||||
@@ -53,7 +53,7 @@ export function LegacyCoursePage() {
|
||||
if (active) { setDetail(loaded); setSelectedId(loaded.tasks.find((task) => !task.attempted)?.id ?? loaded.tasks[0]?.id ?? ''); setLoaded(true); }
|
||||
const practice = await fetchCoursePractice(loaded.module.id);
|
||||
if (active) setPracticeTasks(practice.tasks);
|
||||
}).catch((err) => { if (active) { setError(err instanceof Error ? err.message : { key: 'ui.unable_to_load_course' }); setLoaded(true); } }).finally(() => { if (active) setPracticeLoading(false); });
|
||||
}).catch((err) => { if (active) { setError(errorMessage(err, 'ui.unable_to_load_course')); setLoaded(true); } }).finally(() => { if (active) setPracticeLoading(false); });
|
||||
return () => { active = false; };
|
||||
}, []);
|
||||
|
||||
@@ -114,7 +114,7 @@ export function LegacyCoursePage() {
|
||||
exerciseRef.current?.scrollIntoView({ block: 'start', behavior: 'smooth' });
|
||||
});
|
||||
} catch (err) {
|
||||
setPracticeError(err instanceof Error ? err.message : { key: 'ui.unable_to_load_additional_exercise' });
|
||||
setPracticeError(errorMessage(err, 'ui.unable_to_load_additional_exercise'));
|
||||
} finally { setBusy(false); setGenerating(false); }
|
||||
}
|
||||
|
||||
@@ -143,7 +143,7 @@ export function LegacyCoursePage() {
|
||||
const response = await submitCourseAnswer(task.id, answer);
|
||||
setResult(response);
|
||||
await refresh();
|
||||
} catch (err) { setError(err instanceof Error ? err.message : { key: 'ui.unable_to_evaluate_your_answer' }); }
|
||||
} catch (err) { setError(errorMessage(err, 'ui.unable_to_evaluate_your_answer')); }
|
||||
finally { setBusy(false); }
|
||||
}
|
||||
|
||||
@@ -155,7 +155,7 @@ export function LegacyCoursePage() {
|
||||
setPronResult(response);
|
||||
setRecorded(null);
|
||||
await refresh();
|
||||
} catch (err) { setError(err instanceof Error ? err.message : { key: 'ui.unable_to_evaluate_pronunciation' }); }
|
||||
} catch (err) { setError(errorMessage(err, 'ui.unable_to_evaluate_pronunciation')); }
|
||||
finally { setBusy(false); }
|
||||
}
|
||||
|
||||
@@ -167,6 +167,7 @@ export function LegacyCoursePage() {
|
||||
|
||||
return (
|
||||
<div className="view-stack">
|
||||
<p className="muted">{t('seed.historical')}</p>
|
||||
<header className="view-header">
|
||||
<div><p className="eyebrow">{t('ui.guided_a1_course')}</p><h1>{detail.module.title}</h1><p className="muted">{detail.module.description}</p></div>
|
||||
</header>
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { LogIn } from 'lucide-react';
|
||||
import { FormEvent, useState } from 'react';
|
||||
@@ -12,7 +13,7 @@ export function LoginPage({ onDone, onRegister }: Props) {
|
||||
const { t } = useI18n();
|
||||
const [email, setEmail] = useState('');
|
||||
const [password, setPassword] = useState('');
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
async function submit(event: FormEvent) {
|
||||
@@ -23,7 +24,7 @@ export function LoginPage({ onDone, onRegister }: Props) {
|
||||
await login(email, password);
|
||||
onDone();
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : t('auth.loginError'));
|
||||
setError(errorMessage(err, 'auth.loginError'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useExercisePresentation } from '../i18n/exercisePresentation';
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { RotateCcw, Send, Volume2 } from 'lucide-react';
|
||||
import { useEffect, useRef, useState } from 'react';
|
||||
@@ -15,6 +16,7 @@ type Props = {
|
||||
};
|
||||
|
||||
export function PracticePage({ initialSelection }: Props) {
|
||||
const presentation = useExercisePresentation();
|
||||
const { t } = useI18n();
|
||||
const [lesson, setLesson] = useState<Lesson | null>(initialSelection?.lesson ?? null);
|
||||
const [exercise, setExercise] = useState<Exercise | null>(initialSelection?.exercise ?? null);
|
||||
@@ -115,7 +117,7 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
recentExerciseIds.current = [...recentExerciseIds.current, next.exercise.id].slice(-3);
|
||||
}
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : { key: 'ui.unable_to_load_exercise' });
|
||||
setError(errorMessage(err, 'ui.unable_to_load_exercise'));
|
||||
} finally {
|
||||
setLoadingNext(false);
|
||||
}
|
||||
@@ -130,7 +132,7 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
try {
|
||||
setResult(await submitAttempt(exercise.id, audio));
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : { key: 'ui.evaluation_failed' });
|
||||
setError(errorMessage(err, 'ui.evaluation_failed'));
|
||||
} finally {
|
||||
submittingRef.current = false;
|
||||
setLoading(false);
|
||||
@@ -152,7 +154,7 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
<div className="view-stack">
|
||||
<header className="view-header">
|
||||
<div>
|
||||
<p className="eyebrow">{lesson.title}</p>
|
||||
<p className="eyebrow">{presentation(lesson, exercise).title}</p>
|
||||
<h1>{t('nav.practice')}</h1>
|
||||
</div>
|
||||
<button className="ghost-button" disabled={loadingNext || loading || recording} onClick={() => void loadNext(true)}>
|
||||
@@ -164,7 +166,7 @@ export function PracticePage({ initialSelection }: Props) {
|
||||
{notice && <p className="muted">{notice}</p>}
|
||||
|
||||
<section className="panel practice-panel">
|
||||
<p className="muted">{exercise.prompt_text}</p>
|
||||
<p className="muted" lang={presentation(lesson, exercise).promptLanguage} dir="auto">{presentation(lesson, exercise).prompt}</p>
|
||||
{exercise.training_reason&&<p className="muted" role="note">{t('ui.why_this_exercise')} {exercise.training_reason}</p>}
|
||||
<PronunciationText language={exercise.target_language} targetText={exercise.target_text} words={result?.attempt.word_scores} />
|
||||
<div className="action-row">
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { fetchProgress } from '../api/lessons';
|
||||
@@ -8,10 +9,10 @@ import { ScoreBadge } from '../components/ScoreBadge';
|
||||
export function ProgressPage() {
|
||||
const { t, language } = useI18n();
|
||||
const [progress, setProgress] = useState<ProgressSummary | null>(null);
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
|
||||
useEffect(() => {
|
||||
fetchProgress().then(setProgress).catch((err) => setError(err instanceof Error ? err.message : t('progress.error')));
|
||||
fetchProgress().then(setProgress).catch((err) => setError(errorMessage(err, 'progress.error')));
|
||||
}, []);
|
||||
|
||||
if (error) return <p className="form-error">{error}</p>;
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { errorMessage, useLocalizedMessage } from '../i18n/useLocalizedMessage';
|
||||
import { useI18n } from '../i18n/I18n';
|
||||
import { UserPlus } from 'lucide-react';
|
||||
import { FormEvent, useState } from 'react';
|
||||
@@ -12,7 +13,7 @@ export function RegisterPage({ onDone, onLogin }: Props) {
|
||||
const { t, language } = useI18n();
|
||||
const [email, setEmail] = useState('');
|
||||
const [password, setPassword] = useState('');
|
||||
const [error, setError] = useState('');
|
||||
const [error, setError] = useLocalizedMessage();
|
||||
const [loading, setLoading] = useState(false);
|
||||
|
||||
async function submit(event: FormEvent) {
|
||||
@@ -23,7 +24,7 @@ export function RegisterPage({ onDone, onLogin }: Props) {
|
||||
await register(email, password, language);
|
||||
onDone();
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err.message : t('auth.registerError'));
|
||||
setError(errorMessage(err, 'auth.registerError'));
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
|
||||
+17
-30
@@ -5,9 +5,9 @@ synthetischen Mikrofonsignal: standardmäßig keine Mithörbedienung und kein
|
||||
Mithörpfad; nach expliziter Freigabe über `enableMonitoring` zunächst ausgeschaltetes Mithören, Schalter und
|
||||
Lautstärke während der Aufnahme, tatsächliche Signalpegel, unveränderte
|
||||
WAV-Aufnahme, Stoppen und Unmount, Mikrofonfehler mit erneutem Versuch sowie
|
||||
automatisches Zeitlimit und schmale Ansicht. Ein Wechsel Deutsch → Englisch
|
||||
automatisches Zeitlimit und schmale Ansicht. Ein Wechsel Deutsch → Russisch
|
||||
→ Deutsch während einer Aufnahme darf keinen neuen Stream starten oder die
|
||||
Aufnahme abbrechen; auch englische Aufnahme- und Monitoringbeschriftungen werden
|
||||
Aufnahme abbrechen; auch russische Aufnahme- und Monitoringbeschriftungen werden
|
||||
geprüft. Benötigt Web-Abhängigkeiten und
|
||||
Playwright mit Chromium, aber keine API oder Datenbank. Aus `apps/web`:
|
||||
|
||||
@@ -37,36 +37,23 @@ go test ./internal/httpapi -run TestPronunciationBrowserSmoke -v -count=1
|
||||
Auch diese Fixture benötigt den freien Port 15175. Alle drei Browser-Smokes
|
||||
nacheinander ausführen, nicht parallel.
|
||||
|
||||
`languages.e2e.cjs` läuft vor dem Kursbank-Smoke in derselben lokalen Fixture.
|
||||
Es prüft vollständige Übersetzungsschlüssel/Platzhalter, Sprachwahl vor dem Login,
|
||||
Registrierung, Wiederanmeldung mit Kontosprache, Speicherung nach Neuladen,
|
||||
getrennte Erklärungssprache und fehlgeschlagene Speichervorgänge. Die Bedienung
|
||||
von Aussprache, Dialog, Administration und festem Altkurs wird auf Englisch
|
||||
geprüft. Eingegebene Dialogantworten und ungespeicherte Budgetfelder müssen einen
|
||||
Sprachwechsel überstehen; die Sprachwahl darf diese Felder nicht speichern.
|
||||
Lokale Statusmeldungen wechseln mit der Oberfläche ihre Sprache. Ein UI-only-PATCH
|
||||
muss die aktive Lernsprache, A2-Niveau und ein abweichendes Tagesziel erhalten.
|
||||
Die Kontoeinstellungen der Fixture werden vor dem anschließenden Bank-Smoke zurückgesetzt.
|
||||
Alle Konten und Änderungen liegen ausschließlich in dessen zufälligem Testschema.
|
||||
`languages.e2e.cjs` prüft deutsche/russische Kataloge und Platzhalter, die beiden
|
||||
Muttersprachen vor dem Login, Registrierung, Kontosprache nach Anmeldung/Reload,
|
||||
gekoppelte Kompatibilitätsfelder, abgewiesene Konflikte und fehlgeschlagene
|
||||
Speicherung. Ein Sprachwechsel erhält Lernsprache, A2-Niveau und Tagesziel.
|
||||
API-Fehler wechseln anhand ihrer Codes mit der Oberfläche die Sprache.
|
||||
|
||||
`course-variants.e2e.cjs` läuft zusätzlich mit einem neuen regulären Testkonto.
|
||||
Es prüft die Erklärungssprachwahl unabhängig von der Oberfläche, alle zwölf
|
||||
Pilotvarianten, die fünf Darstellungen, angepasste Bedeutungs-/Schreibaufgaben,
|
||||
private Hörtexte und Lösungsschlüssel, unbenotete Antworten, Reload und die
|
||||
unveränderte historische Ansicht nach einem Präferenzwechsel. Fehlende englische
|
||||
Module erhalten keine deutschen Reserven; neue englische Tests werden abgelehnt,
|
||||
während ein vorhandener deutscher Test über dieselbe Request-ID fortgesetzt
|
||||
wird. Der Test löst keine Modellaufrufe aus. Der gesamte Bank-Smoke läuft danach
|
||||
weiterhin vollständig auf Deutsch und Englisch als Oberflächensprache.
|
||||
`course-variants.e2e.cjs` verwendet ein neues reguläres Konto. Es prüft den
|
||||
russischen Bestand mit 840 Aufgaben, sieben Modulen und sechs Lernbereichen,
|
||||
Sprachrollen, private Hörtexte/Lösungen, unbenotete Antworten sowie eingefrorene
|
||||
Aufgaben nach Sprachwechsel und Reload. Ein russischer Test mit zwölf Aufgaben
|
||||
bleibt nach einem Wechsel über dieselbe Request-ID unverändert abrufbar.
|
||||
|
||||
`course-bank.e2e.cjs` prüft den Kurs mit 840 Aufgaben, sieben Modulen, allen sechs
|
||||
Lernbereichen und den fünf Darstellungsformen. Geprüft werden außerdem neue
|
||||
Aufgabenzuweisungen, Neuladen, unbewertete offene Antworten mit Selbstvergleich
|
||||
und ein vollständig abgegebener Test ohne vorzeitige Note oder Lösungsausgabe.
|
||||
Die Prüfung läuft vollständig auf Deutsch und Englisch und bestätigt, dass dabei
|
||||
keine Modellaufrufe erfasst werden. Sichtbare Aufgaben und Auswahloptionen müssen
|
||||
den gespeicherten Originalen entsprechen; eine eingegebene Schreibantwort muss
|
||||
beim Wechsel der Oberflächensprache erhalten bleiben.
|
||||
`course-bank.e2e.cjs` läuft vollständig mit deutscher und russischer Muttersprache:
|
||||
Aufgabenzuweisung, Bedienung aller fünf Darstellungen, Antwort/Reload, Eingabeerhalt
|
||||
beim Sprachwechsel und vollständig abgegebener Test ohne vorzeitige Note oder
|
||||
Lösungsausgabe. Alle Konten leben im zufälligen lokalen Testschema. Audio und
|
||||
Modelle sind Fixtures; kein Test bestätigt Live-Modell- oder echte Audioqualität.
|
||||
|
||||
Aus `apps/api` mit den unten beschriebenen Voraussetzungen:
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ const assert=require('node:assert/strict');
|
||||
// A failed detail request must be visible at the same place as successful details.
|
||||
await page.route('**/admin/ai/calls/*',route=>route.fulfill({status:503,contentType:'application/json',body:JSON.stringify({error:'Details-Testfehler'})}));
|
||||
await admin.getByRole('button',{name:'Anzeigen',exact:true}).first().click();
|
||||
await details.getByRole('alert').filter({hasText:'Details-Testfehler'}).waitFor();
|
||||
await details.getByRole('alert').filter({hasText:'Der Dienst ist vorübergehend nicht verfügbar.'}).waitFor();
|
||||
await details.getByRole('button',{name:'Schließen',exact:true}).click();
|
||||
await page.unroute('**/admin/ai/calls/*');
|
||||
await page.getByRole('button',{name:'A1-Kurs',exact:true}).click();
|
||||
|
||||
@@ -66,7 +66,7 @@ const { chromium } = require(process.env.PLAYWRIGHT_MODULE || 'playwright');
|
||||
}
|
||||
};
|
||||
navigator.mediaDevices.getUserMedia = async () => {
|
||||
if (window.rejectMic) throw new Error('Test: Mikrofon verweigert');
|
||||
if (window.rejectMic) throw new Error('Mikrofon nicht verfuegbar');
|
||||
const context = new RealContext();
|
||||
await context.resume();
|
||||
const oscillator = context.createOscillator();
|
||||
@@ -141,24 +141,24 @@ const { chromium } = require(process.env.PLAYWRIGHT_MODULE || 'playwright');
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).waitFor();
|
||||
await page.evaluate(() => window.rejectMic = true);
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).click();
|
||||
await page.getByText('Test: Mikrofon verweigert', { exact: true }).waitFor();
|
||||
await page.getByText('Mikrofon nicht verfuegbar', { exact: true }).waitFor();
|
||||
await page.evaluate(() => { window.rejectMic = false; window.renderRecorder(1); });
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).click();
|
||||
await page.waitForFunction(() => window.blobs.length === 1 && window.contexts.every(c => c.state === 'closed'));
|
||||
await page.evaluate(() => { window.renderRecorder(undefined, true); window.setRecorderLanguage('en-US'); });
|
||||
await page.getByRole('button', { name: 'Record', exact: true }).click();
|
||||
await page.getByRole('button', { name: 'Stop', exact: true }).waitFor();
|
||||
await page.evaluate(() => { window.renderRecorder(undefined, true); window.setRecorderLanguage('ru-RU'); });
|
||||
await page.getByRole('button', { name: 'Записать', exact: true }).click();
|
||||
await page.getByRole('button', { name: 'Остановить', exact: true }).waitFor();
|
||||
const streamsBefore = await page.evaluate(() => window.streams.length);
|
||||
const blobsBefore = await page.evaluate(() => window.blobs.length);
|
||||
await page.evaluate(() => window.setRecorderLanguage('de-DE'));
|
||||
await page.getByRole('button', { name: 'Stoppen', exact: true }).waitFor();
|
||||
assert.equal(await page.evaluate(() => window.streams.length), streamsBefore);
|
||||
assert.equal(await page.evaluate(() => window.contexts.at(-1).state), 'running');
|
||||
await page.evaluate(() => window.setRecorderLanguage('en-US'));
|
||||
await page.getByRole('switch', { name: 'Monitor your own voice' }).waitFor();
|
||||
await page.getByRole('slider', { name: 'Monitoring volume', exact: true }).waitFor();
|
||||
await page.evaluate(() => window.setRecorderLanguage('ru-RU'));
|
||||
await page.getByRole('switch', { name: 'Слышать свой голос' }).waitFor();
|
||||
await page.getByRole('slider', { name: 'Громкость мониторинга', exact: true }).waitFor();
|
||||
await page.waitForFunction(() => window.captures.at(-1).samples > 0);
|
||||
await page.getByRole('button', { name: 'Stop', exact: true }).click();
|
||||
await page.getByRole('button', { name: 'Остановить', exact: true }).click();
|
||||
await page.waitForFunction(count => window.blobs.length === count + 1, blobsBefore);
|
||||
assert.deepEqual(errors, []);
|
||||
await page.setViewportSize({ width: 320, height: 800 });
|
||||
|
||||
@@ -3,25 +3,23 @@ const assert=require('node:assert/strict');
|
||||
const crypto=require('node:crypto');
|
||||
(async()=>{
|
||||
const api=process.env.AI_E2E_API,token=process.env.AI_E2E_TOKEN,url=process.env.AI_E2E_URL;assert(api&&token&&url);
|
||||
const english=process.env.UI_E2E_LANGUAGE==='en-US';
|
||||
const translations={
|
||||
'A1-Kurs':'A1 course','A1-Module':'A1 modules','Lernbereich':'Learning area','Aktuelle Kursaufgabe':'Current course exercise','Nächste Aufgabe':'Next exercise','Aus geprüftem Aufgabenbestand':'From the reviewed exercise bank','Grammatik':'Grammar','Antwort prüfen':'Check answer','100 / 100 · Richtig':'100 / 100 · Correct','Wortschatz':'Vocabulary','Lesen':'Reading','Hören':'Listening','Anhören':'Listen','Sprechen':'Speaking','Bis zu 30 Sekunden.':'Up to 30 seconds.','Schreiben':'Writing','Deine Antwort':'Your answer','Antwort gespeichert – ohne verbindliche Note.':'Answer saved without a grade.','Beispiel:':'Example:','Bewertung anfordern':'Request evaluation','Neuen A1-Test starten · 12 Aufgaben':'Start a new A1 test · 12 questions','A1-Test':'A1 test','Abgegeben – Bewertung ausstehend.':'Submitted – evaluation pending.','Ausstehende Antworten bewerten':'Evaluate pending answers'
|
||||
};
|
||||
const label=value=>english?(translations[value]??value):value;
|
||||
const russian=process.env.UI_E2E_LANGUAGE==='ru-RU';
|
||||
const translations={"A1-Kurs": "Курс A1", "A1-Module": "Модули A1", "Lernbereich": "Направление обучения", "Aktuelle Kursaufgabe": "Текущее задание курса", "Nächste Aufgabe": "Следующее задание", "Aus geprüftem Aufgabenbestand": "Из проверенного банка заданий", "Grammatik": "Грамматика", "Antwort prüfen": "Проверить ответ", "Wortschatz": "Лексика", "Lesen": "Чтение", "Hören": "Аудирование", "Anhören": "Прослушать", "Sprechen": "Говорение", "Schreiben": "Письмо", "Deine Antwort": "Ваш ответ", "Beispiel:": "Пример:", "Bewertung anfordern": "Запросить оценку", "Neuen A1-Test starten · 12 Aufgaben": "Начать новый тест A1 · 12 заданий", "A1-Test": "Тест A1", "Ausstehende Antworten bewerten": "Оценить ожидающие ответы", "100 / 100 · Richtig": "100 / 100 · Верно", "Bis zu 30 Sekunden.": "До 30 секунд.", "Antwort gespeichert – ohne verbindliche Note.": "Ответ сохранён без оценки.", "Abgegeben – Bewertung ausstehend.": "Ответы отправлены — ожидается оценка."};
|
||||
const label=value=>russian?(translations[value]??value):value;
|
||||
const browser=await chromium.launch({headless:true,args:['--no-sandbox']});
|
||||
try{
|
||||
const page=await browser.newPage();page.setDefaultTimeout(15000);const errors=[];page.on('pageerror',e=>errors.push(e.message));const headers={Authorization:`Bearer ${token}`};
|
||||
const get=async path=>{const r=await page.request.get(api+path,{headers});assert.equal(r.status(),200);return r.json()};
|
||||
const post=async(path,data)=>{const r=await page.request.post(api+path,{headers,data});assert(r.status()<300,await r.text());return r.json()};
|
||||
await page.goto(url);await page.evaluate(t=>localStorage.setItem('speech_token',t),token);await page.reload();if(english)await page.getByRole('combobox',{name:'Oberflächensprache'}).selectOption('en-US');await page.getByRole('button',{name:label('A1-Kurs'),exact:true}).click();
|
||||
await page.request.patch(api+'/me/preferences',{headers,data:{native_language:russian?'ru-RU':'de-DE'}});await page.goto(url);await page.evaluate(t=>localStorage.setItem('speech_token',t),token);await page.reload();await page.getByRole('button',{name:label('A1-Kurs'),exact:true}).click();
|
||||
const cat=await get('/course/catalog');assert.equal(cat.task_mode,'bank');assert.equal(cat.grading_available,false);assert.equal(cat.bank.reduce((n,b)=>n+b.total,0),840);
|
||||
const modules=page.getByRole('navigation',{name:label('A1-Module')}).getByRole('button');await modules.nth(6).waitFor();assert.equal(await modules.count(),7);await modules.nth(1).click();
|
||||
const areas=page.getByRole('group',{name:label('Lernbereich')}),ex=page.getByRole('region',{name:label('Aktuelle Kursaufgabe')});
|
||||
async function next(area){await areas.getByRole('button',{name:label(area),exact:true}).click();const response=page.waitForResponse(r=>r.url().endsWith('/tasks/next')&&r.request().method()==='POST');await page.getByRole('button',{name:label('Nächste Aufgabe'),exact:true}).click();let j=await(await response).json();for(let n=0;n<40&&j.status!=='succeeded';n++){await page.waitForTimeout(150);j=await get('/course/jobs/'+j.id);if(j.status==='failed')throw new Error(j.error)}assert.equal(j.source,'curated');await ex.getByText(label('Aus geprüftem Aufgabenbestand'),{exact:false}).waitFor();await page.getByRole('button',{name:label('Nächste Aufgabe'),exact:true}).waitFor({state:'visible'});return get('/course/tasks/'+j.task_id)}
|
||||
let d=await next('Grammatik');const first=d.task.id;assert.equal(d.task.answer_key,undefined);assert.equal(await ex.getByRole('heading',{level:2}).innerText(),d.task.prompt);assert.deepEqual(await ex.locator('.course-option').allTextContents(),d.task.options.map(o=>o.label));await ex.getByRole('radio').first().check();await ex.getByRole('button',{name:label('Antwort prüfen'),exact:true}).click();await ex.getByRole('status').waitFor();d=await get('/course/tasks/'+first);await ex.locator('input[value="'+d.task.answer_key.correct_option_id+'"]').check();await ex.getByRole('button',{name:label('Antwort prüfen'),exact:true}).click();await ex.getByText(label('100 / 100 · Richtig'),{exact:true}).waitFor();
|
||||
let d=await next('Grammatik');const first=d.task.id;assert.equal(d.task.answer_key,undefined);assert.equal(await ex.getByRole('heading',{level:2}).innerText(),(d.task.instruction||d.task.prompt));assert.deepEqual(await ex.locator('.course-option').allTextContents(),d.task.options.map(o=>o.label));await ex.getByRole('radio').first().check();await ex.getByRole('button',{name:label('Antwort prüfen'),exact:true}).click();await ex.getByRole('status').waitFor();d=await get('/course/tasks/'+first);await ex.locator('input[value="'+d.task.answer_key.correct_option_id+'"]').check();await ex.getByRole('button',{name:label('Antwort prüfen'),exact:true}).click();await ex.getByText(label('100 / 100 · Richtig'),{exact:true}).waitFor();
|
||||
await page.reload();await page.getByRole('button',{name:label('A1-Kurs'),exact:true}).click();await ex.getByText(label('100 / 100 · Richtig'),{exact:true}).waitFor();d=await next('Grammatik');assert.notEqual(d.task.id,first);
|
||||
await next('Wortschatz');await next('Lesen');await ex.locator('.course-passage').waitFor();d=await next('Hören');assert.equal(d.task.audio_text,undefined);await ex.getByRole('button',{name:label('Anhören'),exact:true}).waitFor();
|
||||
await next('Sprechen');await ex.getByText(label('Bis zu 30 Sekunden.'),{exact:false}).waitFor();d=await next('Schreiben');await ex.getByRole('textbox',{name:label('Deine Antwort')}).fill('I have got a sister.');if(english){await page.getByRole('combobox',{name:'Interface language'}).selectOption('de-DE');const germanExercise=page.getByRole('region',{name:'Aktuelle Kursaufgabe'});await germanExercise.getByRole('textbox',{name:'Deine Antwort'}).waitFor();assert.equal(await germanExercise.getByRole('textbox',{name:'Deine Antwort'}).inputValue(),'I have got a sister.');assert.equal(await germanExercise.getByRole('heading',{level:2}).innerText(),d.task.prompt);await page.getByRole('combobox',{name:'Oberflächensprache'}).selectOption('en-US');}await ex.getByRole('button',{name:label('Antwort prüfen'),exact:true}).click();await ex.getByText(label('Antwort gespeichert – ohne verbindliche Note.'),{exact:false}).waitFor();await ex.getByText(label('Beispiel:'),{exact:false}).waitFor();
|
||||
await next('Sprechen');await ex.getByText(label('Bis zu 30 Sekunden.'),{exact:false}).waitFor();d=await next('Schreiben');await ex.getByRole('textbox',{name:label('Deine Antwort')}).fill('I have got a sister.');if(russian){await page.getByRole('combobox',{name:'Родной язык'}).selectOption('de-DE');const germanExercise=page.getByRole('region',{name:'Aktuelle Kursaufgabe'});await germanExercise.getByRole('textbox',{name:'Deine Antwort'}).waitFor();assert.equal(await germanExercise.getByRole('textbox',{name:'Deine Antwort'}).inputValue(),'I have got a sister.');assert.equal(await germanExercise.getByRole('heading',{level:2}).innerText(),(d.task.instruction||d.task.prompt));await page.getByRole('combobox',{name:'Muttersprache'}).selectOption('ru-RU');}await ex.getByRole('button',{name:label('Antwort prüfen'),exact:true}).click();await ex.getByText(label('Antwort gespeichert – ohne verbindliche Note.'),{exact:false}).waitFor();await ex.getByText(label('Beispiel:'),{exact:false}).waitFor();
|
||||
await page.reload();await page.getByRole('button',{name:label('A1-Kurs'),exact:true}).click();await ex.getByText(label('Antwort gespeichert – ohne verbindliche Note.'),{exact:false}).waitFor();assert(await ex.getByRole('button',{name:label('Bewertung anfordern'),exact:true}).isDisabled());
|
||||
await modules.nth(6).click();await page.getByRole('button',{name:label('Neuen A1-Test starten · 12 Aufgaben'),exact:true}).click();const examPanel=page.getByRole('region',{name:label('A1-Test')});await examPanel.getByRole('button').nth(11).waitFor();let catalog=await get('/course/catalog'),exam=await get('/course/exams/'+catalog.exams[0].id);assert.equal(exam.tasks.length,12);
|
||||
const wav=Buffer.alloc(44+8000);wav.write('RIFF');wav.writeUInt32LE(wav.length-8,4);wav.write('WAVE',8);wav.write('fmt ',12);wav.writeUInt32LE(16,16);wav.writeUInt16LE(1,20);wav.writeUInt16LE(1,22);wav.writeUInt32LE(16000,24);wav.writeUInt32LE(32000,28);wav.writeUInt16LE(2,32);wav.writeUInt16LE(16,34);wav.write('data',36);wav.writeUInt32LE(8000,40);
|
||||
@@ -29,6 +27,6 @@ const crypto=require('node:crypto');
|
||||
exam=await get('/course/exams/'+exam.id);assert.equal(exam.status,'submitted');assert.equal(exam.score,undefined);for(const t of exam.tasks){assert.equal(t.answer_key,undefined);assert.equal(t.audio_text,undefined);const detail=await get('/course/tasks/'+t.id);assert.equal(detail.task.answer_key,undefined)}for(const a of exam.attempts)assert.equal(a.evaluation,undefined);
|
||||
await page.reload();await page.getByRole('button',{name:label('A1-Kurs'),exact:true}).click();await examPanel.getByText(label('Abgegeben – Bewertung ausstehend.'),{exact:false}).waitFor();assert(await examPanel.getByRole('button',{name:label('Ausstehende Antworten bewerten'),exact:true}).isDisabled());
|
||||
const usage=await get('/admin/ai/usage');assert.equal(usage.total,0);assert.deepEqual(errors,[]);
|
||||
console.log((english?'English: ':'German: ')+'PASS: 840 bank tasks; six renderers; source/privacy; answer/reload; ungraded open answer; submitted frozen exam; no model calls or browser errors. Audio uses an explicit local fixture.');
|
||||
console.log((russian?'Russian: ':'German: ')+'PASS: 840 bank tasks; six renderers; source/privacy; answer/reload; ungraded open answer; submitted frozen exam; no model calls or browser errors. Audio uses an explicit local fixture.');
|
||||
}finally{await browser.close()}
|
||||
})().catch(e=>{console.error(e);process.exitCode=1});
|
||||
|
||||
@@ -1,118 +1,33 @@
|
||||
// Local API/PostgreSQL fixture only. No paid provider calls or real microphone.
|
||||
const { chromium } = require(process.env.PLAYWRIGHT_MODULE || 'playwright');
|
||||
const assert = require('node:assert/strict');
|
||||
const crypto = require('node:crypto');
|
||||
|
||||
(async () => {
|
||||
const api = process.env.AI_E2E_API, url = process.env.AI_E2E_URL, adminToken = process.env.AI_E2E_TOKEN;
|
||||
assert(api && url && adminToken);
|
||||
const browser = await chromium.launch({ headless: true, args: ['--no-sandbox'] });
|
||||
try {
|
||||
const page = await browser.newPage(); page.setDefaultTimeout(15000);
|
||||
const errors = []; page.on('pageerror', error => errors.push(error.message));
|
||||
const registration = await page.request.post(api + '/auth/register', { data: { email: `variants-${Date.now()}@example.test`, password: 'local-variant-test-password', ui_language: 'en-US', target_language: 'en-US' } });
|
||||
assert.equal(registration.status(), 201);
|
||||
const account = await registration.json(), headers = { Authorization: `Bearer ${account.token}` };
|
||||
const id = () => crypto.randomUUID().replaceAll('-', '');
|
||||
const get = async path => { const response = await page.request.get(api + path, { headers }); assert.equal(response.status(), 200, await response.text()); return response.json(); };
|
||||
const explanation = () => page.getByRole('combobox', { name: 'Exercise explanation language' });
|
||||
const exercise = page.getByRole('region', { name: 'Current course exercise' });
|
||||
async function waitJob(job) {
|
||||
for (let count = 0; count < 80 && ['queued', 'running'].includes(job.status); count++) {
|
||||
await page.waitForTimeout(100); job = await get('/course/jobs/' + job.id);
|
||||
}
|
||||
return job;
|
||||
}
|
||||
async function next(skill) {
|
||||
await page.getByRole('group', { name: 'Learning area' }).getByRole('button', { name: skill, exact: true }).click();
|
||||
const response = page.waitForResponse(r => r.url().endsWith('/tasks/next') && r.request().method() === 'POST');
|
||||
await page.getByRole('button', { name: 'Next exercise', exact: true }).click();
|
||||
const job = await waitJob(await (await response).json()); assert.equal(job.status, 'succeeded', job.error);
|
||||
const detail = await get('/course/tasks/' + job.task_id);
|
||||
await exercise.getByRole('heading', { level: 2, name: detail.task.instruction, exact: true }).waitFor();
|
||||
await page.getByRole('button', { name: 'Next exercise', exact: true }).waitFor();
|
||||
assert.equal(detail.task.instruction_language, 'en-US'); assert(detail.task.content_revision); assert(detail.task.variant_id);
|
||||
assert.equal(detail.task.answer_key, undefined); assert.equal(detail.task.audio_text, undefined); assert.equal(detail.task.evidence_task_id, undefined);
|
||||
return detail.task;
|
||||
}
|
||||
await page.goto(url); await page.evaluate(token => localStorage.setItem('speech_token', token), account.token); await page.reload();
|
||||
await page.getByRole('button', { name: 'A1 course', exact: true }).click();
|
||||
await explanation().selectOption('en-US');
|
||||
await page.getByText('Preferred explanation language: English.', { exact: true }).waitFor();
|
||||
let catalog = await get('/course/catalog');
|
||||
assert.equal(catalog.modules[0].title, 'Greetings & introductions');
|
||||
assert.equal(catalog.instruction_language, 'en-US'); assert.equal(catalog.exam_available, false);
|
||||
assert.equal(catalog.bank.reduce((sum, item) => sum + item.total, 0), 12);
|
||||
assert(catalog.bank.every(item => item.module_id === 'a1_introductions_v1' && item.total === 2));
|
||||
const grammar = await next('Grammar');
|
||||
await exercise.locator('.course-passage').getByText(grammar.stimulus.text, { exact: true }).waitFor();
|
||||
assert.equal(grammar.stimulus.role, 'target'); assert.equal(grammar.stimulus.language, 'en-US');
|
||||
for (let n = 0; n < 2; n++) {
|
||||
const task = await next('Vocabulary');
|
||||
assert.equal(task.canonical_task_id, task.variant_id, 'Adapted meanings require a separate canonical identity');
|
||||
assert(task.options.every(option => option.language === 'en-US' && !['hello', 'name'].includes(option.label.toLowerCase())));
|
||||
assert(!task.options.some(option => ['hallo', 'tschüss', 'Name', 'Alter', 'Wohnort'].includes(option.label)));
|
||||
}
|
||||
await next('Reading'); await exercise.locator('.course-passage').waitFor();
|
||||
const listening = await next('Listening'); assert.equal(listening.stimulus, undefined);
|
||||
await exercise.getByRole('button', { name: 'Listen', exact: true }).waitFor();
|
||||
assert.equal(await exercise.getByText('Listening transcript:', { exact: false }).count(), 0);
|
||||
for (let n = 0; n < 2; n++) {
|
||||
const task = await next('Speaking');
|
||||
assert(['repeat_sentence', 'free_speech'].includes(task.kind));
|
||||
await exercise.getByRole('button', { name: 'Record', exact: true }).waitFor();
|
||||
assert.equal(Boolean(task.reference_text), task.kind === 'repeat_sentence');
|
||||
}
|
||||
const writing = await next('Writing');
|
||||
assert.equal(writing.kind, 'short_text'); assert.equal(writing.canonical_task_id, writing.variant_id);
|
||||
assert(!writing.instruction.toLowerCase().includes('translate')); assert.equal(writing.stimulus.role, 'context');
|
||||
await exercise.getByRole('textbox', { name: 'Your answer' }).fill('I am Anna.');
|
||||
await exercise.getByRole('button', { name: 'Check answer', exact: true }).click();
|
||||
await exercise.getByText('Answer saved without a grade.', { exact: false }).waitFor();
|
||||
let saved = await get('/course/tasks/' + writing.id);
|
||||
assert.equal(saved.attempt.status, 'ungraded'); assert.equal(saved.attempt.answer, 'I am Anna.'); assert.equal(saved.attempt.evaluation, undefined);
|
||||
assert.equal(saved.task.answer_key.reference_answer_language, 'en-US');
|
||||
const frozen = saved.task;
|
||||
await explanation().selectOption('de-DE');
|
||||
await page.getByText('Preferred explanation language: German.', { exact: true }).waitFor();
|
||||
await exercise.getByText('This exercise uses: English', { exact: true }).waitFor();
|
||||
saved = await get('/course/tasks/' + writing.id); assert.deepEqual(saved.task, frozen);
|
||||
await page.reload(); await page.getByRole('button', { name: 'A1 course', exact: true }).click();
|
||||
await exercise.getByRole('heading', { name: writing.instruction, exact: true }).waitFor();
|
||||
saved = await get('/course/tasks/' + writing.id); assert.equal(saved.attempt.answer, 'I am Anna.'); assert.deepEqual(saved.task, frozen);
|
||||
const currentUser = await get('/me'); assert.equal(currentUser.user.ui_language, 'en-US'); assert.deepEqual(currentUser.profile, account.profile);
|
||||
await explanation().selectOption('en-US');
|
||||
await page.getByText('Preferred explanation language: English.', { exact: true }).waitFor();
|
||||
const freeWriting = await next('Writing'); assert.equal(freeWriting.kind, 'free_text');
|
||||
const modules = page.getByRole('navigation', { name: 'A1 modules' }).getByRole('button');
|
||||
await modules.nth(1).click();
|
||||
await page.getByText('This area has no reviewed exercises', { exact: false }).waitFor();
|
||||
assert(await page.getByRole('button', { name: 'Next exercise', exact: true }).isDisabled());
|
||||
const missing = await page.request.post(api + '/course/modules/a1_family_v1/tasks/next', { headers, data: { request_id: id(), skill: 'grammar' } });
|
||||
assert.equal(missing.status(), 202); const failed = await waitJob(await missing.json()); assert.equal(failed.status, 'failed'); assert.equal(failed.task_id, undefined);
|
||||
assert.equal((await get('/course/modules/a1_family_v1/tasks')).tasks.length, 0);
|
||||
await modules.nth(6).click();
|
||||
assert(await page.getByRole('button', { name: 'Start a new A1 test · 12 questions', exact: true }).isDisabled());
|
||||
const unsupportedExam = await page.request.post(api + '/course/exams', { headers, data: { request_id: id() } });
|
||||
assert.equal(unsupportedExam.status(), 409); assert.equal((await unsupportedExam.json()).code, 'course_variant_unavailable');
|
||||
catalog = await get('/course/catalog'); assert.equal(catalog.exams.length, 0);
|
||||
// Reusing an existing German test request must keep that frozen session.
|
||||
await page.request.put(api + '/course/instruction-language', { headers, data: { instruction_language: 'de-DE' } });
|
||||
const examRequest = id();
|
||||
const germanExamResponse = await page.request.post(api + '/course/exams', { headers, data: { request_id: examRequest } });
|
||||
assert.equal(germanExamResponse.status(), 202);
|
||||
const germanExam = await germanExamResponse.json();
|
||||
assert.equal((await waitJob(germanExam.job)).status, 'succeeded');
|
||||
await page.request.put(api + '/course/instruction-language', { headers, data: { instruction_language: 'en-US' } });
|
||||
const replayResponse = await page.request.post(api + '/course/exams', { headers, data: { request_id: examRequest } });
|
||||
assert.equal(replayResponse.status(), 202);
|
||||
const replay = await replayResponse.json(); assert.equal(replay.exam.id, germanExam.exam.id); assert.equal(replay.job.id, germanExam.job.id); assert.equal(replay.job.instruction_language, 'de-DE');
|
||||
const unsupported = await page.request.put(api + '/course/instruction-language', { headers, data: { instruction_language: 'fr-FR' } });
|
||||
assert.equal(unsupported.status(), 409); assert.equal((await unsupported.json()).code, 'course_variant_unavailable');
|
||||
assert.equal((await get('/me')).user.instruction_language, 'en-US');
|
||||
const anonymous = await page.request.put(api + '/course/instruction-language', { data: { instruction_language: 'de-DE' } }); assert.equal(anonymous.status(), 401);
|
||||
const usage = await page.request.get(api + '/admin/ai/usage', { headers: { Authorization: `Bearer ${adminToken}` } }); assert.equal((await usage.json()).total, 0);
|
||||
assert.deepEqual(errors, []);
|
||||
console.log('PASS: explanation choice; 12 structured pilot variants; five renderers/six skills; independent UI language; adapted vocabulary/writing; frozen answers/reload; no German fallback; unavailable English exam; auth; no model calls.');
|
||||
} finally { await browser.close(); }
|
||||
})().catch(error => { console.error(error); process.exitCode = 1; });
|
||||
// Local API/PostgreSQL fixture only; no paid models or real microphone.
|
||||
const {chromium}=require(process.env.PLAYWRIGHT_MODULE||'playwright');
|
||||
const assert=require('node:assert/strict'),crypto=require('node:crypto'),fs=require('node:fs');
|
||||
(async()=>{
|
||||
const api=process.env.AI_E2E_API,url=process.env.AI_E2E_URL;
|
||||
const ru=JSON.parse(fs.readFileSync('src/i18n/ru-RU.json')),de=JSON.parse(fs.readFileSync('src/i18n/de-DE.json'));
|
||||
const browser=await chromium.launch({headless:true,args:['--no-sandbox']});
|
||||
try{
|
||||
const page=await browser.newPage();page.setDefaultTimeout(15000);const errors=[];page.on('pageerror',e=>errors.push(e.message));
|
||||
const response=await page.request.post(api+'/auth/register',{data:{email:`variants-${Date.now()}@example.test`,password:'local-variant-test-password',native_language:'ru-RU',target_language:'en-US'}});assert.equal(response.status(),201);const account=await response.json(),headers={Authorization:`Bearer ${account.token}`};
|
||||
const get=async path=>{const r=await page.request.get(api+path,{headers});assert.equal(r.status(),200,await r.text());return r.json()};
|
||||
async function waitJob(job){for(let n=0;n<100&&['queued','running'].includes(job.status);n++){await page.waitForTimeout(100);job=await get('/course/jobs/'+job.id)}assert.equal(job.status,'succeeded',job.error);return job}
|
||||
const ex=()=>page.getByRole('region',{name:ru['ui.current_course_exercise']});
|
||||
async function next(skill){await page.getByRole('group',{name:ru['ui.learning_area']}).getByRole('button',{name:ru['ui.'+skill],exact:true}).click();const done=page.waitForResponse(r=>r.url().endsWith('/tasks/next')&&r.request().method()==='POST');await page.getByRole('button',{name:ru['ui.next_exercise'],exact:true}).click();const job=await waitJob(await(await done).json());const detail=await get('/course/tasks/'+job.task_id);await ex().getByRole('heading',{name:detail.task.instruction,exact:true}).waitFor();assert.equal(detail.task.instruction_language,'ru-RU');assert.equal(detail.task.target_language,'en-US');assert(detail.task.variant_id&&detail.task.content_revision);assert.notEqual(detail.task.canonical_task_id,detail.task.variant_id);for(const field of ['answer_key','audio_text','evidence_task_id'])assert.equal(detail.task[field],undefined);return detail.task}
|
||||
await page.goto(url);await page.evaluate(t=>localStorage.setItem('speech_token',t),account.token);await page.reload();await page.getByRole('button',{name:ru['nav.course'],exact:true}).click();
|
||||
const catalog=await get('/course/catalog');assert.equal(catalog.native_language,'ru-RU');assert.equal(catalog.exam_available,true);assert.deepEqual(catalog.native_languages,['de-DE','ru-RU']);assert.equal(catalog.modules.length,7);assert.equal(catalog.modules[0].title,'Знакомство и приветствия');assert.equal(catalog.bank.reduce((n,x)=>n+x.total,0),840);assert(catalog.bank.every(x=>x.total===20));
|
||||
assert.equal(await page.locator('.language-picker select').count(),1);assert.equal(await page.locator('.course-controls select').count(),0);
|
||||
const grammar=await next('grammar');assert.equal(grammar.stimulus.language,'en-US');assert.equal(grammar.stimulus.role,'target');
|
||||
const vocabulary=await next('vocabulary');assert(vocabulary.options.every(o=>o.language==='ru-RU'&&o.role==='meaning'));assert(vocabulary.options.some(o=>/[А-Яа-яЁё]/.test(o.label)));
|
||||
await next('reading');await ex().locator('.course-passage').waitFor();const listening=await next('listening');assert.equal(listening.stimulus,undefined);await ex().getByRole('button',{name:ru['ui.listen'],exact:true}).waitFor();
|
||||
const speaking=await next('speaking');assert(['repeat_sentence','free_speech'].includes(speaking.kind));await ex().getByRole('button',{name:ru['ui.record'],exact:true}).waitFor();
|
||||
const writing=await next('writing');assert.equal(writing.kind,'short_text');assert.equal(writing.stimulus.role,'source');assert.equal(writing.stimulus.language,'ru-RU');assert(/[А-Яа-яЁё]/.test(writing.stimulus.text));
|
||||
await ex().getByRole('textbox',{name:ru['ui.your_answer']}).fill('I am Anna.');await ex().getByRole('button',{name:ru['ui.check_answer'],exact:true}).click();await ex().getByText(ru['ui.answer_saved_without_a_grade_you_can_request_an_ai'],{exact:false}).waitFor();let saved=await get('/course/tasks/'+writing.id);assert.equal(saved.attempt.status,'ungraded');assert.equal(saved.attempt.evaluation,undefined);assert.equal(saved.task.answer_key.reference_answer_language,'en-US');const frozen=saved.task;
|
||||
await page.locator('.language-picker select').selectOption('de-DE');await page.getByRole('button',{name:de['nav.today'],exact:true}).waitFor();assert.equal(await page.getByRole('textbox',{name:de['ui.your_answer']}).inputValue(),'I am Anna.');assert.deepEqual((await get('/course/tasks/'+writing.id)).task,frozen);
|
||||
await page.reload();await page.getByRole('button',{name:de['nav.course'],exact:true}).click();await page.getByRole('heading',{name:writing.instruction,exact:true}).waitFor();assert.deepEqual((await get('/course/tasks/'+writing.id)).task,frozen);const me=await get('/me');assert.equal(me.user.native_language,'de-DE');assert.deepEqual(me.profile,account.profile);
|
||||
await page.locator('.language-picker select').selectOption('ru-RU');await page.getByRole('button',{name:ru['nav.today'],exact:true}).waitFor();
|
||||
// A new exam freezes all Russian presentations; replay survives a native change.
|
||||
const request_id=crypto.randomUUID().replaceAll('-','');const start=await page.request.post(api+'/course/exams',{headers,data:{request_id}});assert.equal(start.status(),202);const created=await start.json();await waitJob(created.job);const exam=await get('/course/exams/'+created.exam.id);assert.equal(exam.tasks.length,12);assert(exam.tasks.every(t=>t.instruction_language==='ru-RU'&&!t.answer_key&&!t.audio_text));assert.equal(exam.score,undefined);
|
||||
await page.request.patch(api+'/me/preferences',{headers,data:{native_language:'de-DE'}});const replay=await page.request.post(api+'/course/exams',{headers,data:{request_id}});const reused=await replay.json();assert.equal(reused.exam.id,exam.id);assert.equal(reused.job.instruction_language,'ru-RU');assert.deepEqual((await get('/course/exams/'+exam.id)).tasks,exam.tasks);
|
||||
const usage=await page.request.get(api+'/admin/ai/usage',{headers:{Authorization:`Bearer ${process.env.AI_E2E_TOKEN}`}});assert.equal((await usage.json()).total,0);assert.deepEqual(errors,[]);
|
||||
console.log('PASS: 840 Russian variants; seven modules/six skills; source/target roles; shared canonical identities; frozen task and ungraded answer; Russian exam and replay; private keys/media protected; no model calls.');
|
||||
}finally{await browser.close()}
|
||||
})().catch(e=>{console.error(e);process.exitCode=1});
|
||||
|
||||
@@ -1,141 +1,47 @@
|
||||
const { chromium } = require(process.env.PLAYWRIGHT_MODULE || 'playwright');
|
||||
const assert = require('node:assert/strict');
|
||||
const fs = require('node:fs');
|
||||
|
||||
(async () => {
|
||||
const api = process.env.AI_E2E_API, token = process.env.AI_E2E_TOKEN, url = process.env.AI_E2E_URL;
|
||||
assert(api && token && url);
|
||||
const german = JSON.parse(fs.readFileSync('src/i18n/de-DE.json', 'utf8'));
|
||||
const english = JSON.parse(fs.readFileSync('src/i18n/en-US.json', 'utf8'));
|
||||
assert.deepEqual(Object.keys(german).sort(), Object.keys(english).sort());
|
||||
for (const key of Object.keys(german)) {
|
||||
assert(german[key] && english[key], `Empty translation: ${key}`);
|
||||
assert.deepEqual(german[key].match(/\{\w+\}/g)?.sort() ?? [], english[key].match(/\{\w+\}/g)?.sort() ?? [], key);
|
||||
}
|
||||
const browser = await chromium.launch({ headless: true, args: ['--no-sandbox'] });
|
||||
try {
|
||||
const page = await browser.newPage();
|
||||
page.setDefaultTimeout(15000);
|
||||
const errors = [];
|
||||
page.on('pageerror', (error) => errors.push(error.message));
|
||||
const headers = { Authorization: `Bearer ${token}` };
|
||||
const me = async () => {
|
||||
const response = await page.request.get(api + '/me', { headers });
|
||||
assert.equal(response.status(), 200);
|
||||
return response.json();
|
||||
};
|
||||
const patch = async (data) => {
|
||||
const response = await page.request.patch(api + '/me/preferences', { headers, data });
|
||||
assert.equal(response.status(), 200, await response.text());
|
||||
return response.json();
|
||||
};
|
||||
await page.goto(url);
|
||||
await page.getByRole('heading', { name: 'Einloggen', exact: true }).waitFor();
|
||||
await page.getByRole('combobox', { name: 'Oberflächensprache' }).selectOption('en-US');
|
||||
await page.getByRole('heading', { name: 'Log in', exact: true }).waitFor();
|
||||
assert.equal(await page.locator('html').getAttribute('lang'), 'en-US');
|
||||
await page.reload();
|
||||
await page.getByRole('heading', { name: 'Log in', exact: true }).waitFor();
|
||||
await page.getByRole('button', { name: 'Create account', exact: true }).click();
|
||||
await page.getByText('The English course currently uses German task instructions and explanations.').waitFor();
|
||||
await page.setViewportSize({ width: 360, height: 780 });
|
||||
assert(await page.evaluate(() => document.documentElement.scrollWidth <= window.innerWidth), 'Registration overflows on a narrow screen');
|
||||
await page.setViewportSize({ width: 1280, height: 800 });
|
||||
const email = `languages-${Date.now()}@example.test`, password = 'local-language-test-password';
|
||||
await page.getByRole('textbox', { name: 'Email', exact: true }).fill(email);
|
||||
await page.getByLabel('Password', { exact: true }).fill(password);
|
||||
const registration = page.waitForResponse((r) => r.url().endsWith('/auth/register') && r.request().method() === 'POST');
|
||||
await page.getByRole('button', { name: 'Register', exact: true }).click();
|
||||
const registered = await (await registration).json();
|
||||
assert.equal(registered.user.ui_language, 'en-US');
|
||||
assert.equal(registered.user.instruction_language, 'de-DE');
|
||||
await page.getByRole('button', { name: 'Today', exact: true }).waitFor();
|
||||
await page.getByText('Preferred explanation language: German.', { exact: true }).waitFor();
|
||||
await page.getByRole('heading', { name: 'A1 pronunciation practice', exact: true }).waitFor();
|
||||
await page.getByRole('button', { name: 'Log out', exact: true }).click();
|
||||
await page.getByRole('combobox', { name: 'Interface language' }).selectOption('de-DE');
|
||||
await page.getByRole('textbox', { name: 'E-Mail', exact: true }).fill(email);
|
||||
await page.getByLabel('Passwort', { exact: true }).fill(password);
|
||||
await page.getByRole('button', { name: 'Einloggen', exact: true }).click();
|
||||
await page.getByRole('button', { name: 'Today', exact: true }).waitFor();
|
||||
await page.getByRole('button', { name: 'Progress', exact: true }).click();
|
||||
await page.getByRole('heading', { name: 'Progress', exact: true }).waitFor();
|
||||
await page.getByRole('heading', { name: 'Your pronunciation profile · en-US', exact: true }).waitFor();
|
||||
await page.getByText('Your new pronunciation profile needs confirmed measurements.', { exact: false }).waitFor();
|
||||
await page.getByRole('button', { name: 'Log out', exact: true }).click();
|
||||
|
||||
const original = await me();
|
||||
await page.evaluate((value) => localStorage.setItem('speech_token', value), token);
|
||||
await page.reload();
|
||||
await page.getByRole('combobox', { name: 'Oberflächensprache' }).selectOption('en-US');
|
||||
await page.getByRole('button', { name: 'Pronunciation', exact: true }).click();
|
||||
await page.getByRole('button', { name: 'Record', exact: true }).waitFor();
|
||||
const sentence = await page.locator('.target-text').innerText();
|
||||
await page.getByRole('combobox', { name: 'Interface language' }).selectOption('de-DE');
|
||||
await page.getByRole('button', { name: 'Aufnehmen', exact: true }).waitFor();
|
||||
assert.equal(await page.locator('.target-text').innerText(), sentence);
|
||||
await page.getByRole('combobox', { name: 'Oberflächensprache' }).selectOption('en-US');
|
||||
await page.getByRole('button', { name: 'Conversation', exact: true }).click();
|
||||
await page.getByRole('button', { name: 'Start', exact: true }).click();
|
||||
const reply = page.getByRole('textbox', { name: 'Your conversation reply', exact: true });
|
||||
await reply.fill('My name is Mira.');
|
||||
await page.getByRole('combobox', { name: 'Interface language' }).selectOption('de-DE');
|
||||
assert.equal(await page.getByRole('textbox', { name: 'Deine Dialogantwort', exact: true }).inputValue(), 'My name is Mira.');
|
||||
await page.getByRole('combobox', { name: 'Oberflächensprache' }).selectOption('en-US');
|
||||
const turnResponse = page.waitForResponse(r => /\/conversation\/[^/]+\/turn$/.test(r.url()));
|
||||
await page.getByRole('button', { name: 'Send', exact: true }).click();
|
||||
assert.equal((await turnResponse).request().postDataJSON().text, 'My name is Mira.');
|
||||
await page.locator('.bubble.learner').getByText('My name is Mira.', { exact: true }).waitFor();
|
||||
await page.getByRole('button', { name: 'Administration', exact: true }).click();
|
||||
await page.getByRole('heading', { name: 'AI settings and usage', exact: true }).waitFor();
|
||||
const action = page.getByLabel('Action').first();
|
||||
await action.selectOption('next_exercise');
|
||||
await page.getByRole('option', { name: 'Pronunciation generation', exact: true }).first().waitFor({ state: 'attached' });
|
||||
await page.getByLabel('Monthly limit in USD', { exact: true }).fill('0.12');
|
||||
await page.getByRole('combobox', { name: 'Interface language' }).selectOption('de-DE');
|
||||
assert.equal(await page.getByLabel('Monatslimit in USD', { exact: true }).inputValue(), '0.12');
|
||||
await page.getByRole('combobox', { name: 'Oberflächensprache' }).selectOption('en-US');
|
||||
assert.equal(await page.getByLabel('Monthly limit in USD', { exact: true }).inputValue(), '0.12');
|
||||
const settings = await (await page.request.get(api + '/admin/ai/settings', { headers })).json();
|
||||
assert.equal(settings.budget.monthly_limit_microusd, 0, 'Changing UI language must not save budget edits');
|
||||
await page.getByLabel('Monthly limit in USD', { exact: true }).fill('0');
|
||||
await page.getByRole('button', { name: 'Save budget', exact: true }).click();
|
||||
await page.getByRole('status').filter({ hasText: 'Budget saved.' }).waitFor();
|
||||
await page.getByRole('combobox', { name: 'Interface language' }).selectOption('de-DE');
|
||||
await page.getByRole('status').filter({ hasText: 'Budget gespeichert.' }).waitFor();
|
||||
await page.getByRole('combobox', { name: 'Oberflächensprache' }).selectOption('en-US');
|
||||
await page.getByRole('status').filter({ hasText: 'Budget saved.' }).waitFor();
|
||||
await page.getByRole('button', { name: 'A1 course', exact: true }).click();
|
||||
await page.getByRole('button', { name: 'Open the original fixed course', exact: true }).click();
|
||||
await page.getByText('Guided A1 course', { exact: true }).waitFor();
|
||||
await page.getByRole('region', { name: 'Module progress', exact: true }).waitFor();
|
||||
await patch({ ui_language: original.user.ui_language });
|
||||
const learningProfile = await patch({ target_language: 'es-ES', cefr_level: 'A2', daily_goal_minutes: 23 });
|
||||
await page.evaluate((value) => localStorage.setItem('speech_token', value), token);
|
||||
await page.reload();
|
||||
const picker = page.getByRole('combobox', { name: 'Oberflächensprache' });
|
||||
await picker.waitFor();
|
||||
await picker.selectOption('en-US');
|
||||
await page.getByRole('button', { name: 'Today', exact: true }).waitFor();
|
||||
let account = await me();
|
||||
assert.equal(account.user.ui_language, 'en-US');
|
||||
assert.equal(account.user.instruction_language, original.user.instruction_language);
|
||||
assert.deepEqual(account.profile, learningProfile);
|
||||
await page.reload();
|
||||
await page.getByRole('combobox', { name: 'Interface language' }).waitFor();
|
||||
assert.equal(await page.locator('html').getAttribute('lang'), 'en-US');
|
||||
await page.route('**/me/preferences', (route) => route.fulfill({ status: 503, contentType: 'application/json', body: '{"error":"fixture unavailable"}' }));
|
||||
await page.getByRole('combobox', { name: 'Interface language' }).selectOption('de-DE');
|
||||
await page.getByRole('alert').filter({ hasText: 'Unable to save the language.' }).waitFor();
|
||||
assert.equal(await page.getByRole('combobox', { name: 'Interface language' }).inputValue(), 'en-US');
|
||||
account = await me();
|
||||
assert.equal(account.user.ui_language, 'en-US');
|
||||
assert.deepEqual(account.profile, learningProfile);
|
||||
await page.unroute('**/me/preferences');
|
||||
const rejected = await page.request.patch(api + '/me/preferences', { headers, data: { ui_language: 'xx-XX' } });
|
||||
assert.equal(rejected.status(), 400);
|
||||
await patch({ ui_language: original.user.ui_language, target_language: original.profile.target_language, cefr_level: original.profile.cefr_level, daily_goal_minutes: original.profile.daily_goal_minutes });
|
||||
assert.deepEqual(errors, []);
|
||||
console.log('PASS: catalog parity; language before login; registration/login; account persistence; independent instructions; pronunciation, conversation, admin and legacy controls; unsaved input survives language switches; partial PATCH preserves course/level/goal; rejected saves; no browser errors.');
|
||||
} finally { await browser.close(); }
|
||||
})().catch((error) => { console.error(error); process.exitCode = 1; });
|
||||
const api=process.env.AI_E2E_API,token=process.env.AI_E2E_TOKEN,url=process.env.AI_E2E_URL;
|
||||
const de=JSON.parse(fs.readFileSync('src/i18n/de-DE.json')),ru=JSON.parse(fs.readFileSync('src/i18n/ru-RU.json'));
|
||||
assert.deepEqual(Object.keys(de).sort(),Object.keys(ru).sort());
|
||||
for(const key of Object.keys(de)) {assert(ru[key]);assert.deepEqual(de[key].match(/\{\w+\}/g)?.sort()??[],ru[key].match(/\{\w+\}/g)?.sort()??[],key)}
|
||||
const browser=await chromium.launch({headless:true,args:['--no-sandbox']});
|
||||
try {
|
||||
const page=await browser.newPage();page.setDefaultTimeout(15000);const errors=[];page.on('pageerror',e=>errors.push(e.message));
|
||||
const headers={Authorization:`Bearer ${token}`};
|
||||
const get=async()=>{const r=await page.request.get(api+'/me',{headers});assert.equal(r.status(),200);return r.json()};
|
||||
const patch=async data=>{const r=await page.request.patch(api+'/me/preferences',{headers,data});assert.equal(r.status(),200,await r.text());return r.json()};
|
||||
const coupled=(user,language)=>{assert.equal(user.native_language,language);assert.equal(user.ui_language,language);assert.equal(user.instruction_language,language)};
|
||||
await page.goto(url);await page.getByRole('heading',{name:'Einloggen',exact:true}).waitFor();
|
||||
const picker=()=>page.locator('.language-picker select');assert.deepEqual(await picker().locator('option').evaluateAll(items=>items.map(x=>x.value)),['de-DE','ru-RU']);
|
||||
await picker().selectOption('ru-RU');await page.getByRole('heading',{name:ru['auth.login'],exact:true}).waitFor();await page.reload();assert.equal(await picker().inputValue(),'ru-RU');
|
||||
await page.getByRole('button',{name:ru['auth.register'],exact:true}).click();
|
||||
await page.setViewportSize({width:360,height:780});assert(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth));await page.setViewportSize({width:1280,height:800});
|
||||
const email=`native-${Date.now()}@example.test`,password='local-language-test-password';
|
||||
await page.getByRole('textbox',{name:ru['auth.email'],exact:true}).fill(email);await page.getByLabel(ru['auth.password'],{exact:true}).fill(password);
|
||||
const registration=page.waitForResponse(r=>r.url().endsWith('/auth/register')&&r.request().method()==='POST');await page.getByRole('button',{name:ru['auth.register.submit'],exact:true}).click();
|
||||
const registered=await(await registration).json();coupled(registered.user,'ru-RU');assert.equal(registered.profile.target_language,'en-US');
|
||||
await page.getByRole('button',{name:ru['nav.today'],exact:true}).waitFor();
|
||||
await page.getByRole('button',{name:ru['auth.logout'],exact:true}).click();await picker().selectOption('de-DE');
|
||||
await page.getByRole('textbox',{name:de['auth.email'],exact:true}).fill(email);await page.getByLabel(de['auth.password'],{exact:true}).fill(password);await page.getByRole('button',{name:de['auth.login'],exact:true}).click();await page.getByRole('button',{name:ru['nav.today'],exact:true}).waitFor();
|
||||
await page.getByRole('button',{name:ru['auth.logout'],exact:true}).click();
|
||||
const original=await get();const learning=await patch({native_language:'de-DE',target_language:'es-ES',cefr_level:'A2',daily_goal_minutes:23});
|
||||
await page.evaluate(t=>localStorage.setItem('speech_token',t),token);await page.reload();await page.getByRole('button',{name:de['nav.today'],exact:true}).waitFor();
|
||||
await picker().selectOption('ru-RU');await page.getByRole('button',{name:ru['nav.today'],exact:true}).waitFor();let account=await get();coupled(account.user,'ru-RU');assert.deepEqual(account.profile,learning);
|
||||
await page.reload();await page.getByRole('button',{name:ru['nav.today'],exact:true}).waitFor();assert.equal(await page.locator('html').getAttribute('lang'),'ru-RU');
|
||||
await page.route('**/me/preferences',route=>route.fulfill({status:503,contentType:'application/json',body:'{"error":"fixture unavailable","code":"service_unavailable"}'}));await picker().selectOption('de-DE');await page.getByRole('alert').filter({hasText:ru['language.saveError']}).waitFor();assert.equal(await picker().inputValue(),'ru-RU');account=await get();coupled(account.user,'ru-RU');assert.deepEqual(account.profile,learning);await page.unroute('**/me/preferences');
|
||||
for(const data of [{native_language:'en-US'},{native_language:'de-DE',instruction_language:'ru-RU'}]){const r=await page.request.patch(api+'/me/preferences',{headers,data});assert.equal(r.status(),400);assert.match((await r.json()).code,/native_language_(unsupported|conflict)/)}
|
||||
await patch({native_language:original.user.native_language,target_language:original.profile.target_language,cefr_level:original.profile.cefr_level,daily_goal_minutes:original.profile.daily_goal_minutes});
|
||||
await page.reload();await page.getByRole('button',{name:de['nav.today'],exact:true}).waitFor();await picker().selectOption('ru-RU');
|
||||
await page.getByRole('button',{name:ru['nav.practice'],exact:true}).click();await page.getByRole('button',{name:ru['ui.record'],exact:true}).waitFor();const sentence=await page.locator('.target-text').innerText();
|
||||
await picker().selectOption('de-DE');await page.getByRole('button',{name:de['ui.record'],exact:true}).waitFor();assert.equal(await page.locator('.target-text').innerText(),sentence);await picker().selectOption('ru-RU');
|
||||
await page.getByRole('button',{name:ru['nav.conversation'],exact:true}).click();await page.getByRole('button',{name:ru['ui.start'],exact:true}).click();const reply=page.getByRole('textbox',{name:ru['conversation.answer'],exact:true});await reply.fill('My name is Mira.');
|
||||
await picker().selectOption('de-DE');assert.equal(await page.getByRole('textbox',{name:de['conversation.answer'],exact:true}).inputValue(),'My name is Mira.');await picker().selectOption('ru-RU');
|
||||
await page.getByRole('button',{name:ru['nav.admin'],exact:true}).click();const budget=page.getByLabel(ru['ui.monthly_limit_in_usd'],{exact:true});await budget.fill('0.12');await picker().selectOption('de-DE');assert.equal(await page.getByLabel(de['ui.monthly_limit_in_usd'],{exact:true}).inputValue(),'0.12');await picker().selectOption('ru-RU');assert.equal(await budget.inputValue(),'0.12');const settings=await(await page.request.get(api+'/admin/ai/settings',{headers})).json();assert.equal(settings.budget.monthly_limit_microusd,0);
|
||||
await patch({native_language:original.user.native_language});
|
||||
// Server codes, rather than server diagnostics, appear in the selected native language.
|
||||
await page.getByRole('button',{name:ru['auth.logout'],exact:true}).click();await page.getByRole('textbox',{name:ru['auth.email'],exact:true}).fill(email);await page.getByLabel(ru['auth.password'],{exact:true}).fill('wrong-password');await page.getByRole('button',{name:ru['auth.login'],exact:true}).click();await page.locator('.form-error').filter({hasText:'Неверная почта или пароль.'}).waitFor();await picker().selectOption('de-DE');await page.locator('.form-error').filter({hasText:'E-Mail oder Passwort ist falsch.'}).waitFor();
|
||||
assert.deepEqual(errors,[]);console.log('PASS: German/Russian catalogs and placeholders; registration/login/persistence; exactly two native options; coupled aliases; profile preservation; rejected conflicts and saves; localized errors; pronunciation target, dialog answer and unsaved budget survive native switches.');
|
||||
} finally {await browser.close()}
|
||||
})().catch(e=>{console.error(e);process.exitCode=1});
|
||||
|
||||
Reference in New Issue
Block a user