Fix translations

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 = {

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 <a href='{website}' target='_blank'>this website</a>",
@@ -389,7 +390,8 @@
             "it": "Ulteriori informazioni su <a href='{website}' target='_blank'>questo sito web</a>",
             "ru": "Больше информации на <a href='{website}' target='_blank'>этом сайте</a>",
             "ja": "<a href='{website}' target='_blank'>Webサイト</a>に詳細情報がある",
-            "zh_Hant": "<a href='{website}' target='_blank'>這個網站</a>有更多資訊"
+            "zh_Hant": "<a href='{website}' target='_blank'>這個網站</a>有更多資訊",
+            "nb_NO": "Mer info er å finne på <a href='{website}' target='_blank'>denne nettsiden</a>"
           },
           "freeform": {
             "key": "website",
@@ -398,14 +400,15 @@
         },
         {
           "question": {
-            "en": "Which wikidata-entry corresponds with <b>this artwork</b>?",
+            "en": "Which Wikidata-entry corresponds with <b>this artwork</b>?",
-            "nl": "Welk wikidata-item beschrijft dit kunstwerk?",
+            "nl": "Welk Wikidata-item beschrijft dit kunstwerk?",
-            "fr": "Quelle entrée wikidata correspond à <b>cette œuvre d'art</b> ?",
+            "fr": "Quelle entrée Wikidata correspond à <b>cette œuvre d'art</b> ?",
             "de": "Welcher Wikidata-Eintrag entspricht <b>diesem Kunstwerk</b>?",
             "it": "Quale elemento Wikidata corrisponde a <b>quest’opera d’arte</b>?",
-            "ru": "Какая запись в wikidata соответсвует <b>этой работе</b>?",
+            "ru": "Какая запись в Wikidata соответсвует <b>этой работе</b>?",
-            "ja": "<b>このアートワーク</b>に関するwikidataのエントリーはどれですか?",
+            "ja": "<b>このアートワーク</b>に関するWikidataのエントリーはどれですか?",
-            "zh_Hant": "<b>這個藝術品</b>有那個對應的 wikidata 項目？"
+            "zh_Hant": "<b>這個藝術品</b>有那個對應的 Wikidata 項目？",
+            "nb_NO": "Hvilken Wikipedia-oppføring samsvarer med <b>dette kunstverket</b>?"
           },
           "render": {
             "en": "Corresponds with <a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'>{wikidata}</a>",
@@ -415,7 +418,8 @@
             "it": "Corrisponde a <a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'>{wikidata}</a>",
             "ru": "Запись об этой работе в wikidata: <a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'>{wikidata}</a>",
             "ja": "<a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'>{wikidata}</a>に関連する",
-            "zh_Hant": "與 <a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'>{wikidata}</a>對應"
+            "zh_Hant": "與 <a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'>{wikidata}</a>對應",
+            "nb_NO": "Samsvarer med <a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'>{wikidata}</a>"
           },
           "freeform": {
             "key": "wikidata",

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 <a href='#{_embedding_features_with_rock:id}'>on the surrounding crag</a>"
           },
           "freeform": {
             "key": "_embedding_features_with_rock:rock"
           }
-          
         },
         "reviews"
       ],
@@ -562,7 +562,7 @@
         {
           "#": "Contained routes hist",
           "render": {
-            "en": "<h3>Difficulties overview</h3>{histogram(_difficulty_hist, , , 3.*:#56bd56, 4.*:#ffff59, 5.*:#ffad48, 6.*:#63a9ff, 7.*:#ff5858, 8.*:#000000, .*:#aaa )}"
+            "en": "<h3>Difficulties overview</h3>{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",
+          "en": "Climbing opportunity?",
-          "nl": "Mogelijke klimgelegenheid",
+          "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": "登坂教室？",

assets/themes/speelplekken/speelplekken.json

@@ -264,11 +264,13 @@
         "render": "<iframe style='width: 100%; height: 300px' src=\"https://www.youtube-nocookie.com/embed/{_video:id}\" title=\"YouTube video player\" frameborder=\"0\" allow=\"accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture\" allowfullscreen></iframe>"
       }
     ],
-    "+iconOverlays": [{
+    "+iconOverlays": [
-      "if": "_video:id~*",
+      {
-      "then": "./assets/themes/speelplekken/youtube.svg",
+        "if": "_video:id~*",
-      "badge": true
+        "then": "./assets/themes/speelplekken/youtube.svg",
-    }],
+        "badge": true
+      }
+    ],
     "isShown": {
       "render": "yes",
       "mappings": [

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 <a href='#{_embedding_features_with_rock:id}'>on the surrounding crag</a>"
                     }
                 },
                 "presets": {
@@ -475,6 +490,9 @@
                     "3": {
                         "render": "<h3>Difficulties overview</h3>{histogram(_difficulty_hist)}"
                     },
+                    "4": {
+                        "render": "<h3>Contains {_contained_climbing_routes_count} routes</h3> <ul>{_contained_climbing_routes}</ul>"
+                    },
                     "5": {
                         "render": "<strong>{name}</strong>",
                         "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!"
     }
-}
+}

langs/themes/fr.json

@@ -369,4 +369,4 @@
         "shortDescription": "Carte des arbres",
         "description": "Cartographions tous les arbres !"
     }
-}
+}

langs/themes/ja.json

@@ -1079,4 +1079,4 @@
         "shortDescription": "すべての樹木をマッピングする",
         "description": "すべての樹木をマッピングします!"
     }
-}
+}

langs/themes/nb_NO.json

@@ -61,13 +61,13 @@
                         "question": "Hvilken artist lagde dette?",
                         "render": "Laget av {artist_name}"
                     },
-                    "4": {
-                        "render": "Samsvarer med <a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'>{wikidata}</a>",
-                        "question": "Hvilken Wikipedia-oppføring samsvarer med <b>dette kunstverket</b>?"
-                    },
                     "3": {
                         "question": "Finnes det en nettside med mer info om dette kunstverket?",
                         "render": "Mer info er å finne på <a href='{website}' target='_blank'>denne nettsiden</a>"
+                    },
+                    "4": {
+                        "question": "Hvilken Wikipedia-oppføring samsvarer med <b>dette kunstverket</b>?",
+                        "render": "Samsvarer med <a href='https://www.wikidata.org/wiki/{wikidata}' target='_blank'>{wikidata}</a>"
                     }
                 }
             }
@@ -316,4 +316,4 @@
             }
         }
     }
-}
+}

langs/themes/nl.json

@@ -347,6 +347,13 @@
                                 "then": "Dit Klimgelegenheid heeft geen naam"
                             }
                         }
+                    },
+                    "7": {
+                        "mappings": {
+                            "0": {
+                                "then": "Kalksteen"
+                            }
+                        }
                     }
                 },
                 "presets": {
@@ -939,4 +946,4 @@
             }
         }
     }
-}
+}

langs/themes/ru.json

@@ -522,4 +522,4 @@
     "trees": {
         "title": "Деревья"
     }
-}
+}

langs/themes/zh_Hant.json

@@ -383,4 +383,4 @@
         "shortDescription": "所有樹木的地圖",
         "description": "繪製所有樹木！"
     }
-}
+}