Skip to content

Commit c05c609

Browse files
Tschuppi81Tschuppi81
committed
Resolve merge conflicts
2 parents 05863ea + e3e27b7 commit c05c609

57 files changed

Lines changed: 3814 additions & 3096 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ repos:
1515
exclude: .pre-commit-config.yaml
1616
- id: pt_structure
1717
- repo: https://github.com/astral-sh/ruff-pre-commit
18-
rev: v0.12.1
18+
rev: v0.12.2
1919
hooks:
2020
- id: ruff
2121
args: [ "--fix" ]
@@ -27,22 +27,22 @@ repos:
2727
additional_dependencies:
2828
- flake8-type-checking>=3.0.0
2929
- repo: https://github.com/thibaudcolas/pre-commit-stylelint
30-
rev: v16.21.0
30+
rev: v16.21.1
3131
hooks:
3232
- id: stylelint
3333
files: '^src/.*\.scss'
3434
additional_dependencies:
3535
- stylelint@16.19.1
3636
- stylelint-config-standard-scss@15.0.0
3737
- repo: https://github.com/pre-commit/mirrors-eslint
38-
rev: v9.29.0
38+
rev: v9.30.1
3939
hooks:
4040
- id: eslint
4141
files: '^src/.*\.jsx?$'
4242
additional_dependencies:
4343
- eslint-react
4444
- repo: https://github.com/PyCQA/bandit
45-
rev: 1.8.5
45+
rev: 1.8.6
4646
hooks:
4747
- id: bandit
4848
args: ["-c", "pyproject.toml", "--quiet"]

‎.test_durations‎

Lines changed: 2582 additions & 2578 deletions
Large diffs are not rendered by default.

‎do/apply-translations‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ def open_file(path: str, mode: str = 'r') -> str:
2020
return file
2121

2222

23-
def parse_entry(block: str) -> tuple[str, str]:
24-
parts = block.split('msgstr ')
25-
return parts[0].replace('msgid ', ''), parts[1]
23+
def parse_entry(block: str) -> tuple[str, str, str]:
24+
head, msgstr = block.split('msgstr ', 1)
25+
comments, msgid = head.split('msgid ', 1)
26+
return comments, msgid, msgstr
2627

2728

2829
def blocks_from_file(src: str, lang: str) -> list[str]:
@@ -32,7 +33,7 @@ def blocks_from_file(src: str, lang: str) -> list[str]:
3233
def parse_file(src: str, lang: str) -> dict[str, str]:
3334
src_dict = {}
3435
for block in blocks_from_file(src, lang):
35-
id_, value = parse_entry(block)
36+
_, id_, value = parse_entry(block)
3637
src_dict[id_] = value
3738
return src_dict
3839

@@ -53,15 +54,15 @@ def fusion_po(
5354

5455
new_blocks = []
5556
for block in blocks_from_file(target, lang):
56-
msgid, value = parse_entry(block)
57+
comments, msgid, value = parse_entry(block)
5758
new_val = src_parsed.get(msgid)
5859

5960
if not new_val or emtpy_value(new_val):
6061
new_blocks.append(block)
6162
continue
6263

6364
if emtpy_value(value) or overwrite:
64-
new_blocks.append(f'msgid {msgid}msgstr {new_val}')
65+
new_blocks.append(f'{comments}msgid {msgid}msgstr {new_val}')
6566
else:
6667
new_blocks.append(block)
6768

‎src/onegov/core/html_diff.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def parse_html(
7474
wrapper_class: str = 'diff'
7575
) -> ET:
7676
"""Parse an HTML fragment into a Genshi stream."""
77-
builder = html5lib.getTreeBuilder('etree') # type: ignore[no-untyped-call]
77+
builder = html5lib.getTreeBuilder('etree')
7878
parser = html5lib.HTMLParser(tree=builder)
7979
tree = parser.parseFragment(html)
8080
tree.tag = wrapper_element

‎src/onegov/feriennet/sponsors/sponsors.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919

2020
- name: CONCORDIA
2121
logo_url:
22-
de: 'https://www.concordia.ch/de/microsites/feriennet.html?cocid=logo-fnlogo-2023-0-projuventute-de'
23-
fr: 'https://www.concordia.ch/fr/microsites/feriennet.html?cocid=logo-fnlogo-2023-0-projuventute-fr'
24-
it: 'https://www.concordia.ch/it/microsites/feriennet.html?cocid=logo-fnlogo-2023-0-projuventute-it'
22+
de: 'https://www.concordia.ch/de/microsites/feriennet.html?cocid=banner-pjoswb-2025-0-fnet-de'
23+
fr: 'https://www.concordia.ch/fr/microsites/feriennet.html?cocid=banner-pjoswb-2025-0-fnet-fr'
24+
it: 'https://www.concordia.ch/fr/microsites/feriennet.html?cocid=banner-pjoswb-2025-0-fnet-it'
2525
mail_url:
26-
de: 'https://www.concordia.ch/de/microsites/feriennet.html?cocid=banner-fnbannmails-2023-0-projuventute-de'
27-
fr: 'https://www.concordia.ch/fr/microsites/feriennet.html?cocid=banner-fnbannmails-2023-0-projuventute-fr'
28-
it: 'https://www.concordia.ch/it/microsites/feriennet.html?cocid=banner-fnbannmails-2023-0-projuventute-it'
26+
de: 'https://www.concordia.ch/de/microsites/feriennet.html?cocid=banner-pjoswb-2025-0-fnet-de'
27+
fr: 'https://www.concordia.ch/fr/microsites/feriennet.html?cocid=banner-pjoswb-2025-0-fnet-fr'
28+
it: 'https://www.concordia.ch/fr/microsites/feriennet.html?cocid=banner-pjoswb-2025-0-fnet-it'
2929
logo: sponsors/CON_Logo_RGB_pos.jpg
3030
background: '#fff'
3131
banners:
@@ -34,9 +34,9 @@
3434
fr: sponsors/concordia-banner-fr.jpg
3535
it: sponsors/concordia-banner-it.jpg
3636
url:
37-
de: 'https://www.concordia.ch/de/microsites/feriennet.html?cocid=banner-fnangebotue-2023-0-projuventute-de'
38-
fr: 'https://www.concordia.ch/fr/microsites/feriennet.html?cocid=banner-fnangebotue-2023-0-projuventute-fr'
39-
it: 'https://www.concordia.ch/it/microsites/feriennet.html?cocid=banner-fnangebotue-2023-0-projuventute-it'
37+
de: 'https://www.concordia.ch/de/microsites/feriennet.html?cocid=banner-pjoswb-2025-0-fnet-de'
38+
fr: 'https://www.concordia.ch/fr/microsites/feriennet.html?cocid=banner-pjoswb-2025-0-fnet-fr'
39+
it: 'https://www.concordia.ch/fr/microsites/feriennet.html?cocid=banner-pjoswb-2025-0-fnet-it'
4040
info:
4141
de: 'Partner von Pro Juventute'
4242
fr: 'Partenaire Pro Juventute'

‎src/onegov/feriennet/static/sponsors/concordia-banner-de.jpg‎

-8.24 KB
Loading

‎src/onegov/feriennet/static/sponsors/concordia-banner-fr.jpg‎

-9.26 KB
Loading

‎src/onegov/feriennet/static/sponsors/concordia-banner-it.jpg‎

-3.57 KB
Loading

‎src/onegov/form/assets/js/chosen-init.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ $(document).ready(function() {
4242
).prop('checked', false).trigger('change');
4343
$(element).find('select').val('').filter('.chosen-select').trigger('chosen:updated');
4444
$(element).find('input').not(
45-
'[type="submit"], [type="radio"], [type="checkbox"]'
45+
'[type="submit"], [type="radio"], [type="checkbox"], [name="csrf_token"]'
4646
).val('').trigger('change');
4747
return false;
4848
});

‎src/onegov/org/app.py‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,11 @@ def people_select_asset() -> Iterator[str]:
879879
yield 'people-select.js'
880880

881881

882+
@OrgApp.webasset('kaba-configurations')
883+
def kaba_configurations_asset() -> Iterator[str]:
884+
yield 'kaba-configurations.js'
885+
886+
882887
@OrgApp.webasset('mapbox_address_autofill')
883888
def mapbox_address_autofill() -> Iterator[str]:
884889
yield 'mapbox-search-web.js' # implicit dependency

0 commit comments

Comments
 (0)