Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 67 additions & 0 deletions dashboard/src/components/Layout.css
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,64 @@
color: var(--text-primary);
}

.language-menu {
position: relative;
}

.language-menu .theme-toggle-btn {
width: 100%;
}

.language-menu-list {
position: absolute;
left: 0;
right: 0;
bottom: calc(100% + 0.35rem);
display: flex;
flex-direction: column;
gap: 0.15rem;
min-width: 160px;
padding: 0.3rem;
background: var(--bg-white);
border: 1px solid var(--border);
border-radius: var(--radius);
box-shadow: 0 10px 30px rgba(15, 23, 42, 0.16);
z-index: 120;
}

.language-menu-item {
display: flex;
align-items: center;
width: 100%;
min-height: 34px;
padding: 0.45rem 0.6rem;
color: var(--text-secondary);
background: transparent;
border: 0;
border-radius: calc(var(--radius) - 2px);
font-size: 0.875rem;
font-weight: 500;
text-align: left;
cursor: pointer;
transition: all 0.2s;
}

.language-menu-item:hover {
background: var(--bg-light);
color: var(--text-primary);
}

.language-menu-item.active {
background: rgba(37, 211, 102, 0.1);
color: var(--primary);
}

.sidebar.collapsed .language-menu-list {
right: auto;
left: calc(100% + 0.5rem);
bottom: 0;
}

.logout-btn {
display: flex;
align-items: center;
Expand Down Expand Up @@ -352,6 +410,15 @@
transform: scaleX(-1);
}

[dir="rtl"] .language-menu-item {
text-align: right;
}

[dir="rtl"] .sidebar.collapsed .language-menu-list {
right: calc(100% + 0.5rem);
left: auto;
}

[dir="rtl"] .main-content {
margin-left: 0;
margin-right: 260px;
Expand Down
74 changes: 57 additions & 17 deletions dashboard/src/components/Layout.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { useState, useEffect } from 'react';
import { useState, useEffect, useRef } from 'react';
import { NavLink, Outlet } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
import {
Expand All @@ -22,7 +22,7 @@ import {
} from 'lucide-react';
import { useTheme } from '../hooks/useTheme';
import { type UserRole } from '../hooks/useRole';
import { supportedLanguages, type SupportedLanguage } from '../i18n';
import { languageOptions, resolveSupportedLanguage, type SupportedLanguage } from '../i18n';
import './Layout.css';

interface LayoutProps {
Expand Down Expand Up @@ -54,6 +54,8 @@ export function Layout({ onLogout, userRole }: LayoutProps) {
const [isCollapsed, setIsCollapsed] = useState(false);
const [isMobileOpen, setIsMobileOpen] = useState(false);
const [isMobile, setIsMobile] = useState(window.innerWidth < 768);
const [isLanguageMenuOpen, setIsLanguageMenuOpen] = useState(false);
const languageMenuRef = useRef<HTMLDivElement>(null);

useEffect(() => {
const handleResize = () => {
Expand All @@ -76,16 +78,35 @@ export function Layout({ onLogout, userRole }: LayoutProps) {
};
}, [isMobileOpen]);

useEffect(() => {
if (!isLanguageMenuOpen) return;

const closeOnOutsideClick = (event: MouseEvent) => {
if (!languageMenuRef.current?.contains(event.target as Node)) {
setIsLanguageMenuOpen(false);
}
};
const closeOnEscape = (event: KeyboardEvent) => {
if (event.key === 'Escape') setIsLanguageMenuOpen(false);
};

document.addEventListener('mousedown', closeOnOutsideClick);
document.addEventListener('keydown', closeOnEscape);
return () => {
document.removeEventListener('mousedown', closeOnOutsideClick);
document.removeEventListener('keydown', closeOnEscape);
};
}, [isLanguageMenuOpen]);

const toggleCollapse = () => setIsCollapsed(!isCollapsed);
const toggleMobile = () => setIsMobileOpen(!isMobileOpen);

const currentLang = (i18n.resolvedLanguage || i18n.language || 'en').split('-')[0] as SupportedLanguage;
const cycleLanguage = () => {
const idx = supportedLanguages.indexOf(currentLang);
const next = supportedLanguages[(idx + 1) % supportedLanguages.length];
void i18n.changeLanguage(next);
const currentLang = resolveSupportedLanguage(i18n.resolvedLanguage || i18n.language);
const languageLabel = languageOptions.find(option => option.value === currentLang)?.compactLabel ?? 'EN';
const changeLanguage = (language: SupportedLanguage) => {
setIsLanguageMenuOpen(false);
void i18n.changeLanguage(language);
};
const languageLabel = currentLang === 'he' ? 'עברית' : 'EN';
const isRtl = currentLang === 'he';

return (
Expand Down Expand Up @@ -151,15 +172,34 @@ export function Layout({ onLogout, userRole }: LayoutProps) {
</nav>

<div className="sidebar-footer">
<button
className="theme-toggle-btn"
onClick={cycleLanguage}
title={t('common.language')}
aria-label={t('common.language')}
>
<Languages size={18} />
{!isCollapsed && <span>{languageLabel}</span>}
</button>
<div className="language-menu" ref={languageMenuRef}>
<button
className="theme-toggle-btn"
onClick={() => setIsLanguageMenuOpen(open => !open)}
title={t('common.language')}
aria-label={t('common.language')}
aria-haspopup="menu"
aria-expanded={isLanguageMenuOpen}
>
<Languages size={18} />
{!isCollapsed && <span>{languageLabel}</span>}
</button>
{isLanguageMenuOpen && (
<div className="language-menu-list" role="menu" aria-label={t('common.language')}>
{languageOptions.map(option => (
<button
key={option.value}
className={`language-menu-item ${option.value === currentLang ? 'active' : ''}`}
onClick={() => changeLanguage(option.value)}
role="menuitemradio"
aria-checked={option.value === currentLang}
>
<span>{option.label}</span>
</button>
))}
</div>
)}
</div>
<button
className="theme-toggle-btn"
onClick={toggleTheme}
Expand Down
38 changes: 33 additions & 5 deletions dashboard/src/i18n/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,65 @@ import { initReactI18next } from 'react-i18next';
import LanguageDetector from 'i18next-browser-languagedetector';
import en from './locales/en.json';
import he from './locales/he.json';
import zhCN from './locales/zh-CN.json';
import zhHK from './locales/zh-HK.json';

export const supportedLanguages = ['en', 'he'] as const;
export const supportedLanguages = ['en', 'he', 'zh-CN', 'zh-HK'] as const;
export type SupportedLanguage = (typeof supportedLanguages)[number];

export const rtlLanguages: SupportedLanguage[] = ['he'];

export const languageOptions: Array<{ value: SupportedLanguage; label: string; compactLabel: string }> = [
{ value: 'en', label: 'English', compactLabel: 'EN' },
{ value: 'he', label: 'עברית', compactLabel: 'עברית' },
{ value: 'zh-CN', label: '简体中文', compactLabel: '简中' },
{ value: 'zh-HK', label: '繁體中文', compactLabel: '繁中' },
];

export function resolveSupportedLanguage(lang?: string): SupportedLanguage {
const value = lang || 'en';
const exact = supportedLanguages.find(supported => supported.toLowerCase() === value.toLowerCase());
if (exact) return exact;

const parts = value.toLowerCase().split('-');
const base = parts[0];
if (base === 'zh') {
const subtags = new Set(parts.slice(1));
if (subtags.has('hant') || subtags.has('hk') || subtags.has('mo') || subtags.has('tw')) return 'zh-HK';
return 'zh-CN';
}

return supportedLanguages.find(supported => supported === base) ?? 'en';
}

void i18n
.use(LanguageDetector)
.use(initReactI18next)
.init({
resources: {
en: { translation: en },
he: { translation: he },
'zh-CN': { translation: zhCN },
'zh-HK': { translation: zhHK },
},
fallbackLng: 'en',
supportedLngs: supportedLanguages as unknown as string[],
nonExplicitSupportedLngs: true,
nonExplicitSupportedLngs: false,
interpolation: { escapeValue: false },
detection: {
order: ['localStorage', 'navigator'],
lookupLocalStorage: 'openwa_language',
caches: ['localStorage'],
convertDetectedLanguage: (lang: string) => resolveSupportedLanguage(lang),
},
react: { useSuspense: false },
});

function applyDirection(lang: string) {
const base = (lang || 'en').split('-')[0] as SupportedLanguage;
const dir = rtlLanguages.includes(base) ? 'rtl' : 'ltr';
const resolved = resolveSupportedLanguage(lang);
const dir = rtlLanguages.includes(resolved) ? 'rtl' : 'ltr';
if (typeof document !== 'undefined') {
document.documentElement.lang = base;
document.documentElement.lang = resolved;
document.documentElement.dir = dir;
}
}
Expand Down
Loading