Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge duplicated Yves Rocher #10150

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Merge duplicated Yves Rocher #10150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 0 additions & 71 deletions data/brands/shop/beauty.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,29 +628,6 @@
"shop": "beauty"
}
},
{
"displayName": "Yves Rocher",
"id": "yvesrocher-422e39",
"locationSet": {
"include": ["001"],
"exclude": [
"at",
"ch",
"cn",
"de",
"hk",
"tw"
]
},
"matchNames": ["ив роше"],
"tags": {
"beauty": "cosmetics",
"brand": "Yves Rocher",
"brand:wikidata": "Q28496595",
"name": "Yves Rocher",
"shop": "beauty"
}
},
{
"displayName": "Персона",
"id": "persona-ac8d4a",
Expand Down Expand Up @@ -678,54 +655,6 @@
"name": "Сахар",
"shop": "beauty"
}
},
{
"displayName": "伊夫黎雪",
"id": "yvesrocher-a8af93",
"locationSet": {"include": ["cn"]},
"tags": {
"beauty": "cosmetics",
"brand": "伊夫黎雪",
"brand:en": "Yves Rocher",
"brand:wikidata": "Q28496595",
"brand:zh": "伊夫黎雪",
"name": "伊夫黎雪",
"name:en": "Yves Rocher",
"name:zh": "伊夫黎雪",
"shop": "beauty"
}
},
{
"displayName": "葉露芝",
"id": "yvesrocher-502b93",
"locationSet": {"include": ["tw"]},
"tags": {
"beauty": "cosmetics",
"brand": "葉露芝",
"brand:en": "Yves Rocher",
"brand:wikidata": "Q28496595",
"brand:zh": "葉露芝",
"name": "葉露芝",
"name:en": "Yves Rocher",
"name:zh": "葉露芝",
"shop": "beauty"
}
},
{
"displayName": "葉露芝 Yves Rocher",
"id": "yvesrocher-1744e8",
"locationSet": {"include": ["hk"]},
"tags": {
"beauty": "cosmetics",
"brand": "葉露芝 Yves Rocher",
"brand:en": "Yves Rocher",
"brand:wikidata": "Q28496595",
"brand:zh": "葉露芝",
"name": "葉露芝 Yves Rocher",
"name:en": "Yves Rocher",
"name:zh": "葉露芝",
"shop": "beauty"
}
}
]
}
54 changes: 53 additions & 1 deletion data/brands/shop/cosmetics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,7 +953,14 @@
"id": "yvesrocher-93ef6e",
"locationSet": {
"include": ["001"],
"exclude": ["at", "ch", "de"]
"exclude": [
"at",
"ch",
"cn",
"de",
"hk",
"tw"
]
},
"matchNames": ["ив роше"],
"tags": {
Expand All @@ -963,6 +970,51 @@
"shop": "cosmetics"
}
},
{
"displayName": "伊夫黎雪",
"id": "yvesrocher-a8af93",
"locationSet": {"include": ["cn"]},
"tags": {
"brand": "伊夫黎雪",
"brand:en": "Yves Rocher",
"brand:wikidata": "Q1477321",
"brand:zh": "伊夫黎雪",
"name": "伊夫黎雪",
"name:en": "Yves Rocher",
"name:zh": "伊夫黎雪",
"shop": "cosmetics"
}
},
{
"displayName": "葉露芝 Yves Rocher",
"id": "yvesrocher-1744e8",
"locationSet": {"include": ["hk"]},
"tags": {
"brand": "葉露芝 Yves Rocher",
"brand:en": "Yves Rocher",
"brand:wikidata": "Q1477321",
"brand:zh": "葉露芝",
"name": "葉露芝 Yves Rocher",
"name:en": "Yves Rocher",
"name:zh": "葉露芝",
"shop": "cosmetics"
}
},
{
"displayName": "葉露芝",
"id": "yvesrocher-502b93",
"locationSet": {"include": ["tw"]},
"tags": {
"brand": "葉露芝",
"brand:en": "Yves Rocher",
"brand:wikidata": "Q1477321",
"brand:zh": "葉露芝",
"name": "葉露芝",
"name:en": "Yves Rocher",
"name:zh": "葉露芝",
"shop": "cosmetics"
}
},
{
"displayName": "Ziaja",
"id": "ziaja-a2d805",
Expand Down