bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2786 from stweedo/nav_testing 

Update messagegui.app.js
master
Gordon Williams 2023-06-05 09:41:07 +01:00 committed by GitHub
parent 6cc74bb4b5 790db2f442
commit 1c4e8751ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/locale/locales.js
View File

@ -1,6 +1,7 @@
/* jshint esversion: 6 */ /* jshint esversion: 6 */
const distanceUnits = { // how many meters per X? const distanceUnits = { // how many meters per X?
"m": 1, "m": 1,
"ft": 0.3048,
"yd": 0.9144, "yd": 0.9144,
"mi": 1609.34, "mi": 1609.34,
"km": 1000, "km": 1000,
@ -160,7 +161,7 @@ var locales = {
currency_symbol: "$", currency_first: true, currency_symbol: "$", currency_first: true,
int_curr_symbol: "USD", int_curr_symbol: "USD",
speed: "mph", speed: "mph",
distance: { 0: "m", 1: "mi" }, distance: { 0: "ft", 1: "mi" },
temperature: "°F", temperature: "°F",
ampm: { 0: "am", 1: "pm" }, ampm: { 0: "am", 1: "pm" },
timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" }, timePattern: { 0: "%HH:%MM:%SS ", 1: "%HH:%MM" },

4
apps/messagegui/app.js
View File

@ -84,8 +84,8 @@ function showMapMessage(msg) {
if (msg.distance!==undefined) if (msg.distance!==undefined)
distance = require("locale").distance(msg.distance); distance = require("locale").distance(msg.distance);
if (msg.instr) { if (msg.instr) {
if (msg.instr.includes("towards")) { if (msg.instr.includes("towards") || msg.instr.includes("toward")) {
m = msg.instr.split("towards"); m = msg.instr.split(/towards|toward/);
target = m[0].trim(); target = m[0].trim();
street = m[1].trim(); street = m[1].trim();
}else }else