Skip to content

Commit 17adc08

Browse files
authored
Merge branch 'wger-project:master' into fix/barcode-search
2 parents fcb14a8 + 0732612 commit 17adc08

8 files changed

Lines changed: 9115 additions & 5 deletions

File tree

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ dependencies = [
3232
"celery[redis]~=5.6.0",
3333
"crispy-bootstrap5~=2026.3",
3434
"django-activity-stream~=2.0.0",
35-
"django-allauth~=65.16.1",
35+
"django-allauth~=65.17.0",
3636
"django-axes[ipware]~=8.3.1",
3737
"django-bootstrap-breadcrumbs2==1.0.0",
3838
"django-cors-headers~=4.9.0",

settings/settings_global.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,11 +278,13 @@
278278
('hr', 'Croatian'),
279279
('it', 'Italian'),
280280
('ko', 'Korean'),
281+
('mk', 'Macedonian'),
281282
('nl', 'Dutch'),
282283
('nb', 'Norwegian'),
283284
('pl', 'Polish'),
284285
('pt', 'Portuguese'),
285286
('pt-br', 'Brazilian Portuguese'),
287+
('ro', 'Romanian'),
286288
('ru', 'Russian'),
287289
('sk', 'Slovak'),
288290
('sl', 'Slovenian'),

uv.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

wger/core/fixtures/languages.json

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,5 +268,23 @@
268268
"full_name": "தமிழ்",
269269
"full_name_en": "Tamil"
270270
}
271+
},
272+
{
273+
"model": "core.language",
274+
"pk": 31,
275+
"fields": {
276+
"short_name": "ro",
277+
"full_name": "Română",
278+
"full_name_en": "Romanian"
279+
}
280+
},
281+
{
282+
"model": "core.language",
283+
"pk": 32,
284+
"fields": {
285+
"short_name": "ca",
286+
"full_name": "Català",
287+
"full_name_en": "Catalan"
288+
}
271289
}
272290
]
Lines changed: 6 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)