diff --git a/Models/Constants.ts b/Models/Constants.ts
index 71625ac88..e572076d8 100644
--- a/Models/Constants.ts
+++ b/Models/Constants.ts
@@ -2,7 +2,7 @@ import { Utils } from "../Utils";
export default class Constants {
- public static vNumber = "0.8.0";
+ public static vNumber = "0.8.0a";
// The user journey states thresholds when a new feature gets unlocked
public static userJourney = {
diff --git a/assets/themes/artwork/artwork.json b/assets/themes/artwork/artwork.json
index 3ee69a002..d546c8250 100644
--- a/assets/themes/artwork/artwork.json
+++ b/assets/themes/artwork/artwork.json
@@ -378,7 +378,8 @@
"it": "Su quale sito web è possibile trovare altre informazioni riguardanti quest’opera?",
"ru": "Есть ли сайт с более подробной информацией об этой работе?",
"ja": "この作品についての詳しい情報はどのウェブサイトにありますか?",
- "zh_Hant": "在那個網站能夠找到更多藝術品的資訊？"
+ "zh_Hant": "在那個網站能夠找到更多藝術品的資訊？",
+ "nb_NO": "Finnes det en nettside med mer info om dette kunstverket?"
},
"render": {
"en": "More information on this website",
@@ -389,7 +390,8 @@
"it": "Ulteriori informazioni su questo sito web",
"ru": "Больше информации на этом сайте",
"ja": "Webサイトに詳細情報がある",
- "zh_Hant": "這個網站有更多資訊"
+ "zh_Hant": "這個網站有更多資訊",
+ "nb_NO": "Mer info er å finne på denne nettsiden"
},
"freeform": {
"key": "website",
@@ -398,14 +400,15 @@
},
{
"question": {
- "en": "Which wikidata-entry corresponds with this artwork?",
- "nl": "Welk wikidata-item beschrijft dit kunstwerk?",
- "fr": "Quelle entrée wikidata correspond à cette œuvre d'art ?",
+ "en": "Which Wikidata-entry corresponds with this artwork?",
+ "nl": "Welk Wikidata-item beschrijft dit kunstwerk?",
+ "fr": "Quelle entrée Wikidata correspond à cette œuvre d'art ?",
"de": "Welcher Wikidata-Eintrag entspricht diesem Kunstwerk?",
"it": "Quale elemento Wikidata corrisponde a quest’opera d’arte?",
- "ru": "Какая запись в wikidata соответсвует этой работе?",
- "ja": "このアートワークに関するwikidataのエントリーはどれですか?",
- "zh_Hant": "這個藝術品有那個對應的 wikidata 項目？"
+ "ru": "Какая запись в Wikidata соответсвует этой работе?",
+ "ja": "このアートワークに関するWikidataのエントリーはどれですか?",
+ "zh_Hant": "這個藝術品有那個對應的 Wikidata 項目？",
+ "nb_NO": "Hvilken Wikipedia-oppføring samsvarer med dette kunstverket?"
},
"render": {
"en": "Corresponds with {wikidata}",
@@ -415,7 +418,8 @@
"it": "Corrisponde a {wikidata}",
"ru": "Запись об этой работе в wikidata: {wikidata}",
"ja": "{wikidata}に関連する",
- "zh_Hant": "與 {wikidata}對應"
+ "zh_Hant": "與 {wikidata}對應",
+ "nb_NO": "Samsvarer med {wikidata}"
},
"freeform": {
"key": "wikidata",
diff --git a/assets/themes/climbing/climbing.json b/assets/themes/climbing/climbing.json
index 774b5f3c0..13c2cbc73 100644
--- a/assets/themes/climbing/climbing.json
+++ b/assets/themes/climbing/climbing.json
@@ -437,14 +437,14 @@
"key": "description"
}
},
- {"#": "Rock type",
+ {
+ "#": "Rock type",
"render": {
"en": "The rock type is {_embedding_features_with_rock:rock} as stated on the surrounding crag"
},
"freeform": {
"key": "_embedding_features_with_rock:rock"
}
-
},
"reviews"
],
@@ -562,7 +562,7 @@
{
"#": "Contained routes hist",
"render": {
- "en": "Difficulties overview
{histogram(_difficulty_hist, , , 3.*:#56bd56, 4.*:#ffff59, 5.*:#ffad48, 6.*:#63a9ff, 7.*:#ff5858, 8.*:#000000, .*:#aaa )}"
+ "en": "Difficulties overview
{histogram(_difficulty_hist)}"
},
"condition": "_difficulty_hist!~\\[\\]"
},
@@ -633,7 +633,8 @@
}
]
},
- {"#": "Rock type (crag/rock/cliff only)",
+ {
+ "#": "Rock type (crag/rock/cliff only)",
"question": {
"en": "What is the rock type here?"
},
@@ -652,9 +653,12 @@
}
}
],
-
"condition": {
- "or": ["climbing=crag","natural=cliff","natural=bare_rock"]
+ "or": [
+ "climbing=crag",
+ "natural=cliff",
+ "natural=bare_rock"
+ ]
}
},
"reviews"
@@ -731,15 +735,15 @@
},
"title": {
"render": {
- "en": "Possible climbing opportunity",
- "nl": "Mogelijke klimgelegenheid",
+ "en": "Climbing opportunity?",
+ "nl": "Klimgelegenheid?",
"de": "Klettermöglichkeit?",
"ja": "登坂教室？",
"nb_NO": "Klatremulighet?"
}
},
"description": {
- "nl": "Een mogelijke klimgelegenheid?",
+ "nl": "Een klimgelegenheid?",
"de": "Eine Klettergelegenheit?",
"en": "A climbing opportunity?",
"ja": "登坂教室？",
diff --git a/assets/themes/speelplekken/speelplekken.json b/assets/themes/speelplekken/speelplekken.json
index a39b85813..c76db6bc9 100644
--- a/assets/themes/speelplekken/speelplekken.json
+++ b/assets/themes/speelplekken/speelplekken.json
@@ -264,11 +264,13 @@
"render": ""
}
],
- "+iconOverlays": [{
- "if": "_video:id~*",
- "then": "./assets/themes/speelplekken/youtube.svg",
- "badge": true
- }],
+ "+iconOverlays": [
+ {
+ "if": "_video:id~*",
+ "then": "./assets/themes/speelplekken/youtube.svg",
+ "badge": true
+ }
+ ],
"isShown": {
"render": "yes",
"mappings": [
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 01ab7a175..62d68ac53 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -440,6 +440,21 @@
"4": {
"question": "What is the difficulty of this climbing route according to the french/belgian system?",
"render": "The difficulty is {climbing:grade:french} according to the french/belgian system"
+ },
+ "5": {
+ "question": "How much bolts does this route have before reaching the moulinette?",
+ "render": "This route has {climbing:bolts} bolts",
+ "mappings": {
+ "0": {
+ "then": "This route is not bolted"
+ },
+ "1": {
+ "then": "This route is not bolted"
+ }
+ }
+ },
+ "7": {
+ "render": "The rock type is {_embedding_features_with_rock:rock} as stated on the surrounding crag"
}
},
"presets": {
@@ -475,6 +490,9 @@
"3": {
"render": "Difficulties overview
{histogram(_difficulty_hist)}"
},
+ "4": {
+ "render": "Contains {_contained_climbing_routes_count} routes
{_contained_climbing_routes}
"
+ },
"5": {
"render": "{name}",
"question": "What is the name of this climbing opportunity?",
@@ -493,6 +511,15 @@
"then": "A climbing crag - a single rock or cliff with at least a few climbing routes"
}
}
+ },
+ "7": {
+ "question": "What is the rock type here?",
+ "render": "The rock type is {rock}",
+ "mappings": {
+ "0": {
+ "then": "Limestone"
+ }
+ }
}
},
"presets": {
@@ -1149,4 +1176,4 @@
"shortDescription": "Map all the trees",
"description": "Map all the trees!"
}
-}
+}
\ No newline at end of file
diff --git a/langs/themes/fr.json b/langs/themes/fr.json
index a62dc4ba7..a20940d44 100644
--- a/langs/themes/fr.json
+++ b/langs/themes/fr.json
@@ -369,4 +369,4 @@
"shortDescription": "Carte des arbres",
"description": "Cartographions tous les arbres !"
}
-}
+}
\ No newline at end of file
diff --git a/langs/themes/ja.json b/langs/themes/ja.json
index 438c66eb8..8253119ca 100644
--- a/langs/themes/ja.json
+++ b/langs/themes/ja.json
@@ -1079,4 +1079,4 @@
"shortDescription": "すべての樹木をマッピングする",
"description": "すべての樹木をマッピングします!"
}
-}
+}
\ No newline at end of file
diff --git a/langs/themes/nb_NO.json b/langs/themes/nb_NO.json
index bcfaff960..de86503dd 100644
--- a/langs/themes/nb_NO.json
+++ b/langs/themes/nb_NO.json
@@ -61,13 +61,13 @@
"question": "Hvilken artist lagde dette?",
"render": "Laget av {artist_name}"
},
- "4": {
- "render": "Samsvarer med {wikidata}",
- "question": "Hvilken Wikipedia-oppføring samsvarer med dette kunstverket?"
- },
"3": {
"question": "Finnes det en nettside med mer info om dette kunstverket?",
"render": "Mer info er å finne på denne nettsiden"
+ },
+ "4": {
+ "question": "Hvilken Wikipedia-oppføring samsvarer med dette kunstverket?",
+ "render": "Samsvarer med {wikidata}"
}
}
}
@@ -316,4 +316,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index e1914788f..26c50fcf9 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -347,6 +347,13 @@
"then": "Dit Klimgelegenheid heeft geen naam"
}
}
+ },
+ "7": {
+ "mappings": {
+ "0": {
+ "then": "Kalksteen"
+ }
+ }
}
},
"presets": {
@@ -939,4 +946,4 @@
}
}
}
-}
+}
\ No newline at end of file
diff --git a/langs/themes/ru.json b/langs/themes/ru.json
index c23f0eb19..99fc317db 100644
--- a/langs/themes/ru.json
+++ b/langs/themes/ru.json
@@ -522,4 +522,4 @@
"trees": {
"title": "Деревья"
}
-}
+}
\ No newline at end of file
diff --git a/langs/themes/zh_Hant.json b/langs/themes/zh_Hant.json
index 6997c1d34..73063a9d7 100644
--- a/langs/themes/zh_Hant.json
+++ b/langs/themes/zh_Hant.json
@@ -383,4 +383,4 @@
"shortDescription": "所有樹木的地圖",
"description": "繪製所有樹木！"
}
-}
+}
\ No newline at end of file