Add Schulsprache (school language) as second language setting
CI / go-lint (push) Has been skipped
CI / python-lint (push) Has been skipped
CI / nodejs-lint (push) Has been skipped
CI / test-go-school (push) Successful in 27s
CI / test-go-edu-search (push) Successful in 28s
CI / test-python-klausur (push) Failing after 2m21s
CI / test-python-agent-core (push) Successful in 18s
CI / test-nodejs-website (push) Successful in 22s
CI / go-lint (push) Has been skipped
CI / python-lint (push) Has been skipped
CI / nodejs-lint (push) Has been skipped
CI / test-go-school (push) Successful in 27s
CI / test-go-edu-search (push) Successful in 28s
CI / test-python-klausur (push) Failing after 2m21s
CI / test-python-agent-core (push) Successful in 18s
CI / test-nodejs-website (push) Successful in 22s
- LanguageContext: new schoolLanguage + setSchoolLanguage - LanguageDropdown: two tabs (Muttersprache / Schulsprache) with flag selection - UnitBuilder: defaults target language to schoolLanguage - Stored in bp_school_language localStorage (default: de) - Shows school flag badge next to main language when different Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -43,16 +43,19 @@ interface Props {
|
|||||||
isCreating: boolean
|
isCreating: boolean
|
||||||
noSearchResults?: boolean
|
noSearchResults?: boolean
|
||||||
searchQuery?: string
|
searchQuery?: string
|
||||||
|
defaultSourceLang?: string
|
||||||
|
defaultTargetLang?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
export default function UnitBuilder({
|
export default function UnitBuilder({
|
||||||
isDark, glassCard, glassInput,
|
isDark, glassCard, glassInput,
|
||||||
selectedWords, onWordsChange, onCreateUnit, isCreating,
|
selectedWords, onWordsChange, onCreateUnit, isCreating,
|
||||||
noSearchResults, searchQuery,
|
noSearchResults, searchQuery,
|
||||||
|
defaultSourceLang = 'en', defaultTargetLang = 'de',
|
||||||
}: Props) {
|
}: Props) {
|
||||||
const [unitTitle, setUnitTitle] = useState('')
|
const [unitTitle, setUnitTitle] = useState('')
|
||||||
const [sourceLang, setSourceLang] = useState('de')
|
const [sourceLang, setSourceLang] = useState(defaultSourceLang)
|
||||||
const [targetLang, setTargetLang] = useState('en')
|
const [targetLang, setTargetLang] = useState(defaultTargetLang)
|
||||||
const [showManualEntry, setShowManualEntry] = useState(false)
|
const [showManualEntry, setShowManualEntry] = useState(false)
|
||||||
const [manualSource, setManualSource] = useState('')
|
const [manualSource, setManualSource] = useState('')
|
||||||
const [manualTarget, setManualTarget] = useState('')
|
const [manualTarget, setManualTarget] = useState('')
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
import React, { useState, useEffect, useCallback } from 'react'
|
import React, { useState, useEffect, useCallback } from 'react'
|
||||||
import { useRouter } from 'next/navigation'
|
import { useRouter } from 'next/navigation'
|
||||||
import { useTheme } from '@/lib/ThemeContext'
|
import { useTheme } from '@/lib/ThemeContext'
|
||||||
|
import { useLanguage } from '@/lib/LanguageContext'
|
||||||
import { Sidebar } from '@/components/Sidebar'
|
import { Sidebar } from '@/components/Sidebar'
|
||||||
import { AudioButton } from '@/components/learn/AudioButton'
|
import { AudioButton } from '@/components/learn/AudioButton'
|
||||||
import UnitBuilder, { type UnitWord } from './components/UnitBuilder'
|
import UnitBuilder, { type UnitWord } from './components/UnitBuilder'
|
||||||
@@ -39,6 +40,7 @@ function vocabToUnit(w: VocabWord, searchLang: string): UnitWord {
|
|||||||
|
|
||||||
export default function VocabularyPage() {
|
export default function VocabularyPage() {
|
||||||
const { isDark } = useTheme()
|
const { isDark } = useTheme()
|
||||||
|
const { schoolLanguage } = useLanguage()
|
||||||
const router = useRouter()
|
const router = useRouter()
|
||||||
|
|
||||||
const [query, setQuery] = useState('')
|
const [query, setQuery] = useState('')
|
||||||
@@ -340,6 +342,7 @@ export default function VocabularyPage() {
|
|||||||
isCreating={isCreating}
|
isCreating={isCreating}
|
||||||
noSearchResults={noSearchResults}
|
noSearchResults={noSearchResults}
|
||||||
searchQuery={query}
|
searchQuery={query}
|
||||||
|
defaultTargetLang={schoolLanguage}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -10,12 +10,12 @@ interface LanguageDropdownProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function LanguageDropdown({ className = '' }: LanguageDropdownProps) {
|
export function LanguageDropdown({ className = '' }: LanguageDropdownProps) {
|
||||||
const { language, setLanguage, availableLanguages } = useLanguage()
|
const { language, setLanguage, schoolLanguage, setSchoolLanguage, availableLanguages } = useLanguage()
|
||||||
const { isDark } = useTheme()
|
const { isDark } = useTheme()
|
||||||
const [isOpen, setIsOpen] = useState(false)
|
const [isOpen, setIsOpen] = useState(false)
|
||||||
|
const [mode, setMode] = useState<'native' | 'school'>('native')
|
||||||
const dropdownRef = useRef<HTMLDivElement>(null)
|
const dropdownRef = useRef<HTMLDivElement>(null)
|
||||||
|
|
||||||
// Schliessen bei Klick ausserhalb
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
function handleClickOutside(event: MouseEvent) {
|
function handleClickOutside(event: MouseEvent) {
|
||||||
if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) {
|
if (dropdownRef.current && !dropdownRef.current.contains(event.target as Node)) {
|
||||||
@@ -26,7 +26,6 @@ export function LanguageDropdown({ className = '' }: LanguageDropdownProps) {
|
|||||||
return () => document.removeEventListener('mousedown', handleClickOutside)
|
return () => document.removeEventListener('mousedown', handleClickOutside)
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
// Schliessen bei Escape
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
function handleEscape(event: KeyboardEvent) {
|
function handleEscape(event: KeyboardEvent) {
|
||||||
if (event.key === 'Escape') setIsOpen(false)
|
if (event.key === 'Escape') setIsOpen(false)
|
||||||
@@ -35,11 +34,22 @@ export function LanguageDropdown({ className = '' }: LanguageDropdownProps) {
|
|||||||
return () => document.removeEventListener('keydown', handleEscape)
|
return () => document.removeEventListener('keydown', handleEscape)
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const currentLang = availableLanguages[language]
|
const nativeLang = availableLanguages[language]
|
||||||
|
const schoolLang = availableLanguages[schoolLanguage]
|
||||||
|
const activeLang = mode === 'native' ? language : schoolLanguage
|
||||||
|
|
||||||
|
const handleSelect = (lang: Language) => {
|
||||||
|
if (mode === 'native') {
|
||||||
|
setLanguage(lang)
|
||||||
|
} else {
|
||||||
|
setSchoolLanguage(lang)
|
||||||
|
}
|
||||||
|
setIsOpen(false)
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div ref={dropdownRef} className={`relative ${className}`}>
|
<div ref={dropdownRef} className={`relative ${className}`}>
|
||||||
{/* Trigger Button */}
|
{/* Trigger: shows both native + school language */}
|
||||||
<button
|
<button
|
||||||
onClick={() => setIsOpen(!isOpen)}
|
onClick={() => setIsOpen(!isOpen)}
|
||||||
className={`flex items-center gap-2 px-4 py-2.5 backdrop-blur-xl border rounded-2xl transition-all ${
|
className={`flex items-center gap-2 px-4 py-2.5 backdrop-blur-xl border rounded-2xl transition-all ${
|
||||||
@@ -50,46 +60,63 @@ export function LanguageDropdown({ className = '' }: LanguageDropdownProps) {
|
|||||||
aria-haspopup="listbox"
|
aria-haspopup="listbox"
|
||||||
aria-expanded={isOpen}
|
aria-expanded={isOpen}
|
||||||
>
|
>
|
||||||
<span className="text-lg">{currentLang.flag}</span>
|
<span className="text-lg">{nativeLang?.flag}</span>
|
||||||
<span className="text-sm font-medium hidden sm:inline">{currentLang.name}</span>
|
<span className="text-sm font-medium hidden sm:inline">{nativeLang?.name}</span>
|
||||||
|
{schoolLanguage !== language && (
|
||||||
|
<span className={`text-xs px-1.5 py-0.5 rounded ${isDark ? 'bg-white/10 text-white/50' : 'bg-slate-200 text-slate-500'}`}>
|
||||||
|
🏫 {schoolLang?.flag}
|
||||||
|
</span>
|
||||||
|
)}
|
||||||
<svg
|
<svg
|
||||||
className={`w-4 h-4 transition-transform ${isOpen ? 'rotate-180' : ''} ${
|
className={`w-4 h-4 transition-transform ${isOpen ? 'rotate-180' : ''} ${isDark ? 'text-white/60' : 'text-slate-500'}`}
|
||||||
isDark ? 'text-white/60' : 'text-slate-500'
|
fill="none" stroke="currentColor" viewBox="0 0 24 24"
|
||||||
}`}
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
>
|
>
|
||||||
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
|
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M19 9l-7 7-7-7" />
|
||||||
</svg>
|
</svg>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
{/* Dropdown Menu */}
|
{/* Dropdown */}
|
||||||
{isOpen && (
|
{isOpen && (
|
||||||
<div className={`absolute right-0 mt-2 w-48 backdrop-blur-2xl border rounded-2xl shadow-xl overflow-hidden z-50 ${
|
<div className={`absolute right-0 mt-2 w-56 backdrop-blur-2xl border rounded-2xl shadow-xl overflow-hidden z-50 ${
|
||||||
isDark
|
isDark ? 'bg-slate-900/90 border-white/20' : 'bg-white/95 border-black/10'
|
||||||
? 'bg-slate-900/90 border-white/20'
|
|
||||||
: 'bg-white/95 border-black/10'
|
|
||||||
}`}>
|
}`}>
|
||||||
<ul role="listbox" className="py-1">
|
{/* Tab switcher: Muttersprache / Schulsprache */}
|
||||||
|
<div className={`flex border-b ${isDark ? 'border-white/10' : 'border-slate-200'}`}>
|
||||||
|
<button
|
||||||
|
onClick={() => setMode('native')}
|
||||||
|
className={`flex-1 py-2.5 text-xs font-medium transition-all ${
|
||||||
|
mode === 'native'
|
||||||
|
? isDark ? 'bg-white/10 text-white' : 'bg-blue-50 text-blue-700'
|
||||||
|
: isDark ? 'text-white/50 hover:text-white/70' : 'text-slate-400 hover:text-slate-600'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
🌍 Muttersprache
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => setMode('school')}
|
||||||
|
className={`flex-1 py-2.5 text-xs font-medium transition-all ${
|
||||||
|
mode === 'school'
|
||||||
|
? isDark ? 'bg-white/10 text-white' : 'bg-blue-50 text-blue-700'
|
||||||
|
: isDark ? 'text-white/50 hover:text-white/70' : 'text-slate-400 hover:text-slate-600'
|
||||||
|
}`}
|
||||||
|
>
|
||||||
|
🏫 Schulsprache
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Language list */}
|
||||||
|
<ul role="listbox" className="py-1 max-h-72 overflow-y-auto">
|
||||||
{(Object.keys(availableLanguages) as Language[]).map((lang) => {
|
{(Object.keys(availableLanguages) as Language[]).map((lang) => {
|
||||||
const langInfo = availableLanguages[lang]
|
const langInfo = availableLanguages[lang]
|
||||||
const isSelected = lang === language
|
const isSelected = lang === activeLang
|
||||||
return (
|
return (
|
||||||
<li key={lang}>
|
<li key={lang}>
|
||||||
<button
|
<button
|
||||||
onClick={() => {
|
onClick={() => handleSelect(lang)}
|
||||||
setLanguage(lang)
|
className={`w-full flex items-center gap-3 px-4 py-2.5 text-left transition-all ${
|
||||||
setIsOpen(false)
|
|
||||||
}}
|
|
||||||
className={`w-full flex items-center gap-3 px-4 py-3 text-left transition-all ${
|
|
||||||
isSelected
|
isSelected
|
||||||
? isDark
|
? isDark ? 'bg-white/20 text-white' : 'bg-indigo-100 text-slate-900'
|
||||||
? 'bg-white/20 text-white'
|
: isDark ? 'text-white/80 hover:bg-white/10' : 'text-slate-700 hover:bg-slate-100'
|
||||||
: 'bg-indigo-100 text-slate-900'
|
|
||||||
: isDark
|
|
||||||
? 'text-white/80 hover:bg-white/10 hover:text-white'
|
|
||||||
: 'text-slate-700 hover:bg-slate-100 hover:text-slate-900'
|
|
||||||
}`}
|
}`}
|
||||||
role="option"
|
role="option"
|
||||||
aria-selected={isSelected}
|
aria-selected={isSelected}
|
||||||
|
|||||||
@@ -6,6 +6,8 @@ import {
|
|||||||
defaultLanguage,
|
defaultLanguage,
|
||||||
getStoredLanguage,
|
getStoredLanguage,
|
||||||
setStoredLanguage,
|
setStoredLanguage,
|
||||||
|
getStoredSchoolLanguage,
|
||||||
|
setStoredSchoolLanguage,
|
||||||
translations,
|
translations,
|
||||||
availableLanguages,
|
availableLanguages,
|
||||||
isRTL,
|
isRTL,
|
||||||
@@ -14,6 +16,8 @@ import {
|
|||||||
interface LanguageContextType {
|
interface LanguageContextType {
|
||||||
language: Language
|
language: Language
|
||||||
setLanguage: (lang: Language) => void
|
setLanguage: (lang: Language) => void
|
||||||
|
schoolLanguage: Language
|
||||||
|
setSchoolLanguage: (lang: Language) => void
|
||||||
t: (key: string) => string
|
t: (key: string) => string
|
||||||
isRTL: boolean
|
isRTL: boolean
|
||||||
availableLanguages: typeof availableLanguages
|
availableLanguages: typeof availableLanguages
|
||||||
@@ -23,38 +27,42 @@ const LanguageContext = createContext<LanguageContextType | null>(null)
|
|||||||
|
|
||||||
export function LanguageProvider({ children }: { children: ReactNode }) {
|
export function LanguageProvider({ children }: { children: ReactNode }) {
|
||||||
const [language, setLanguageState] = useState<Language>(defaultLanguage)
|
const [language, setLanguageState] = useState<Language>(defaultLanguage)
|
||||||
|
const [schoolLanguage, setSchoolLangState] = useState<Language>(defaultLanguage)
|
||||||
const [mounted, setMounted] = useState(false)
|
const [mounted, setMounted] = useState(false)
|
||||||
|
|
||||||
// Nach dem ersten Render: Sprache aus localStorage laden
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const stored = getStoredLanguage()
|
setLanguageState(getStoredLanguage())
|
||||||
setLanguageState(stored)
|
setSchoolLangState(getStoredSchoolLanguage())
|
||||||
setMounted(true)
|
setMounted(true)
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
// Sprache setzen und speichern
|
|
||||||
const setLanguage = (lang: Language) => {
|
const setLanguage = (lang: Language) => {
|
||||||
setLanguageState(lang)
|
setLanguageState(lang)
|
||||||
setStoredLanguage(lang)
|
setStoredLanguage(lang)
|
||||||
// Optional: document.dir fuer RTL setzen
|
|
||||||
if (typeof document !== 'undefined') {
|
if (typeof document !== 'undefined') {
|
||||||
document.documentElement.dir = isRTL(lang) ? 'rtl' : 'ltr'
|
document.documentElement.dir = isRTL(lang) ? 'rtl' : 'ltr'
|
||||||
document.documentElement.lang = lang
|
document.documentElement.lang = lang
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const setSchoolLanguage = (lang: Language) => {
|
||||||
|
setSchoolLangState(lang)
|
||||||
|
setStoredSchoolLanguage(lang)
|
||||||
|
}
|
||||||
|
|
||||||
// Uebersetzungsfunktion (Fallback: en → de → key)
|
// Uebersetzungsfunktion (Fallback: en → de → key)
|
||||||
const t = (key: string): string => {
|
const t = (key: string): string => {
|
||||||
return translations[language]?.[key] || translations['en']?.[key] || translations['de']?.[key] || key
|
return translations[language]?.[key] || translations['en']?.[key] || translations['de']?.[key] || key
|
||||||
}
|
}
|
||||||
|
|
||||||
// Waehrend SSR: Default anzeigen
|
|
||||||
if (!mounted) {
|
if (!mounted) {
|
||||||
return (
|
return (
|
||||||
<LanguageContext.Provider
|
<LanguageContext.Provider
|
||||||
value={{
|
value={{
|
||||||
language: defaultLanguage,
|
language: defaultLanguage,
|
||||||
setLanguage: () => {},
|
setLanguage: () => {},
|
||||||
|
schoolLanguage: defaultLanguage,
|
||||||
|
setSchoolLanguage: () => {},
|
||||||
t: (key) => translations[defaultLanguage]?.[key] || key,
|
t: (key) => translations[defaultLanguage]?.[key] || key,
|
||||||
isRTL: false,
|
isRTL: false,
|
||||||
availableLanguages,
|
availableLanguages,
|
||||||
@@ -70,6 +78,8 @@ export function LanguageProvider({ children }: { children: ReactNode }) {
|
|||||||
value={{
|
value={{
|
||||||
language,
|
language,
|
||||||
setLanguage,
|
setLanguage,
|
||||||
|
schoolLanguage,
|
||||||
|
setSchoolLanguage,
|
||||||
t,
|
t,
|
||||||
isRTL: isRTL(language),
|
isRTL: isRTL(language),
|
||||||
availableLanguages,
|
availableLanguages,
|
||||||
|
|||||||
+15
-1
@@ -388,8 +388,9 @@ export const translations: Record<string, Record<string, string>> = {
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
// LocalStorage Key
|
// LocalStorage Keys
|
||||||
const STORAGE_KEY = 'bp_language'
|
const STORAGE_KEY = 'bp_language'
|
||||||
|
const SCHOOL_LANG_KEY = 'bp_school_language'
|
||||||
|
|
||||||
// Aktuelle Sprache aus localStorage oder default
|
// Aktuelle Sprache aus localStorage oder default
|
||||||
export function getStoredLanguage(): Language {
|
export function getStoredLanguage(): Language {
|
||||||
@@ -413,6 +414,19 @@ export function setStoredLanguage(lang: Language): void {
|
|||||||
localStorage.setItem(STORAGE_KEY, lang)
|
localStorage.setItem(STORAGE_KEY, lang)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Schulsprache aus localStorage (default: 'de')
|
||||||
|
export function getStoredSchoolLanguage(): Language {
|
||||||
|
if (typeof window === 'undefined') return defaultLanguage
|
||||||
|
const stored = localStorage.getItem(SCHOOL_LANG_KEY)
|
||||||
|
if (stored && stored in availableLanguages) return stored
|
||||||
|
return defaultLanguage
|
||||||
|
}
|
||||||
|
|
||||||
|
export function setStoredSchoolLanguage(lang: Language): void {
|
||||||
|
if (typeof window === 'undefined') return
|
||||||
|
localStorage.setItem(SCHOOL_LANG_KEY, lang)
|
||||||
|
}
|
||||||
|
|
||||||
// Uebersetzung abrufen (Fallback: en → de → key)
|
// Uebersetzung abrufen (Fallback: en → de → key)
|
||||||
export function t(key: string, lang: Language): string {
|
export function t(key: string, lang: Language): string {
|
||||||
return translations[lang]?.[key] || translations['en']?.[key] || translations['de']?.[key] || key
|
return translations[lang]?.[key] || translations['en']?.[key] || translations['de']?.[key] || key
|
||||||
|
|||||||
Reference in New Issue
Block a user