Skip to content

Commit 066f9cd

Browse files
authored
Merge branch 'main' into Hani/cm-giesswein-at
2 parents b562a24 + c63ae12 commit 066f9cd

18 files changed

+456
-25
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
1+
/.vscode/
22
/venv/
33
.env
44
.report.json

SELECTOR_INFO.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1775,6 +1775,13 @@ Location: Toolbar - any bookmark context menu
17751775
Path to .json: modules/data/context_menu.components.json
17761776
```
17771777
```
1778+
Selector Name: context-menu-toolbar-open-in-new-tab
1779+
Selector Data: selectorData": "placesContext_open:newtab"
1780+
Description: Context menu option from a Toolbar bookmark
1781+
Location: Toolbar - any bookmark context menu
1782+
Path to .json: modules/data/context_menu.components.json
1783+
```
1784+
```
17781785
Selector Name: context-menu-toolbar-open-all-bookmarks
17791786
Selector Data: placesContext_openBookmarkContainer:tabs
17801787
Description: Open all bookmarks from the context menu option from a Toolbar bookmark

choose_l10n_beta_split.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ def distribute_mappings_evenly(mappings):
2424
min_idx = loads.index(min(loads))
2525
balanced_splits[min_idx][site] = list(regions)
2626
loads[min_idx] += len(regions)
27+
for i in range(len(balanced_splits)):
28+
logging.info(f"Beta split: {i}")
29+
current_split = [f"{site} {' '.join(regions)}" for site, regions in balanced_splits[i].items()]
30+
logging.info(f"{'\n'.join(current_split)}")
2731
return balanced_splits
2832

2933

choose_l10n_ci_set.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,15 @@ def valid_l10n_mappings():
3030
region_file = json.load(f)
3131
if region_file.get("sites"):
3232
for site in region_file.get("sites"):
33-
mapping[site].add(region)
33+
report_mapping = True
34+
if site != "demo" and os.path.exists(f"./l10n_CM/constants/{site}/{region}"):
35+
with open(f"./l10n_CM/constants/{site}/{region}/{site}_ad.json", "r+") as ad_file, open(f"./l10n_CM/constants/{site}/{region}/{site}_cc.json", "r+") as cc_file:
36+
ad = json.load(ad_file)
37+
cc = json.load(cc_file)
38+
if ad.get("skip") and cc.get("skip"):
39+
report_mapping = False
40+
if report_mapping:
41+
mapping[site].add(region)
3442
return mapping
3543

3644

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"url": "http://127.0.0.1:8080/ebay_ad.html",
3+
"field_mapping": {
4+
"given_name":"d888610d-fe93-43bb-9cc8-602f1a8f69ce",
5+
"family_name":"17d0cbc2-4d29-48d0-a026-3a2a3a5bd2ed",
6+
"street_address":"ad534c01-7c16-4e22-816f-6b3d70462481",
7+
"address_level_2":"977cf1c9-fa73-4184-b6d8-6eaad16f5bf2",
8+
"postal_code":"263c5231-e710-4ff9-aa84-fb0186b30e06",
9+
"email": "684b63d6-b6d4-4f4d-93bf-9404761eb409"
10+
11+
},
12+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
13+
"fields": [
14+
"d888610d-fe93-43bb-9cc8-602f1a8f69ce",
15+
"17d0cbc2-4d29-48d0-a026-3a2a3a5bd2ed",
16+
"ad534c01-7c16-4e22-816f-6b3d70462481",
17+
"977cf1c9-fa73-4184-b6d8-6eaad16f5bf2",
18+
"263c5231-e710-4ff9-aa84-fb0186b30e06",
19+
"684b63d6-b6d4-4f4d-93bf-9404761eb409"
20+
]
21+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"url": "http://127.0.0.1:8080/ebay_cc.html",
3+
"field_mapping": {
4+
"card_number": "7edd9d2a-018d-42ad-a4c4-8a55f4623319",
5+
"given_name": "6343ae81-ad0c-4036-973b-c6751adc1417",
6+
"family_name": "83f8914f-031c-4bf0-8d63-c5a8a7afd985",
7+
"expiration_date": "fed99547-f8e2-43b3-b41f-c677faa19f71",
8+
"cvv":"93ddbd32-95de-4e8e-adff-71bd9b54234f"
9+
},
10+
11+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
12+
"fields": [
13+
"7edd9d2a-018d-42ad-a4c4-8a55f4623319",
14+
"6343ae81-ad0c-4036-973b-c6751adc1417",
15+
"83f8914f-031c-4bf0-8d63-c5a8a7afd985",
16+
"fed99547-f8e2-43b3-b41f-c677faa19f71",
17+
"93ddbd32-95de-4e8e-adff-71bd9b54234f"
18+
]
19+
}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"url": "http://127.0.0.1:8080/mediamarkt_ad.html",
3+
"field_mapping": {
4+
"given_name": "eb82fd1f-6ebc-4e00-91b0-b33126e3ef51",
5+
"family_name": "5f200911-7e5f-4d9a-9d75-8cc496b455a7",
6+
"street_address": "81b35c70-5949-4b70-afc8-030bdc2d9128",
7+
"email": "ddde9f4b-5d3d-4346-bb45-1df768613507",
8+
"telephone": "721fc82e-817e-4bff-8b5d-e4360eee4724"
9+
10+
},
11+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
12+
"fields": [
13+
"eb82fd1f-6ebc-4e00-91b0-b33126e3ef51",
14+
"5f200911-7e5f-4d9a-9d75-8cc496b455a7",
15+
"81b35c70-5949-4b70-afc8-030bdc2d9128",
16+
"ddde9f4b-5d3d-4346-bb45-1df768613507",
17+
"721fc82e-817e-4bff-8b5d-e4360eee4724"
18+
]
19+
}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"url": "http://127.0.0.1:8080/mediamarkt_cc.html",
3+
"field_mapping": {
4+
"card_number": "1d77675c-2591-4e83-b5b5-286b1196d918",
5+
"expiration_date": "811f3be9-b204-469f-aff5-294aa91fb232",
6+
"name": "cdf66cc6-01cb-4f0d-b905-fc4bd37c51e1",
7+
"cvv": "839f304f-4191-4bb7-b3bc-75d9d2314715"
8+
},
9+
"form_field": "*[data-moz-autofill-inspect-id='{name}']",
10+
"fields": [
11+
"1d77675c-2591-4e83-b5b5-286b1196d918",
12+
"811f3be9-b204-469f-aff5-294aa91fb232",
13+
"cdf66cc6-01cb-4f0d-b905-fc4bd37c51e1",
14+
"839f304f-4191-4bb7-b3bc-75d9d2314715"
15+
]
16+
}

l10n_CM/region/AT.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
"sites": [
44
"demo",
55
"torfs",
6-
"giesswein"
6+
"giesswein",
7+
"ebay",
8+
"mediamarkt"
79
],
810
"tests": [
911
]

l10n_CM/run_l10n.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"bijoubrigitte",
2727
"brico",
2828
"burtsbees",
29-
"burtsbeescalvinklein",
3029
"calvinklein",
3130
"canadatire",
3231
"cdiscount",

0 commit comments

Comments
 (0)