Merge pull request #163 from bagage/show-strava-error

Show strava error + update translations

js/index.js

@@ -253,6 +253,9 @@
             })
             .addTo(map);
             layersControl.addOverlay(stravaControl.stravaLayer, i18next.t('map.layer.strava-segments'));
+            stravaControl.onError = function(err) {
+                BR.message.showError(i18next.t('warning.strava-error', {error: err && err.message ? err.message : err}));
+            }
         }
 
         map.addControl(new BR.OpacitySlider({

locales/en.json

@@ -165,6 +165,7 @@
     "no-response": "no response from server",
     "no-route-found": "Error: cannot find a route for given points. Maybe try to move them closer to roads?",
     "profile-error": "Profile error: no or empty response from server",
+    "strava-error": "Error getting Strava segments: {{error}}",
     "temporary-profile": "<strong>Note:</strong> Uploaded custom profiles are only cached temporarily on the server.<br/>Please save your edits to your local PC.",
     "upload-error": "Upload error: {{error}}"
   }

locales/pt.json

@@ -0,0 +1,171 @@
+{
+  "about": {
+    "bug-reports": "Relatórios de erros e pedidos de novas funcionalidades:",
+    "bug-reports-back": "server / backend, routing engine, Android app, profiles, brouter.de site:",
+    "bug-reports-front": "web client / frontend:",
+    "contact": "Contacto:",
+    "data": "Dados:",
+    "data-description": "This is based on <a href=\"https://www.openstreetmap.org\" target=\"_blank\">OpenStreetMap</a>. It is usually updated once a week when a new Planet file is available, see dates of <a href=\"http://brouter.de/brouter/segments4/\" target=\"_blank\">data files</a>.",
+    "description": "Online service of the BRouter routing engine. For the offline Android app and more information see <a href=\"http://brouter.de/\" target=\"_blank\">brouter.de</a>.",
+    "details": "<i><a href=\"http://brouter.de/privacypolicy.html\" target=\"_blank\">Privacy Policy</a></i>, \n<i><a href=\"https://github.com/nrenner/brouter-web#credits-and-licenses\" target=\"_blank\">Credits</a></i>,\n<i><a href=\"https://github.com/nrenner/brouter-web/blob/master/CHANGELOG.md\" target=\"_blank\">Changelog</a></i> and\n<i><a href=\"https://github.com/nrenner/brouter-web#readme\" target=\"_blank\">more info</a></i> on the client.",
+    "support": "General discussions/questions, support:",
+    "title": "Sobre"
+  },
+  "credits": {
+    "brouter": "BRouter",
+    "brouter-license": "<a target=\"_blank\" href=\"http://brouter.de/brouter\">BRouter</a> &copy; Arndt Brenschede",
+    "cycling-hiking-tiles": "Cycling & Hiking tiles",
+    "digitalglobe-license": "&copy; <a href=\"https://www.digitalglobe.com/platforms/mapsapi\">DigitalGlobe</a> (<a href=\"https://bit.ly/mapsapiview\">Terms of Use</a>)",
+    "esri-license": "<a target=\"_blank\" href=\"http://goto.arcgisonline.com/maps/World_Imagery\">World Imagery</a> &copy; <a target=\"_blank\" href=\"https://www.esri.com/\">Esri</a>, sources: Esri, DigitalGlobe, Earthstar Geographics, CNES/Airbus DS, GeoEye, USDA FSA, USGS, Getmapping, Aerogrid, IGN, IGP, and the GIS User Community",
+    "esri-tiles": "Esri World Imagery",
+    "map-data": "Dados do mapa",
+    "nominatim": "Search by <a href=\"https://wiki.openstreetmap.org/wiki/Nominatim\" target=\"_blank\" data-i18n=\"credits.nominatim\">Nominatim</a>",
+    "opencyclemap-outdoors-tiles": "OpenCycleMap & Outdoors tiles",
+    "openstreetmap": "&copy; <a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\" >OpenStreetMap contributors</a> under <a target=\"_blank\" href=\"https://opendatacommons.org/licenses/odbl/\" >ODbL</a>",
+    "opentopomap-license": "&copy; <a target=\"_blank\" href=\"https://opentopomap.org\">OpenTopoMap</a> under <a target=\"_blank\" href=\"https://creativecommons.org/licenses/by-sa/3.0/\">CC-BY-SA</a> <a target=\"_blank\" href=\"http://viewfinderpanoramas.org\">SRTM</a>",
+    "opentopomap-tiles": "OpenTopoMap tiles",
+    "osm-license": "<a target=\"_blank\" href=\"https://www.openstreetmap.org/copyright\">openstreetmap.org</a> under <a target=\"_blank\" href=\"https://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA 2.0</a>",
+    "osm-tiles": "OpenStreetMap tiles",
+    "osmde-tiles": "OpenStreetMap.de tiles",
+    "thunderforest-license": "&copy; <a target=\"_blank\" href=\"https://www.thunderforest.com\">Thunderforest</a> under <a target=\"_blank\" href=\"https://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA 2.0</a>",
+    "waymarked-license": "&copy; <a target=\"_blank\" href=\"https://cycling.waymarkedtrails.org\">Waymarked Trails</a> under <a target=\"_blank\" href=\"https://creativecommons.org/licenses/by-sa/3.0/de/deed.en\">CC-BY-SA 3.0 DE</a>"
+  },
+  "footer": {
+    "ascend": "Ascend (Plain ascend)",
+    "cost": "Cost (Mean cost factor)",
+    "distance": "Distance",
+    "kilometer": "kilometer",
+    "kilometer-abbrev": "km",
+    "kilowatthour": "kilowatt hour",
+    "kilowatthour-abbrev": "kWh",
+    "meter": "meter",
+    "meter-abbrev": "m",
+    "minutes": "minutes",
+    "minutes-abbrev": "min",
+    "total-energy": "Total Energy (per 100km)",
+    "travel-time": "Travel time"
+  },
+  "layers": {
+    "add-base": "Add base layer",
+    "add-overlay": "Add overlay",
+    "customize": "Customize layers",
+    "placeholder-layer-name": "Custom layer name. (ex: OpenStreetMap)",
+    "placeholder-layer-url": "Custom layer URL. (ex: https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png)",
+    "remove-selection": "Remove selection"
+  },
+  "map": {
+    "attribution-osm-long": "OpenStreetMap contributors",
+    "attribution-osm-short": "OpenStreetMap",
+    "clear-route": "Clear route",
+    "copyright": "Copyright",
+    "cycling": "Cycling",
+    "delete-nogo-areas": "&nbsp;&nbsp;also delete all no-go areas",
+    "delete-route": "Delete route?",
+    "draw-route-start": "Draw route (D key)",
+    "draw-route-stop": "Stop drawing route (ESC key)",
+    "hiking": "Hiking",
+    "layer": {
+      "bing": "Bing Aerial",
+      "cycle": "OpenCycleMap (Thunderf.)",
+      "cycling": "Cycling (Waymarked Trails)",
+      "digitalglobe": "DigitalGlobe Recent Imagery",
+      "esri": "Esri World Imagery",
+      "hiking": "Hiking (Waymarked Trails)",
+      "osm": "OpenStreetMap",
+      "osmde": "OpenStreetMap.de",
+      "outdoors": "Outdoors (Thunderforest)",
+      "strava-segments": "Strava segments",
+      "topo": "OpenTopoMap"
+    },
+    "loading": "Loading…",
+    "locate-me": "Show me where I am",
+    "nogo": {
+      "cancel": "Cancel drawing no-go area",
+      "click-drag": "Click and drag to draw circle",
+      "draw": "Draw no-go area (circle)",
+      "edit": "Click to edit",
+      "help": "&square; = move / resize, <span class=\"fa fa-trash-o\"></span> = delete,<br>click circle to quit editing"
+    },
+    "opacity-slider": "Set transparency of route track and markers",
+    "privacy": "Privacy",
+    "strava-biking": "Show Strava biking segments",
+    "strava-running": "Show Strava running segments",
+    "zoomInTitle": "Zoom in",
+    "zoomOutTitle": "Zoom out"
+  },
+  "navbar": {
+    "about": "About",
+    "alternative": {
+      "first": "1st alternative",
+      "original": "Original",
+      "second": "2nd alternative",
+      "third": "3rd alternative"
+    },
+    "download": {
+      "csv": "data CSV",
+      "geojson": "GeoJSON",
+      "gpx": "GPX",
+      "kml": "KML",
+      "title": "Download"
+    },
+    "profile": {
+      "car-eco": "Car (economic)",
+      "car-fast": "Car (fast)",
+      "car-test": "Car (test)",
+      "custom": "Custom",
+      "fastbike": "Fastbike",
+      "fastbike-asia-pacific": "Fastbike (Asia Pacific)",
+      "fastbike-lowtraffic": "Fastbike (low traffic)",
+      "hiking-beta": "Hiking (beta)",
+      "moped": "Moped",
+      "rail": "Rail",
+      "river": "River",
+      "safety": "Safety",
+      "shortest": "Shortest",
+      "trekking": "Trekking bike",
+      "trekking-ignore-cr": "Trekking bike (ignore cycle routes)",
+      "trekking-noferries": "Trekking bike (no ferries)",
+      "trekking-nosteps": "Trekking bike (no steps)",
+      "trekking-steep": "Trekking bike (steep)",
+      "vm-forum-liegerad-schnell": "Recumbent bike (fast)",
+      "vm-forum-velomobil-schnell": "Velomobile (fast)"
+    }
+  },
+  "sidebar": {
+    "custom-profile": {
+      "title": "Custom profile"
+    },
+    "data": {
+      "title": "Data"
+    },
+    "itinerary": {
+      "title": "Itinerary"
+    },
+    "layers": {
+      "custom-layers": "Custom layers",
+      "customize": "Add or remove custom layers",
+      "table": {
+        "URL": "URL",
+        "empty": "No custom layer configured yet.",
+        "name": "Name",
+        "type": "Type"
+      },
+      "title": "Layers"
+    },
+    "profile": {
+      "clear": "Clear",
+      "help": "Help",
+      "placeholder": "Write your custom profile here.",
+      "upload": "Upload"
+    }
+  },
+  "title": "BRouter web client",
+  "warning": {
+    "cannot-get-route": "Error getting route URL",
+    "no-response": "no response from server",
+    "no-route-found": "Error: cannot find a route for given points. Maybe try to move them closer to roads?",
+    "profile-error": "Profile error: no or empty response from server",
+    "temporary-profile": "<strong>Note:</strong> Uploaded custom profiles are only cached temporarily on the server.<br/>Please save your edits to your local PC.",
+    "upload-error": "Upload error: {{error}}"
+  }
+}

locales/zh-TW.json

@@ -115,20 +115,20 @@
       "custom": "自訂",
       "fastbike": "機車",
       "fastbike-asia-pacific": "機車 (亞太)",
-      "fastbike-lowtraffic": "Fastbike (low traffic)",
+      "fastbike-lowtraffic": "機車 (低交通流量)",
       "hiking-beta": "遠足 (Beta測試中)",
       "moped": "機慢車",
       "rail": "鐵道",
       "river": "河道",
       "safety": "安全",
       "shortest": "最短",
-      "trekking": "Trekking bike",
+      "trekking": "登山越野車",
-      "trekking-ignore-cr": "Trekking bike (ignore cycle routes)",
+      "trekking-ignore-cr": "登山越野車 (忽視自行車道)",
-      "trekking-noferries": "Trekking bike (no ferries)",
+      "trekking-noferries": "登山越野車 (不經過渡輪)",
-      "trekking-nosteps": "Trekking bike (no steps)",
+      "trekking-nosteps": "登山越野車 (跳過階梯)",
-      "trekking-steep": "Trekking bike (steep)",
+      "trekking-steep": "登山越野車 (極限)",
-      "vm-forum-liegerad-schnell": "Recumbent bike (fast)",
+      "vm-forum-liegerad-schnell": "臥式自行車 (速度型)",
-      "vm-forum-velomobil-schnell": "Velomobile (fast)"
+      "vm-forum-velomobil-schnell": "躺車 (速度型)"
     }
   },
   "sidebar": {

package.json

@@ -6,7 +6,7 @@
   "scripts": {
     "build": "gulp",
     "transifex-push": "gulp i18next && tx push --source",
-    "transifex-pull": "tx pull --all --minimum-perc 1 --force",
+    "transifex-pull": "tx pull --all --minimum-perc 1 --force && (git add locales/*.json && git commit locales/*.json -m 'Update translations' || true)",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {