From ca47e81f4be50211f3166b213a8180bde7779098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Sun, 13 Jan 2019 09:48:08 +0100 Subject: [PATCH] New twig function osmFormatDate, create locale dist files --- index.php | 1 + locales/ast.js | 7 +++++++ locales/ca.js | 7 +++++++ locales/cs.js | 7 +++++++ locales/da.js | 7 +++++++ locales/de.js | 7 +++++++ locales/el.js | 7 +++++++ locales/en.js | 5 +++++ locales/es.js | 7 +++++++ locales/et.js | 7 +++++++ locales/fr.js | 7 +++++++ locales/hu.js | 7 +++++++ locales/it.js | 7 +++++++ locales/ja.js | 7 +++++++ locales/nl.js | 7 +++++++ locales/pl.js | 7 +++++++ locales/pt-br.js | 7 +++++++ locales/pt.js | 7 +++++++ locales/ro.js | 7 +++++++ locales/ru.js | 7 +++++++ locales/sr.js | 7 +++++++ locales/uk.js | 7 +++++++ package.json | 4 +++- src/twigFunctions.js | 4 ++++ 24 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 locales/ast.js create mode 100644 locales/ca.js create mode 100644 locales/cs.js create mode 100644 locales/da.js create mode 100644 locales/de.js create mode 100644 locales/el.js create mode 100644 locales/en.js create mode 100644 locales/es.js create mode 100644 locales/et.js create mode 100644 locales/fr.js create mode 100644 locales/hu.js create mode 100644 locales/it.js create mode 100644 locales/ja.js create mode 100644 locales/nl.js create mode 100644 locales/pl.js create mode 100644 locales/pt-br.js create mode 100644 locales/pt.js create mode 100644 locales/ro.js create mode 100644 locales/ru.js create mode 100644 locales/sr.js create mode 100644 locales/uk.js diff --git a/index.php b/index.php index 7a1d6c18..a3c41338 100644 --- a/index.php +++ b/index.php @@ -55,6 +55,7 @@ html_export_var(array( + diff --git a/locales/ast.js b/locales/ast.js new file mode 100644 index 00000000..5a4c4713 --- /dev/null +++ b/locales/ast.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'ast', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +//require('moment/locale/ast') diff --git a/locales/ca.js b/locales/ca.js new file mode 100644 index 00000000..c706ab5e --- /dev/null +++ b/locales/ca.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'ca', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/de') +} + +require('moment/locale/ca') diff --git a/locales/cs.js b/locales/cs.js new file mode 100644 index 00000000..756d0422 --- /dev/null +++ b/locales/cs.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'cs', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/cs') diff --git a/locales/da.js b/locales/da.js new file mode 100644 index 00000000..ebaaae87 --- /dev/null +++ b/locales/da.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'da', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/da') diff --git a/locales/de.js b/locales/de.js new file mode 100644 index 00000000..e0a1f1a4 --- /dev/null +++ b/locales/de.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'de', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/de') +} + +require('moment/locale/de') diff --git a/locales/el.js b/locales/el.js new file mode 100644 index 00000000..11f30501 --- /dev/null +++ b/locales/el.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'el', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/el') diff --git a/locales/en.js b/locales/en.js new file mode 100644 index 00000000..d97b4a4f --- /dev/null +++ b/locales/en.js @@ -0,0 +1,5 @@ +global.locale = { + id: 'en', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} diff --git a/locales/es.js b/locales/es.js new file mode 100644 index 00000000..b0ea3a88 --- /dev/null +++ b/locales/es.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'es', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/es') diff --git a/locales/et.js b/locales/et.js new file mode 100644 index 00000000..e49bd4d2 --- /dev/null +++ b/locales/et.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'et', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/et') diff --git a/locales/fr.js b/locales/fr.js new file mode 100644 index 00000000..de412df6 --- /dev/null +++ b/locales/fr.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'fr', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/fr') diff --git a/locales/hu.js b/locales/hu.js new file mode 100644 index 00000000..72c69419 --- /dev/null +++ b/locales/hu.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'hu', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/hu') diff --git a/locales/it.js b/locales/it.js new file mode 100644 index 00000000..9a10335b --- /dev/null +++ b/locales/it.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'it', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/it') diff --git a/locales/ja.js b/locales/ja.js new file mode 100644 index 00000000..b91a1d1b --- /dev/null +++ b/locales/ja.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'ja', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/ja') diff --git a/locales/nl.js b/locales/nl.js new file mode 100644 index 00000000..dec0f6b8 --- /dev/null +++ b/locales/nl.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'nl', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/nl') diff --git a/locales/pl.js b/locales/pl.js new file mode 100644 index 00000000..53196da7 --- /dev/null +++ b/locales/pl.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'pl', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/pl') diff --git a/locales/pt-br.js b/locales/pt-br.js new file mode 100644 index 00000000..7a227e2b --- /dev/null +++ b/locales/pt-br.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'pt-br', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/pt-br') diff --git a/locales/pt.js b/locales/pt.js new file mode 100644 index 00000000..080dfc8d --- /dev/null +++ b/locales/pt.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'pt', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/pt') diff --git a/locales/ro.js b/locales/ro.js new file mode 100644 index 00000000..2b3c784b --- /dev/null +++ b/locales/ro.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'ro', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/ro') diff --git a/locales/ru.js b/locales/ru.js new file mode 100644 index 00000000..f1ff6add --- /dev/null +++ b/locales/ru.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'ru', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/ru') diff --git a/locales/sr.js b/locales/sr.js new file mode 100644 index 00000000..775fc74e --- /dev/null +++ b/locales/sr.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'sr', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/sr') diff --git a/locales/uk.js b/locales/uk.js new file mode 100644 index 00000000..58e3ae7d --- /dev/null +++ b/locales/uk.js @@ -0,0 +1,7 @@ +global.locale = { + id: 'uk', + moment: require('moment'), + osmDateFormatTemplates: require('openstreetmap-date-format/templates/en') +} + +require('moment/locale/uk') diff --git a/package.json b/package.json index 0992b57a..4a5847e2 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,7 @@ "natsort": "^1.0.6", "opening_hours": "^3.5.0", "openstreetbrowser-categories-main": "https://github.com/plepe/openstreetbrowser-categories-main", + "openstreetmap-date-format": "^0.1.0", "openstreetmap-date-parser": "^0.1.0", "openstreetmap-tag-translations": "https://github.com/plepe/openstreetmap-tag-translations", "overpass-layer": "^2.0.0", @@ -68,7 +69,8 @@ "scripts": { "test": "echo \"Error: no test specified\" && exit 1", "build": "browserify -g browserify-css src/index.js -o dist/tmp1.js && babel --presets env dist/tmp1.js > dist/tmp2.js && mv dist/tmp2.js dist/openstreetbrowser.js && rm dist/tmp1.js", - "watch": "watchify --debug -g browserify-css src/index.js -o dist/openstreetbrowser.js -v", + "build-locales": "for i in `ls locales/` ; do browserify locales/$i -o dist/locale-$i ; done", + "watch": "npm run build-locales && watchify --debug -g browserify-css src/index.js -o dist/openstreetbrowser.js -v", "prepublish": "npm run build", "lint": "standard src/*.js" }, diff --git a/src/twigFunctions.js b/src/twigFunctions.js index 8b211a07..312120fb 100644 --- a/src/twigFunctions.js +++ b/src/twigFunctions.js @@ -2,6 +2,7 @@ var OverpassLayer = require('overpass-layer') var OpeningHours = require('opening_hours') var colorInterpolate = require('color-interpolate') var osmParseDate = require('openstreetmap-date-parser') +var osmFormatDate = require('openstreetmap-date-format') const natsort = require('natsort') const md5 = require('md5') @@ -66,6 +67,9 @@ OverpassLayer.twig.extendFunction('colorInterpolate', function (map, value) { OverpassLayer.twig.extendFilter('osmParseDate', function (value) { return osmParseDate(value) }) +OverpassLayer.twig.extendFilter('osmFormatDate', function (value) { + return osmFormatDate(value) +}) OverpassLayer.twig.extendFilter('md5', function (value) { if (!(value in md5cache)) { md5cache[value] = md5(value)