- Најавете се во вашиот IKnow акаунт + {t('login_subtitle')}

+ {/* Language Switcher above email field, centered */} +

+ +

{/* Email Field */}

- Внесете е-пошта + {t('login_email_label')}

@@ -110,5 +115,5 @@ onChange={handleInputChange} className="w-full pl-10 pr-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary transition-colors" - placeholder="Внесете е-пошта" + placeholder={t('login_email_placeholder')} />

@@ -118,5 +123,5 @@

- Лозинка + {t('login_password_label')}

@@ -132,5 +137,5 @@ onChange={handleInputChange} className="w-full pl-10 pr-12 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-primary focus:border-primary transition-colors" - placeholder="Внесете лозинка" + placeholder={t('login_password_placeholder')} />

@@ -164,5 +169,5 @@ className="text-sm text-primary hover:text-blue-700 font-medium transition-colors" > - Заборавена лозинка? + {t('login_forgot_password')}

@@ -170,5 +175,5 @@ {errorMessage && (

- {errorMessage} + {t(errorMessage) || errorMessage}

)} @@ -181,5 +186,5 @@ > - {isSubmitting ? 'Најави се...' : 'Најави се'} + {isSubmitting ? t('login_button_loading') : t('login_button')} @@ -189,7 +194,7 @@

- Немате акаунт?{' '} + {t('login_no_account')}{' '}

@@ -202,5 +207,5 @@ - Студентски информационен систем + {t('login_footer')}

Index: src/app/professor/profile/page.tsx =================================================================== --- src/app/professor/profile/page.tsx (revision 298f9b3987050da08cb65ce62c3d1f8295faeff4) +++ src/app/professor/profile/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) @@ -18,4 +18,5 @@ import { getAccessToken } from "@/lib/auth"; import { IconDefinition } from "@fortawesome/fontawesome-svg-core"; +import { useTranslation } from 'react-i18next'; type PersonalInfo = { @@ -94,15 +95,18 @@ } -const InfoRow = ({ label, value, icon }: InfoRowProps) => ( -

- {icon && } - {label}: +const InfoRow = ({ label, value, icon }: InfoRowProps) => { + const { t } = useTranslation(); + return ( +

+ {icon && } + {t(label)}: +

+ {value || t('n_a')} +

- {value || "N/A"} -

-); + ); +}; interface SectionProps { @@ -112,15 +116,18 @@ } -const Section = ({ title, icon, children }: SectionProps) => ( -

- -

{title}

+const Section = ({ title, icon, children }: SectionProps) => { + const { t } = useTranslation(); + return ( +

+ +

{t(title)}

{children}

-); + ); +}; export default function ProfessorProfilePage() { @@ -128,4 +135,5 @@ const [isLoading, setIsLoading] = useState(true); const [errorMessage, setErrorMessage] = useState(null); + const { t } = useTranslation(); useEffect(() => { @@ -177,5 +185,5 @@ return (

{t('loading')}

); @@ -186,5 +194,5 @@

- {errorMessage ?? "Failed to load profile."} + {errorMessage ?? t('failed_to_load_profile')}

@@ -210,5 +218,5 @@

- Индекс: {personalInfo.index} | ЕМБГ: {personalInfo.embg} + {t('index')}: {personalInfo.index} | {t('embg')}: {personalInfo.embg}

@@ -219,24 +227,24 @@

{/* Personal Information */} -

- - - - - +

+ + + + + - - - - - - + + + + + + {personalInfo.notes && (

Забелешка:

{t('note')}:

{personalInfo.notes}

@@ -245,28 +253,28 @@ {/* Birth Information */} -

- - - +

+ + +

{/* Contact Information */}

- - - - - + + + + +

- - - - - - + + + + + +

Index: src/app/professor/students/page.tsx =================================================================== --- src/app/professor/students/page.tsx (revision 298f9b3987050da08cb65ce62c3d1f8295faeff4) +++ src/app/professor/students/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) @@ -2,4 +2,5 @@ import { useEffect, useMemo, useState } from "react"; +import { useTranslation } from 'react-i18next'; type UsersBySubject = { @@ -36,4 +37,5 @@ export default function ProfessorStudentsPage() { + const { t } = useTranslation(); const [subjects, setSubjects] = useState([]); const [loading, setLoading] = useState(true); @@ -129,8 +131,9 @@

Professor • Students

{t('prof_students_title')}

- Data comes from /api/prof/students (demo store). + {t('prof_students_data_note')} /api/prof/students (demo store).

@@ -138,5 +141,5 @@

- Filter by subject + {t('filter_by_subject')} setStudentIdQuery(e.target.value)} @@ -177,9 +180,9 @@ - Student - ID - Subject - Grade - Actions + {t('student')} + {t('id')} + {t('subject')} + {t('grade')} + {t('actions')} @@ -188,5 +191,5 @@ - Loading... + {t('loading')} @@ -194,5 +197,5 @@ - No students found. + {t('no_students_found')} @@ -227,5 +230,5 @@ - Current: {r.grade > 0 ? r.grade : "—"} + {t('current')}: {r.grade > 0 ? r.grade : t('none')}

@@ -245,5 +248,5 @@ }} > - Add grade + {t('add_grade')} @@ -260,5 +263,5 @@ }} > - Edit grade + {t('edit_grade')} @@ -275,5 +278,5 @@ }} > - Remove grade + {t('remove_grade')}

Index: src/app/students/applications/page.tsx =================================================================== --- src/app/students/applications/page.tsx (revision 298f9b3987050da08cb65ce62c3d1f8295faeff4) +++ src/app/students/applications/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) @@ -14,4 +14,5 @@ } from '@fortawesome/free-solid-svg-icons'; import { useState } from 'react'; +import { useTranslation } from 'react-i18next'; import applicationsData from '@/data/applications.json'; @@ -28,7 +29,8 @@ const CompletedBadge = ({ completed }: { completed: string }) => { - if (completed === "Да") { - return ( - + const { t } = useTranslation(); + if (completed === t('yes', 'Да')) { + return ( + @@ -36,5 +38,5 @@ } else { return ( - + @@ -64,7 +66,8 @@ export default function ApplicationsPage() { + const { t } = useTranslation(); const [selectedSession, setSelectedSession] = useState(applicationsData.currentSession.id); const [isDropdownOpen, setIsDropdownOpen] = useState(false); - + const currentSessionData = applicationsData.examSessions.find(s => s.id === selectedSession) || applicationsData.currentSession; const { applications } = applicationsData; @@ -79,7 +82,7 @@

Пријави

{t('applications_header', 'Пријави')}

- Електронски пријави за испити + {t('applications_subheader', 'Електронски пријави за испити')}

@@ -92,7 +95,7 @@

- Избери испитна сесија: + {t('select_exam_session', 'Избери испитна сесија:')}

- +

- + {isDropdownOpen && (

@@ -122,6 +125,6 @@ className="w-full px-4 py-3 text-left text-sm hover:bg-gray-50 focus:outline-none focus:bg-gray-50 first:rounded-t-lg last:rounded-b-lg" > -

{session.name}

{session.year} - {session.semester} - {session.session}

{t(session.id, session.name)}

{session.year} - {t(session.semester, session.semester)} - {t(session.session, session.session)}

))} @@ -135,7 +138,7 @@

Пријавени испити

- +

{t('registered_exams', 'Пријавени испити')}

@@ -143,12 +146,12 @@ - - - - - - - - + + + + + + + + @@ -166,5 +169,5 @@

- {application.subject} + {t(application.subject, application.subject)}

@@ -179,5 +182,5 @@

- {application.instructor} + {t(application.instructor, application.instructor)}

@@ -194,7 +197,7 @@

Важна забелешка

{t('important_note', 'Важна забелешка')}

- {applicationsData.note} + {t('applications_important_note_text')}

@@ -211,5 +214,5 @@

Пријавени испити

{t('registered_exams', 'Пријавени испити')}

{applications.length} @@ -225,7 +228,7 @@

Завршени

{t('completed', 'Завршени')}

- {applications.filter(app => app.completed === "Да").length} + {applications.filter(app => app.completed === t('yes', 'Да')).length}

@@ -239,5 +242,5 @@

Вкупна такса

{t('total_fee', 'Вкупна такса')}

{applications.reduce((sum, app) => sum + parseFloat(app.fee.replace(',', '.')), 0).toFixed(2)} Index: src/app/students/documents/page.tsx =================================================================== --- src/app/students/documents/page.tsx (revision 298f9b3987050da08cb65ce62c3d1f8295faeff4) +++ src/app/students/documents/page.tsx (revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a) @@ -15,4 +15,5 @@ import { useState } from 'react'; import documentsData from '@/data/documents.json'; +import { useTranslation } from 'react-i18next'; interface TableCellProps { @@ -28,5 +29,6 @@ const StatusBadge = ({ status }: { status: string }) => { - if (status === "approved") { + const { t } = useTranslation(); + if (status === t('approved', 'Одобрено')) { return ( @@ -43,6 +45,7 @@ const PriceBadge = ({ price }: { price: number }) => { + const { t } = useTranslation(); if (price === 0) { - return 0,00; + return {t('free', '0,00')}; } return {price.toFixed(2)}; @@ -55,4 +58,5 @@ const [currentPage, setCurrentPage] = useState(1); const [recordsPerPage, setRecordsPerPage] = useState(15); + const { t } = useTranslation(); const selectedDocument = documentsData.documentTypes.find(d => d.id === selectedDocumentType); @@ -73,7 +77,7 @@

Документи

{t('documents')}

- Барање и преглед на документи + {t('documents_overview', 'Преглед на вашите документи и нивниот статус.')}

@@ -85,5 +89,5 @@

- Ново барање за документ + {t('new_document_request', 'Ново барање за документ')}

@@ -92,5 +96,5 @@

- Изберете документ: + {t('select_document', 'Избери документ')}:

@@ -101,5 +105,5 @@

- {selectedDocument?.name || "Изберете документ"} + {selectedDocument ? t(selectedDocument.id) : t('select_document', 'Избери документ')} -

{docType.name}

{t(docType.id)}

{docType.price > 0 && ( -

Цена: {docType.price} мкд

{t('price', 'Цена')}: {docType.price} мкд

)} @@ -135,5 +139,5 @@

- Коментар: + {t('comment', 'Коментар')}:

</div>
@@ -153,5 +157,5 @@
           >
             <FontAwesomeIcon icon={faFileText} className="w-4 h-4" />
-            Внеси
+            {t('submit', 'Поднеси')}
           </button>
         </div>
@@ -161,5 +165,5 @@
       <div className="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
         <div className="bg-primary text-white px-6 py-4">
-          <h2 className="text-xl font-bold">Мои документи</h2>
+          <h2 className="text-xl font-bold">{t('my_documents', 'Мои документи')}</h2>
         </div>
         
@@ -169,13 +173,13 @@
               <tr>
                 <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">#</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Архива</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Датум</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Барање</th>
-                <th className="px-4 py-4 text-right text-xs font-medium text-gray-500 uppercase tracking-wider">Цена</th>
-                <th className="px-4 py-4 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">Платено</th>
-                <th className="px-4 py-4 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">Документ</th>
-                <th className="px-4 py-4 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">Плати онлајн</th>
-                <th className="px-4 py-4 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">Статус</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Коментар</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('archive', 'Архива')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('date', 'Датум')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('request', 'Барање')}</th>
+                <th className="px-4 py-4 text-right text-xs font-medium text-gray-500 uppercase tracking-wider">{t('price', 'Цена')}</th>
+                <th className="px-4 py-4 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">{t('paid', 'Платено')}</th>
+                <th className="px-4 py-4 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">{t('document', 'Документ')}</th>
+                <th className="px-4 py-4 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">{t('pay_online', 'Плати онлајн')}</th>
+                <th className="px-4 py-4 text-center text-xs font-medium text-gray-500 uppercase tracking-wider">{t('status', 'Статус')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('comment', 'Коментар')}</th>
               </tr>
             </thead>
@@ -187,5 +191,5 @@
                   <TableCell className="text-gray-600">{document.date}</TableCell>
                   <TableCell className="font-medium text-gray-900 max-w-xs">
-                    {document.request}
+                    {t(document.request)}
                   </TableCell>
                   <TableCell className="text-right">
@@ -206,5 +210,5 @@
                       <FontAwesomeIcon icon={faCheckCircle} className="w-5 h-5 text-green-600" />
                     ) : (
-                      <span className="text-gray-400">—</span>
+                      <span className="text-gray-400">{t('none', '—')}</span>
                     )}
                   </TableCell>
@@ -214,5 +218,5 @@
                   <TableCell>
                     {document.comment || (
-                      <span className="text-gray-400">—</span>
+                      <span className="text-gray-400">{t('none', '—')}</span>
                     )}
                   </TableCell>
@@ -227,5 +231,5 @@
           <div className="flex items-center gap-4 text-sm text-gray-700">
             <div className="flex items-center gap-2">
-              <span>Прикажи редови:</span>
+              <span>{t('show_rows', 'Прикажи редови')}:</span>
               <select
                 value={recordsPerPage}
@@ -239,5 +243,5 @@
             </div>
             <div>
-              Страна <input
+              {t('page', 'Страница')} <input
                 type="number"
                 min="1"
@@ -246,5 +250,5 @@
                 onChange={(e) => setCurrentPage(Number(e.target.value))}
                 className="w-12 border border-gray-300 rounded px-2 py-1 text-sm text-center focus:outline-none focus:ring-1 focus:ring-primary"
-              /> од {totalPages}
+              /> {t('of', 'од')} {totalPages}
             </div>
           </div>
@@ -266,5 +270,5 @@
             </button>
             <span className="px-4 py-2 bg-primary text-white rounded text-sm font-medium">
-              Прва
+              {t('first', 'Прва')}
             </span>
             <button
@@ -283,10 +287,10 @@
             </button>
             <span className="ml-4 text-sm text-gray-700">
-              Последна
+              {t('last', 'Последна')}
             </span>
           </div>
 
           <div className="text-sm text-gray-700">
-            Вкупно: {documents.length}
+            {t('total', 'Вкупно')}: {documents.length}
           </div>
         </div>
@@ -297,5 +301,5 @@
             <FontAwesomeIcon icon={faMoneyBillWave} className="w-5 h-5 text-blue-600 mt-0.5 flex-shrink-0" />
             <p className="text-sm text-blue-800 leading-relaxed">
-              {paymentInfo}
+              {t('documents_payment_info', paymentInfo)}
             </p>
           </div>
@@ -311,5 +315,5 @@
             </div>
             <div>
-              <h3 className="text-lg font-bold text-gray-900">Вкупно документи</h3>
+              <h3 className="text-lg font-bold text-gray-900">{t('total_documents', 'Вкупно документи')}</h3>
               <p className="text-2xl font-bold text-blue-600">
                 {documents.length}
@@ -325,5 +329,5 @@
             </div>
             <div>
-              <h3 className="text-lg font-bold text-gray-900">Одобрени</h3>
+              <h3 className="text-lg font-bold text-gray-900">{t('approved', 'Одобрени')}</h3>
               <p className="text-2xl font-bold text-green-600">
                 {documents.filter(doc => doc.status === "approved").length}
@@ -339,7 +343,7 @@
             </div>
             <div>
-              <h3 className="text-lg font-bold text-gray-900">Вкупна цена</h3>
+              <h3 className="text-lg font-bold text-gray-900">{t('total_price', 'Вкупна цена')}</h3>
               <p className="text-2xl font-bold text-yellow-600">
-                {documents.reduce((sum, doc) => sum + doc.price, 0).toFixed(2)} мкд
+                {documents.reduce((sum, doc) => sum + doc.price, 0).toFixed(2)} {t('mkd', 'мкд')}
               </p>
             </div>
Index: src/app/students/profile/page.tsx
===================================================================
--- src/app/students/profile/page.tsx	(revision 298f9b3987050da08cb65ce62c3d1f8295faeff4)
+++ src/app/students/profile/page.tsx	(revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a)
@@ -20,4 +20,5 @@
 import { getAccessToken } from '@/lib/auth';
 import { IconDefinition } from '@fortawesome/fontawesome-svg-core';
+import { useTranslation } from 'react-i18next';
 
 type PersonalInfo = {
@@ -94,15 +95,18 @@
 }
 
-const InfoRow = ({ label, value, icon }: InfoRowProps) => (
-  <div className="flex justify-between items-center py-3 border-b border-gray-100 last:border-b-0">
-    <div className="flex items-center gap-2 text-gray-600 font-medium">
-      {icon && <FontAwesomeIcon icon={icon} className="w-4 h-4" />}
-      <span>{label}:</span>
+const InfoRow = ({ label, value, icon }: InfoRowProps) => {
+  const { t } = useTranslation();
+  return (
+    <div className="flex justify-between items-center py-3 border-b border-gray-100 last:border-b-0">
+      <div className="flex items-center gap-2 text-gray-600 font-medium">
+        {icon && <FontAwesomeIcon icon={icon} className="w-4 h-4" />}
+        <span>{t(label)}:</span>
+      </div>
+      <div className="text-gray-900 font-semibold text-right max-w-xs break-words">
+        {value || t('n_a')}
+      </div>
     </div>
-    <div className="text-gray-900 font-semibold text-right max-w-xs break-words">
-      {value || "N/A"}
-    </div>
-  </div>
-);
+  );
+};
 
 interface SectionProps {
@@ -112,17 +116,20 @@
 }
 
-const Section = ({ title, icon, children }: SectionProps) => (
-  <div className="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
-    <div className="bg-primary text-white px-6 py-4">
-      <div className="flex items-center gap-3">
-        <FontAwesomeIcon icon={icon} className="text-xl" />
-        <h2 className="text-xl font-bold">{title}</h2>
+const Section = ({ title, icon, children }: SectionProps) => {
+  const { t } = useTranslation();
+  return (
+    <div className="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
+      <div className="bg-primary text-white px-6 py-4">
+        <div className="flex items-center gap-3">
+          <FontAwesomeIcon icon={icon} className="text-xl" />
+          <h2 className="text-xl font-bold">{t(title)}</h2>
+        </div>
+      </div>
+      <div className="p-6">
+        {children}
       </div>
     </div>
-    <div className="p-6">
-      {children}
-    </div>
-  </div>
-);
+  );
+};
 
 export default function ProfilePage() {
@@ -130,4 +137,5 @@
   const [isLoading, setIsLoading] = useState(true);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const { t } = useTranslation();
 
   useEffect(() => {
@@ -180,5 +188,5 @@
       <div className="min-h-screen pb-8">
         <div className="bg-white rounded-xl shadow-sm border border-gray-100 p-6">
-          Loading...
+          {t('loading')}
         </div>
       </div>
@@ -190,5 +198,5 @@
       <div className="min-h-screen pb-8">
         <div className="rounded-lg border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700">
-          {errorMessage ?? 'Failed to load profile.'}
+          {errorMessage ?? t('failed_to_load_profile')}
         </div>
       </div>
@@ -214,5 +222,5 @@
             </h1>
             <div className="text-lg opacity-90">
-              Индекс: {personalInfo.index} | ЕМБГ: {personalInfo.embg}
+              {t('index')}: {personalInfo.index} | {t('embg')}: {personalInfo.embg}
             </div>
             <div className="text-base opacity-80 mt-1">
@@ -227,32 +235,32 @@
         
         {/* Personal Information */}
-        <Section title="Лични податоци" icon={faIdCard}>
-          <InfoRow label="Име" value={personalInfo.firstName} />
-          <InfoRow label="Средно име" value={personalInfo.middleName} />
-          <InfoRow label="Презиме" value={personalInfo.lastName} />
-          <InfoRow label="Моминско презиме" value={personalInfo.maidenName} />
+        <Section title="personal_info" icon={faIdCard}>
+          <InfoRow label="first_name" value={personalInfo.firstName} />
+          <InfoRow label="middle_name" value={personalInfo.middleName} />
+          <InfoRow label="last_name" value={personalInfo.lastName} />
+          <InfoRow label="maiden_name" value={personalInfo.maidenName} />
           <InfoRow 
-            label="Датум на раѓање" 
+            label="date_of_birth" 
             value={personalInfo.dateOfBirth} 
             icon={faCalendarAlt} 
           />
           <InfoRow 
-            label="Пол" 
+            label="gender" 
             value={personalInfo.gender} 
-            icon={personalInfo.gender === 'машки' ? faMars : faVenus} 
+            icon={personalInfo.gender === t('male') ? faMars : faVenus} 
           />
           <InfoRow 
-            label="Националност" 
+            label="nationality" 
             value={personalInfo.nationality} 
             icon={faFlag} 
           />
-          <InfoRow label="Државјанство" value={personalInfo.citizenship} />
-          <InfoRow label="Стипендија" value={personalInfo.scholarship} />
-          <InfoRow label="Тековен план" value={personalInfo.currentPlan} />
-          <InfoRow label="Бр. во матична книга" value={personalInfo.registryNumber} />
-          <InfoRow label="Група на студирање" value={personalInfo.studyGroup} />
+          <InfoRow label="citizenship" value={personalInfo.citizenship} />
+          <InfoRow label="scholarship" value={personalInfo.scholarship} />
+          <InfoRow label="current_plan" value={personalInfo.currentPlan} />
+          <InfoRow label="registry_number" value={personalInfo.registryNumber} />
+          <InfoRow label="study_group" value={personalInfo.studyGroup} />
           {personalInfo.notes && (
             <div className="mt-4 p-4 bg-blue-50 rounded-lg">
-              <div className="text-sm font-medium text-blue-800 mb-1">Забелешка:</div>
+              <div className="text-sm font-medium text-blue-800 mb-1">{t('note')}:</div>
               <div className="text-sm text-blue-700">{personalInfo.notes}</div>
             </div>
@@ -261,60 +269,60 @@
 
         {/* Birth Information */}
-        <Section title="Податоци за раѓање" icon={faMapMarkerAlt}>
-          <InfoRow label="Место на раѓање" value={birthInfo.placeOfBirth} />
-          <InfoRow label="Општина на раѓање" value={birthInfo.municipalityOfBirth} />
-          <InfoRow label="Земја" value={birthInfo.country} />
+        <Section title="birth_info" icon={faMapMarkerAlt}>
+          <InfoRow label="place_of_birth" value={birthInfo.placeOfBirth} />
+          <InfoRow label="municipality_of_birth" value={birthInfo.municipalityOfBirth} />
+          <InfoRow label="country" value={birthInfo.country} />
         </Section>
 
         {/* Previous Education */}
-        <Section title="Претходно образование" icon={faSchool}>
-          <InfoRow label="Тип" value={previousEducation.type} />
-          <InfoRow label="Професија" value={previousEducation.profession} />
-          <InfoRow label="Просек" value={previousEducation.average} />
-          <InfoRow label="Јазик" value={previousEducation.language} />
-          <InfoRow label="Земја" value={previousEducation.country} />
-          <InfoRow label="Претходен универзитет" value={previousEducation.previousUniversity} />
-          <InfoRow label="Претходен факултет" value={previousEducation.previousFaculty} />
-          <InfoRow label="Режим на претходни студии" value={previousEducation.previousStudyMode} />
+        <Section title="previous_education" icon={faSchool}>
+          <InfoRow label="type" value={previousEducation.type} />
+          <InfoRow label="profession" value={previousEducation.profession} />
+          <InfoRow label="average" value={previousEducation.average} />
+          <InfoRow label="language" value={previousEducation.language} />
+          <InfoRow label="country" value={previousEducation.country} />
+          <InfoRow label="previous_university" value={previousEducation.previousUniversity} />
+          <InfoRow label="previous_faculty" value={previousEducation.previousFaculty} />
+          <InfoRow label="previous_study_mode" value={previousEducation.previousStudyMode} />
         </Section>
 
         {/* Enrollment Information */}
-        <Section title="Податоци за упис" icon={faGraduationCap}>
-          <InfoRow label="Година на упис" value={enrollmentInfo.enrollmentYear} />
-          <InfoRow label="Статус" value={enrollmentInfo.status} />
-          <InfoRow label="Циклус" value={enrollmentInfo.cycle} />
-          <InfoRow label="Запишана програма" value={enrollmentInfo.program} />
-          <InfoRow label="Квота на прв упис" value={enrollmentInfo.quota} />
-          <InfoRow label="Бр. дипл. ср. образование" value={enrollmentInfo.secondaryEducationNumber} />
-          <InfoRow label="Кред. пр. образование" value={enrollmentInfo.previousEducationCredits} />
+        <Section title="enrollment_info" icon={faGraduationCap}>
+          <InfoRow label="enrollment_year" value={enrollmentInfo.enrollmentYear} />
+          <InfoRow label="status" value={enrollmentInfo.status} />
+          <InfoRow label="cycle" value={enrollmentInfo.cycle} />
+          <InfoRow label="program" value={enrollmentInfo.program} />
+          <InfoRow label="quota" value={enrollmentInfo.quota} />
+          <InfoRow label="secondary_education_number" value={enrollmentInfo.secondaryEducationNumber} />
+          <InfoRow label="previous_education_credits" value={enrollmentInfo.previousEducationCredits} />
         </Section>
 
         {/* Contact Information */}
         <div className="lg:col-span-2">
-          <Section title="Контакт" icon={faAddressCard}>
+          <Section title="contact" icon={faAddressCard}>
             <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
               <div>
                 <InfoRow 
-                  label="Место на живеење" 
+                  label="place_of_residence" 
                   value={contact.placeOfResidence} 
                   icon={faMapMarkerAlt} 
                 />
-                <InfoRow label="Општина на живеење" value={contact.municipalityOfResidence} />
-                <InfoRow label="Држава" value={contact.country} />
-                <InfoRow label="Адреса" value={contact.address} />
-                <InfoRow label="Адреса на престој" value={contact.temporaryAddress} />
+                <InfoRow label="municipality_of_residence" value={contact.municipalityOfResidence} />
+                <InfoRow label="country" value={contact.country} />
+                <InfoRow label="address" value={contact.address} />
+                <InfoRow label="temporary_address" value={contact.temporaryAddress} />
               </div>
               <div>
-                <InfoRow label="Телефон" value={contact.phone} icon={faPhone} />
-                <InfoRow label="Моб. телефон" value={contact.mobilePhone} icon={faPhone} />
-                <InfoRow label="Број на пасош" value={contact.passportNumber} icon={faPassport} />
-                <InfoRow label="Датум на истекување на пасошот" value={contact.passportExpiryDate} />
+                <InfoRow label="phone" value={contact.phone} icon={faPhone} />
+                <InfoRow label="mobile_phone" value={contact.mobilePhone} icon={faPhone} />
+                <InfoRow label="passport_number" value={contact.passportNumber} icon={faPassport} />
+                <InfoRow label="passport_expiry_date" value={contact.passportExpiryDate} />
                 <InfoRow 
-                  label="Е-пошта" 
+                  label="email" 
                   value={contact.email} 
                   icon={faEnvelope} 
                 />
                 <InfoRow 
-                  label="Microsoft email" 
+                  label="microsoft_email" 
                   value={contact.microsoftEmail} 
                   icon={faEnvelope} 
Index: src/app/students/semesters/page.tsx
===================================================================
--- src/app/students/semesters/page.tsx	(revision 298f9b3987050da08cb65ce62c3d1f8295faeff4)
+++ src/app/students/semesters/page.tsx	(revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a)
@@ -14,4 +14,5 @@
 import { useEffect, useState } from 'react';
 import { getAccessToken } from '@/lib/auth';
+import { useTranslation } from 'react-i18next';
 
 type Semester = {
@@ -54,18 +55,17 @@
 
 const StatusBadge = ({ status }: { status: string }) => {
+  const { t } = useTranslation();
   const baseClasses = "px-2 py-1 rounded-full text-xs font-medium";
-  
-  if (status === "валиден") {
+  if (status === t('valid')) {
     return (
       <span className={`${baseClasses} bg-green-100 text-green-800 flex items-center gap-1`}>
         <FontAwesomeIcon icon={faCheckCircle} className="w-3 h-3" />
-        {status}
+        {t('valid')}
       </span>
     );
   }
-  
   return (
     <span className={`${baseClasses} bg-gray-100 text-gray-800`}>
-      {status}
+      {t(status) || status}
     </span>
   );
@@ -73,5 +73,6 @@
 
 const YesNoBadge = ({ value }: { value: string }) => {
-  if (value === "Да") {
+  const { t } = useTranslation();
+  if (value === t('yes')) {
     return (
       <span className="inline-flex items-center justify-center w-6 h-6 bg-green-100 text-green-600 rounded-full">
@@ -79,5 +80,5 @@
       </span>
     );
-  } else if (value === "Не") {
+  } else if (value === t('no')) {
     return (
       <span className="inline-flex items-center justify-center w-6 h-6 bg-red-100 text-red-600 rounded-full">
@@ -112,4 +113,5 @@
   const [isLoading, setIsLoading] = useState(true);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const { t } = useTranslation();
 
   useEffect(() => {
@@ -162,5 +164,5 @@
       <div className="min-h-screen pb-8">
         <div className="bg-white rounded-xl shadow-sm border border-gray-100 p-6">
-          Loading...
+          {t('loading')}
         </div>
       </div>
@@ -187,7 +189,7 @@
           </div>
           <div>
-            <h1 className="text-3xl font-bold mb-2">Семестри</h1>
+            <h1 className="text-3xl font-bold mb-2">{t('semesters')}</h1>
             <p className="text-lg opacity-90">
-              Преглед на сите запишани семестри и нивниот статус
+              {t('semesters_overview')}
             </p>
           </div>
@@ -198,5 +200,5 @@
       <div className="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
         <div className="bg-primary text-white px-6 py-4">
-          <h2 className="text-xl font-bold">Листа на семестри</h2>
+          <h2 className="text-xl font-bold">{t('semesters_list')}</h2>
         </div>
         
@@ -206,23 +208,23 @@
               <tr>
                 <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">#</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Семестар</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Насока</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Квота</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Забелешка</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Студ.Ком.</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Сума</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Платено</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">УКИМ</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Креирано на</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Датум промена</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Ц.Кр</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Тип</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Док.</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Док1.</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Вериф.</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Таксени</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Потписи</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Статус</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Зав.</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('semester')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('direction')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('quota')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('note')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('student_com')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('sum')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('paid')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('ukim')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('created_on')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('date_changed')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('credits')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('type')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('doc')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('doc1')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('verified')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('taxes')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('signatures')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('status')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('completed')}</th>
               </tr>
             </thead>
@@ -335,5 +337,5 @@
             </div>
             <div>
-              <h3 className="text-lg font-bold text-gray-900">Завршени семестри</h3>
+              <h3 className="text-lg font-bold text-gray-900">{t('completed_semesters')}</h3>
               <p className="text-2xl font-bold text-green-600">
                 {semesters.filter(s => s.completed !== "Не").length}
@@ -349,5 +351,5 @@
             </div>
             <div>
-              <h3 className="text-lg font-bold text-gray-900">Верифицирани</h3>
+              <h3 className="text-lg font-bold text-gray-900">{t('verified_semesters')}</h3>
               <p className="text-2xl font-bold text-blue-600">
                 {semesters.filter(s => s.verified === "Да").length}
@@ -363,5 +365,5 @@
             </div>
             <div>
-              <h3 className="text-lg font-bold text-gray-900">Вкупно семестри</h3>
+              <h3 className="text-lg font-bold text-gray-900">{t('total_semesters')}</h3>
               <p className="text-2xl font-bold text-primary">
                 {semesters.length}
Index: src/app/students/subjects/page.tsx
===================================================================
--- src/app/students/subjects/page.tsx	(revision 298f9b3987050da08cb65ce62c3d1f8295faeff4)
+++ src/app/students/subjects/page.tsx	(revision 50f2fb4b186356bc63dde83200e8b04fe71d2c7a)
@@ -9,4 +9,5 @@
 import { useEffect, useState } from 'react';
 import { getAccessToken } from '@/lib/auth';
+import { useTranslation } from 'react-i18next';
 
 interface Subject {
@@ -147,23 +148,22 @@
 
 const StatusBadge = ({ status }: { status: string }) => {
+  const { t } = useTranslation();
   const baseClasses = "px-3 py-1 rounded-md text-xs font-medium";
-  
-  if (status === "Зад.") {
+  if (status === t('mandatory_short')) {
     return (
       <span className={`${baseClasses} bg-blue-100 text-blue-800`}>
-        {status}
+        {t('mandatory_short')}
       </span>
     );
-  } else if (status === "Изб.") {
+  } else if (status === t('elective_short')) {
     return (
       <span className={`${baseClasses} bg-green-100 text-green-800`}>
-        {status}
+        {t('elective_short')}
       </span>
     );
   }
-  
   return (
     <span className={`${baseClasses} bg-gray-100 text-gray-800`}>
-      {status}
+      {t(status) || status}
     </span>
   );
@@ -176,4 +176,5 @@
   const [isLoading, setIsLoading] = useState(true);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const { t } = useTranslation();
 
   useEffect(() => {
@@ -275,5 +276,5 @@
       <div className="min-h-screen pb-8">
         <div className="bg-white rounded-xl shadow-sm border border-gray-100 p-6">
-          Loading...
+          {t('loading')}
         </div>
       </div>
@@ -285,5 +286,5 @@
       <div className="min-h-screen pb-8">
         <div className="rounded-lg border border-red-200 bg-red-50 px-4 py-3 text-sm text-red-700">
-          {errorMessage ?? 'Failed to load subjects.'}
+          {errorMessage ?? t('failed_to_load_subjects')}
         </div>
       </div>
@@ -308,7 +309,7 @@
           </div>
           <div>
-            <h1 className="text-3xl font-bold mb-2">Предмети</h1>
+            <h1 className="text-3xl font-bold mb-2">{t('subjects')}</h1>
             <p className="text-lg opacity-90">
-              Преглед на запишани предмети по семестри
+              {t('subjects_overview')}
             </p>
           </div>
@@ -325,8 +326,8 @@
           <div className="bg-white rounded-xl p-6 shadow-sm border border-gray-100">
             <div className="text-sm text-gray-600 mb-2">
-              Статус: <span className="text-primary font-semibold">Запишан од студент</span>
+              {t('status')}: <span className="text-primary font-semibold">{t('enrolled_by_student')}</span>
             </div>
             <div className="text-sm text-gray-600">
-              Број на тикет: <span className="font-semibold">{currentSemester.ticketNumber}</span>
+              {t('ticket_number')}: <span className="font-semibold">{currentSemester.ticketNumber}</span>
             </div>
           </div>
@@ -335,10 +336,10 @@
           <div className="bg-white rounded-xl p-6 shadow-sm border border-gray-100">
             <div className="text-sm text-gray-600 mb-2">
-              Долг од документи: <span className="font-semibold">{currentSemester.debt}</span>
+              {t('debt_from_documents')}: <span className="font-semibold">{currentSemester.debt}</span>
             </div>
             
             <div className="relative mt-4">
               <label className="block text-sm font-medium text-gray-700 mb-2">
-                Избери семестар:
+                {t('select_semester')}:
               </label>
               <div className="relative">
@@ -370,5 +371,5 @@
                       >
                         <div className="font-medium text-gray-900">{semester.name}</div>
-                        <div className="text-xs text-gray-500">Статус: {semester.status}</div>
+                        <div className="text-xs text-gray-500">{t('status')}: {semester.status}</div>
                       </button>
                     ))}
@@ -380,5 +381,5 @@
             <div className="mt-4 text-sm">
               <div className="text-primary font-medium">
-                Сериски број: {currentSemesterData.serviceNumber}
+                {t('serial_number')}: {currentSemesterData.serviceNumber}
               </div>
             </div>
@@ -389,5 +390,5 @@
             <h3 className="font-semibold text-gray-900 mb-3 flex items-center gap-2">
               <FontAwesomeIcon icon={faBook} className="w-4 h-4 text-primary" />
-              Запишани предмети
+              {t('enrolled_subjects')}
             </h3>
             <div className="text-3xl font-bold text-primary">
@@ -403,5 +404,5 @@
               <h2 className="text-xl font-bold flex items-center gap-2">
                 <FontAwesomeIcon icon={faFileInvoice} />
-                Финансиски информации
+                {t('financial_info')}
               </h2>
             </div>
@@ -413,18 +414,18 @@
                 <div className="space-y-4">
                   <div className="flex justify-between items-center py-2 border-b border-gray-100">
-                    <span className="text-gray-600">Сума:</span>
+                    <span className="text-gray-600">{t('sum')}:</span>
                     <span className="font-semibold text-primary">{currentSemester.financialInfo.sum}</span>
                   </div>
                   <div className="flex justify-between items-center py-2 border-b border-gray-100">
-                    <span className="text-gray-600">Платено:</span>
+                    <span className="text-gray-600">{t('paid')}:</span>
                     <span className="font-semibold text-green-600">{currentSemester.financialInfo.paid}</span>
                   </div>
                   <div className="flex justify-between items-center py-2 border-b border-gray-100">
-                    <span className="text-gray-600">Должи:</span>
+                    <span className="text-gray-600">{t('due')}:</span>
                     <span className="font-semibold text-red-600">{currentSemester.financialInfo.due}</span>
                   </div>
                   <div className="mt-4 p-4 bg-blue-50 rounded-lg">
-                    <div className="text-sm font-medium text-blue-800 mb-1">Материјални трошоци:</div>
-                    <div className="text-sm text-blue-700">{currentSemester.financialInfo.materialCosts}</div>
+                    <div className="text-sm font-medium text-blue-800 mb-1">{t('material_costs')}:</div>
+                    <div className="text-sm text-blue-700">{t('material_costs_info')}</div>
                   </div>
                 </div>
@@ -433,25 +434,25 @@
                 <div className="space-y-4">
                   <div className="flex justify-between items-center py-2 border-b border-gray-100">
-                    <span className="text-gray-600">Кредити:</span>
+                    <span className="text-gray-600">{t('credits')}:</span>
                     <span className="font-semibold text-primary">{currentSemester.financialInfo.credits}</span>
                   </div>
                   <div className="flex justify-between items-center py-2 border-b border-gray-100">
-                    <span className="text-gray-600">МКСА:</span>
+                    <span className="text-gray-600">{t('mksa')}:</span>
                     <span className="font-semibold">{currentSemester.financialInfo.MKSA}</span>
                   </div>
                   <div className="flex justify-between items-center py-2 border-b border-gray-100">
-                    <span className="text-gray-600">Електронско запишување:</span>
+                    <span className="text-gray-600">{t('electronic_registration')}:</span>
                     <span className="font-semibold">{currentSemester.financialInfo.electronicRegistration}</span>
                   </div>
                   <div className="flex justify-between items-center py-2 border-b border-gray-100">
-                    <span className="text-gray-600">Е-УКИМ:</span>
+                    <span className="text-gray-600">{t('eukim')}:</span>
                     <span className="font-semibold">{currentSemester.financialInfo.eUKIM}</span>
                   </div>
                   <div className="flex justify-between items-center py-2 border-b border-gray-100">
-                    <span className="text-gray-600">Банкарска провизија:</span>
+                    <span className="text-gray-600">{t('bank_provision')}:</span>
                     <span className="font-semibold">{currentSemester.financialInfo.bankProvision}</span>
                   </div>
                   <div className="flex justify-between items-center py-3 border-t-2 border-primary bg-primary bg-opacity-5 rounded-lg px-4">
-                    <span className="font-bold text-white">Тотал:</span>
+                    <span className="font-bold text-white">{t('total')}:</span>
                     <span className="font-bold text-xl text-white">{currentSemester.financialInfo.total}</span>
                   </div>
@@ -466,5 +467,5 @@
       <div className="bg-white rounded-xl shadow-sm border border-gray-100 overflow-hidden">
         <div className="bg-primary text-white px-6 py-4">
-          <h2 className="text-xl font-bold">Листа на предмети</h2>
+          <h2 className="text-xl font-bold">{t('subjects_list')}</h2>
         </div>
         
@@ -474,13 +475,13 @@
               <tr>
                 <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">#</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Код</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Часови</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Кој пат</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Предмет</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Семестар</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Статус</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Потпис</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Група</th>
-                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">Професор</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('code')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('hours')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('which_time')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('subject')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('semester')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('status')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('signature')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('group')}</th>
+                <th className="px-4 py-4 text-left text-xs font-medium text-gray-500 uppercase tracking-wider">{t('professor')}</th>
               </tr>
             </thead>
@@ -495,23 +496,23 @@
                     <div className="flex items-center gap-2">
                       <FontAwesomeIcon icon={faBook} className="w-4 h-4 text-primary" />
-                      {subject.name}
+                      {t(subject.name, subject.name)}
                     </div>
                   </TableCell>
-                  <TableCell className="text-center font-medium text-primary">{subject.semester}</TableCell>
+                  <TableCell className="text-center font-medium text-primary">{t(subject.semester.toString(), subject.semester.toString())}</TableCell>
                   <TableCell>
                     <StatusBadge status={subject.status} />
                   </TableCell>
                   <TableCell className="text-center">
-                    {subject.signature || (
+                    {subject.signature ? t(subject.signature, subject.signature) : (
                       <span className="text-gray-400">—</span>
                     )}
                   </TableCell>
                   <TableCell className="text-center">
-                    {subject.group || (
+                    {subject.group ? t(subject.group, subject.group) : (
                       <span className="text-gray-400">—</span>
                     )}
                   </TableCell>
                   <TableCell>
-                    {subject.professor || (
+                    {subject.professor ? t(subject.professor, subject.professor) : (
                       <span className="text-gray-400">—</span>
                     )}

#	Сериски број	Код	Предмет	Завршена	Таксени	Датум	Наставник	Декада	{t('serial_number', 'Сериски број')}	{t('code', 'Код')}	{t('subject', 'Предмет')}	{t('completed', 'Завршена')}	{t('fee', 'Таксени')}	{t('date', 'Датум')}	{t('instructor', 'Наставник')}	{t('decade', 'Декада')}

Добредојде

{t('login_welcome')}

{title}

{t(title)}

Professor • Students

{t('prof_students_title')}

Пријави

{t('applications_header', 'Пријави')}

- Избери испитна сесија: + {t('select_exam_session', 'Избери испитна сесија:')}

Пријавени испити

{t('registered_exams', 'Пријавени испити')}

Важна забелешка

{t('important_note', 'Важна забелешка')}

Пријавени испити

{t('registered_exams', 'Пријавени испити')}

Завршени

{t('completed', 'Завршени')}

Вкупна такса

{t('total_fee', 'Вкупна такса')}

Документи

{t('documents')}

- Ново барање за документ + {t('new_document_request', 'Ново барање за документ')}