Add langs and resolve conflicts
This commit is contained in:
parent
561d820af8
commit
2c291d6390
@ -35,7 +35,7 @@ AUTH_USER_MODEL = "accounts.User"
|
||||
# Application definition
|
||||
|
||||
DJANGO_APPS = [
|
||||
"modeltranslation",
|
||||
"modeltranslation", # Translation
|
||||
"jet.dashboard",
|
||||
"jet",
|
||||
"django.contrib.admin",
|
||||
@ -143,15 +143,17 @@ AUTH_PASSWORD_VALIDATORS = [
|
||||
# https://docs.djangoproject.com/en/2.2/topics/i18n/
|
||||
|
||||
gettext = lambda s: s
|
||||
|
||||
LANGUAGES = (
|
||||
('en', gettext('English')),
|
||||
('ru', gettext('Russia')),
|
||||
)
|
||||
LOCALE_PATHS = (
|
||||
os.path.join(BASE_DIR, 'locale'),
|
||||
("en", gettext("English")),
|
||||
("fr", gettext("French")),
|
||||
("es", gettext("Spanish")),
|
||||
("ru", gettext("Russia")),
|
||||
)
|
||||
|
||||
MODELTRANSLATION_DEFAULT_LANGUAGE = 'en'
|
||||
LOCALE_PATHS = (os.path.join(BASE_DIR, "locale"),)
|
||||
|
||||
MODELTRANSLATION_DEFAULT_LANGUAGE = "en"
|
||||
LANGUAGE_CODE = "en-us"
|
||||
|
||||
TIME_ZONE = "UTC"
|
||||
@ -249,5 +251,3 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
|
||||
|
||||
STUDENT_ID_PREFIX = config("STUDENT_ID_PREFIX", "ugr")
|
||||
LECTURER_ID_PREFIX = config("LECTURER_ID_PREFIX", "lec")
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Generated by Django 4.0.8 on 2024-04-15 13:36
|
||||
# Generated by Django 4.2.16 on 2024-09-29 07:44
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
@ -6,28 +6,28 @@ from django.db import migrations, models
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('core', '0005_activitylog'),
|
||||
("core", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='newsandevents',
|
||||
name='summary_en',
|
||||
model_name="newsandevents",
|
||||
name="summary_en",
|
||||
field=models.TextField(blank=True, max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='newsandevents',
|
||||
name='summary_ru',
|
||||
model_name="newsandevents",
|
||||
name="summary_ru",
|
||||
field=models.TextField(blank=True, max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='newsandevents',
|
||||
name='title_en',
|
||||
model_name="newsandevents",
|
||||
name="title_en",
|
||||
field=models.CharField(max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='newsandevents',
|
||||
name='title_ru',
|
||||
model_name="newsandevents",
|
||||
name="title_ru",
|
||||
field=models.CharField(max_length=200, null=True),
|
||||
),
|
||||
]
|
||||
@ -0,0 +1,83 @@
|
||||
# Generated by Django 4.2.16 on 2024-09-29 07:44
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("course", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="course",
|
||||
name="summary_en",
|
||||
field=models.TextField(blank=True, max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="course",
|
||||
name="summary_ru",
|
||||
field=models.TextField(blank=True, max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="course",
|
||||
name="title_en",
|
||||
field=models.CharField(max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="course",
|
||||
name="title_ru",
|
||||
field=models.CharField(max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="program",
|
||||
name="summary_en",
|
||||
field=models.TextField(blank=True, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="program",
|
||||
name="summary_ru",
|
||||
field=models.TextField(blank=True, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="program",
|
||||
name="title_en",
|
||||
field=models.CharField(max_length=150, null=True, unique=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="program",
|
||||
name="title_ru",
|
||||
field=models.CharField(max_length=150, null=True, unique=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="upload",
|
||||
name="title_en",
|
||||
field=models.CharField(max_length=100, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="upload",
|
||||
name="title_ru",
|
||||
field=models.CharField(max_length=100, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="uploadvideo",
|
||||
name="summary_en",
|
||||
field=models.TextField(blank=True, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="uploadvideo",
|
||||
name="summary_ru",
|
||||
field=models.TextField(blank=True, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="uploadvideo",
|
||||
name="title_en",
|
||||
field=models.CharField(max_length=100, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="uploadvideo",
|
||||
name="title_ru",
|
||||
field=models.CharField(max_length=100, null=True),
|
||||
),
|
||||
]
|
||||
@ -1,33 +0,0 @@
|
||||
# Generated by Django 4.0.8 on 2024-04-12 11:07
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('course', '0007_alter_upload_file_alter_uploadvideo_video'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='program',
|
||||
name='summary_en',
|
||||
field=models.TextField(blank=True, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='program',
|
||||
name='summary_ru',
|
||||
field=models.TextField(blank=True, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='program',
|
||||
name='title_en',
|
||||
field=models.CharField(max_length=150, null=True, unique=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='program',
|
||||
name='title_ru',
|
||||
field=models.CharField(max_length=150, null=True, unique=True),
|
||||
),
|
||||
]
|
||||
@ -1,63 +0,0 @@
|
||||
# Generated by Django 4.0.8 on 2024-04-14 15:28
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('course', '0008_program_summary_en_program_summary_ru_and_more'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='course',
|
||||
name='summary_en',
|
||||
field=models.TextField(blank=True, max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='course',
|
||||
name='summary_ru',
|
||||
field=models.TextField(blank=True, max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='course',
|
||||
name='title_en',
|
||||
field=models.CharField(max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='course',
|
||||
name='title_ru',
|
||||
field=models.CharField(max_length=200, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='upload',
|
||||
name='title_en',
|
||||
field=models.CharField(max_length=100, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='upload',
|
||||
name='title_ru',
|
||||
field=models.CharField(max_length=100, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='uploadvideo',
|
||||
name='summary_en',
|
||||
field=models.TextField(blank=True, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='uploadvideo',
|
||||
name='summary_ru',
|
||||
field=models.TextField(blank=True, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='uploadvideo',
|
||||
name='title_en',
|
||||
field=models.CharField(max_length=100, null=True),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='uploadvideo',
|
||||
name='title_ru',
|
||||
field=models.CharField(max_length=100, null=True),
|
||||
),
|
||||
]
|
||||
3665
locale/es/LC_MESSAGES/django.po
Normal file
3665
locale/es/LC_MESSAGES/django.po
Normal file
File diff suppressed because it is too large
Load Diff
3665
locale/fr/LC_MESSAGES/django.po
Normal file
3665
locale/fr/LC_MESSAGES/django.po
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,114 +0,0 @@
|
||||
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version:PACKAGE VERSION"
|
||||
"Report-Msgid-Bugs-To:"
|
||||
"POT-Creation-Date:2024-04-15 19:36+0600"
|
||||
"PO-Revision-Date:YEAR-MO-DA HO:MI+ZONE"
|
||||
"Last-Translator:FULL NAME <EMAIL@ADDRESS>"
|
||||
"Language-Team:LANGUAGE <LL@li.org>"
|
||||
"Language:"
|
||||
"MIME-Version:1.0"
|
||||
"Content-Type:text/plain; charset=UTF-8"
|
||||
"Content-Transfer-Encoding:8bit"
|
||||
"Plural-Forms:nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
|
||||
|
||||
#: static/js/dashboard.js:8
|
||||
msgid "January"
|
||||
msgstr "Январь"
|
||||
#: static/js/dashboard.js:9
|
||||
msgid "February"
|
||||
msgstr "Февраль"
|
||||
#: static/js/dashboard.js:10
|
||||
msgid "March"
|
||||
msgstr "Март"
|
||||
#: static/js/dashboard.js:11
|
||||
msgid "April"
|
||||
msgstr "Апрель"
|
||||
#: static/js/dashboard.js:12
|
||||
msgid "May"
|
||||
msgstr "Май"
|
||||
#: static/js/dashboard.js:13
|
||||
msgid "June"
|
||||
msgstr "Июнь"
|
||||
#: static/js/dashboard.js:18
|
||||
msgid "Students"
|
||||
msgstr "Студенты"
|
||||
#: static/js/dashboard.js:24
|
||||
msgid "Teachers"
|
||||
msgstr "Учителя"
|
||||
#: static/js/dashboard.js:30
|
||||
msgid "Admins"
|
||||
msgstr "Админы"
|
||||
#: static/js/dashboard.js:36
|
||||
msgid "Stuffs"
|
||||
msgstr "Вещи"
|
||||
#: static/js/dashboard.js:52
|
||||
msgid "Website Traffic"
|
||||
msgstr "Трафик веб-сайта"
|
||||
#: static/js/dashboard.js:71
|
||||
msgid "Comp.S"
|
||||
msgstr "Информатика"
|
||||
#: static/js/dashboard.js:77
|
||||
msgid "Architecture"
|
||||
msgstr "Архитектура"
|
||||
#: static/js/dashboard.js:83
|
||||
msgid "Civil Eng"
|
||||
msgstr "Гражданское инженерство"
|
||||
#: static/js/dashboard.js:89
|
||||
msgid "Accounting"
|
||||
msgstr "Бухгалтерский учет"
|
||||
#: static/js/dashboard.js:95
|
||||
msgid "Business M."
|
||||
msgstr "Бизнес М."
|
||||
#: static/js/dashboard.js:111
|
||||
msgid "Enrollment per course"
|
||||
msgstr "Запись на курс"
|
||||
#: static/js/dashboard.js:129
|
||||
msgid "Comp sci."
|
||||
msgstr "Компьютерная наука."
|
||||
#: static/js/dashboard.js:135
|
||||
msgid "Civil eng."
|
||||
msgstr "Гражданский инженерство."
|
||||
#: static/js/dashboard.js:141
|
||||
msgid "Architect."
|
||||
msgstr "Архитектор."
|
||||
#: static/js/dashboard.js:147
|
||||
msgid "Economics"
|
||||
msgstr "Экономика"
|
||||
#: static/js/dashboard.js:163
|
||||
msgid "Students average grade (performance)"
|
||||
msgstr "Средняя оценка учащихся (успеваемость)"
|
||||
#: static/js/dashboard.js:172
|
||||
msgid "Man"
|
||||
msgstr "Мужчина"
|
||||
#: static/js/dashboard.js:173
|
||||
msgid "Women"
|
||||
msgstr "Женщины"
|
||||
#: static/js/dashboard.js:176
|
||||
msgid "Students Gender Dataset"
|
||||
msgstr "Набор гендерных данных студентов"
|
||||
#: static/js/dashboard.js:194
|
||||
msgid "Students Gender"
|
||||
msgstr "Пол студентов"
|
||||
#: static/js/dashboard.js:203 static/js/dashboard.js:235
|
||||
msgid "PHD"
|
||||
msgstr "КАНДИДАТ НАУК"
|
||||
#: static/js/dashboard.js:204 static/js/dashboard.js:236
|
||||
msgid "Masters"
|
||||
msgstr "Магистр"
|
||||
#: static/js/dashboard.js:205 static/js/dashboard.js:237
|
||||
msgid "BSc degree"
|
||||
msgstr "Степень бакалавра"
|
||||
#: static/js/dashboard.js:208
|
||||
msgid "Lecturer Qualifications Dataset"
|
||||
msgstr "Набор данных о квалификациях преподавателей"
|
||||
#: static/js/dashboard.js:226
|
||||
msgid "Lecturer qualifications"
|
||||
msgstr "Квалификация преподавателя"
|
||||
#: static/js/dashboard.js:240
|
||||
msgid "Students level"
|
||||
msgstr "Уровень студентов"
|
||||
#: static/js/dashboard.js:258
|
||||
msgid "Student levels"
|
||||
msgstr "Уровни студентов"
|
||||
@ -0,0 +1,105 @@
|
||||
# Generated by Django 4.2.16 on 2024-09-29 07:44
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
("quiz", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name="choice",
|
||||
name="choice_en",
|
||||
field=models.CharField(
|
||||
help_text="Enter the choice text that you want displayed",
|
||||
max_length=1000,
|
||||
null=True,
|
||||
verbose_name="Content",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="choice",
|
||||
name="choice_ru",
|
||||
field=models.CharField(
|
||||
help_text="Enter the choice text that you want displayed",
|
||||
max_length=1000,
|
||||
null=True,
|
||||
verbose_name="Content",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="question",
|
||||
name="content_en",
|
||||
field=models.CharField(
|
||||
help_text="Enter the question text that you want displayed",
|
||||
max_length=1000,
|
||||
null=True,
|
||||
verbose_name="Question",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="question",
|
||||
name="content_ru",
|
||||
field=models.CharField(
|
||||
help_text="Enter the question text that you want displayed",
|
||||
max_length=1000,
|
||||
null=True,
|
||||
verbose_name="Question",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="question",
|
||||
name="explanation_en",
|
||||
field=models.TextField(
|
||||
blank=True,
|
||||
help_text="Explanation to be shown after the question has been answered.",
|
||||
max_length=2000,
|
||||
null=True,
|
||||
verbose_name="Explanation",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="question",
|
||||
name="explanation_ru",
|
||||
field=models.TextField(
|
||||
blank=True,
|
||||
help_text="Explanation to be shown after the question has been answered.",
|
||||
max_length=2000,
|
||||
null=True,
|
||||
verbose_name="Explanation",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="quiz",
|
||||
name="description_en",
|
||||
field=models.TextField(
|
||||
blank=True,
|
||||
help_text="A detailed description of the quiz",
|
||||
null=True,
|
||||
verbose_name="Description",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="quiz",
|
||||
name="description_ru",
|
||||
field=models.TextField(
|
||||
blank=True,
|
||||
help_text="A detailed description of the quiz",
|
||||
null=True,
|
||||
verbose_name="Description",
|
||||
),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="quiz",
|
||||
name="title_en",
|
||||
field=models.CharField(max_length=60, null=True, verbose_name="Title"),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name="quiz",
|
||||
name="title_ru",
|
||||
field=models.CharField(max_length=60, null=True, verbose_name="Title"),
|
||||
),
|
||||
]
|
||||
@ -1,63 +0,0 @@
|
||||
# Generated by Django 4.0.8 on 2024-04-15 13:36
|
||||
|
||||
from django.db import migrations, models
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('quiz', '0004_alter_question_figure_alter_quiz_description'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.AddField(
|
||||
model_name='choice',
|
||||
name='choice_en',
|
||||
field=models.CharField(help_text='Enter the choice text that you want displayed', max_length=1000, null=True, verbose_name='Content'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='choice',
|
||||
name='choice_ru',
|
||||
field=models.CharField(help_text='Enter the choice text that you want displayed', max_length=1000, null=True, verbose_name='Content'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='question',
|
||||
name='content_en',
|
||||
field=models.CharField(help_text='Enter the question text that you want displayed', max_length=1000, null=True, verbose_name='Question'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='question',
|
||||
name='content_ru',
|
||||
field=models.CharField(help_text='Enter the question text that you want displayed', max_length=1000, null=True, verbose_name='Question'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='question',
|
||||
name='explanation_en',
|
||||
field=models.TextField(blank=True, help_text='Explanation to be shown after the question has been answered.', max_length=2000, null=True, verbose_name='Explanation'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='question',
|
||||
name='explanation_ru',
|
||||
field=models.TextField(blank=True, help_text='Explanation to be shown after the question has been answered.', max_length=2000, null=True, verbose_name='Explanation'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quiz',
|
||||
name='description_en',
|
||||
field=models.TextField(blank=True, help_text='A detailed description of the quiz', null=True, verbose_name='Description'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quiz',
|
||||
name='description_ru',
|
||||
field=models.TextField(blank=True, help_text='A detailed description of the quiz', null=True, verbose_name='Description'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quiz',
|
||||
name='title_en',
|
||||
field=models.CharField(max_length=60, null=True, verbose_name='Title'),
|
||||
),
|
||||
migrations.AddField(
|
||||
model_name='quiz',
|
||||
name='title_ru',
|
||||
field=models.CharField(max_length=60, null=True, verbose_name='Title'),
|
||||
),
|
||||
]
|
||||
Loading…
x
Reference in New Issue
Block a user