From 7bee4d9640560f5cb2e175f220f1ef924b34dca2 Mon Sep 17 00:00:00 2001
From: Xaver Maierhofer <xaver.maierhofer@xwissen.info>
Date: Sun, 22 May 2016 15:40:13 +0200
Subject: [PATCH] [TASK] Only include additional german locale English is
default
---
app.js | 4 +++-
lib/infobox/node.js | 2 +-
lib/main.js | 2 +-
lib/map.js | 2 +-
lib/simplenodelist.js | 2 +-
5 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/app.js b/app.js
index ef131ef..22d04c7 100644
--- a/app.js
+++ b/app.js
@@ -5,7 +5,8 @@ require.config({
"leaflet.label": "../bower_components/Leaflet.label/dist/leaflet.label",
"leaflet.providers": "../bower_components/leaflet-providers/leaflet-providers",
"chroma-js": "../bower_components/chroma-js/chroma.min",
- "moment": "../bower_components/moment/min/moment-with-locales.min",
+ "moment": "../bower_components/moment/min/moment.min",
+ "moment.de": "../bower_components/moment/locale/de",
"tablesort": "../bower_components/tablesort/tablesort.min",
"tablesort.numeric": "../bower_components/tablesort/src/sorts/tablesort.numeric",
"d3": "../bower_components/d3/d3.min",
@@ -19,6 +20,7 @@ require.config({
shim: {
"leaflet.label": ["leaflet"],
"leaflet.providers": ["leaflet"],
+ "moment.de": ["moment"],
"tablesort": {
exports: "Tablesort"
},
diff --git a/lib/infobox/node.js b/lib/infobox/node.js
index 25dba43..857f359 100644
--- a/lib/infobox/node.js
+++ b/lib/infobox/node.js
@@ -1,4 +1,4 @@
-define(["moment", "numeral", "tablesort", "tablesort.numeric"],
+define(["moment", "numeral", "tablesort", "tablesort.numeric", "moment.de"],
function (moment, numeral, Tablesort) {
function showGeoURI(d) {
function showLatitude(d) {
diff --git a/lib/main.js b/lib/main.js
index e4aad85..4f2a9fd 100644
--- a/lib/main.js
+++ b/lib/main.js
@@ -1,4 +1,4 @@
-define(["moment", "router", "leaflet", "gui", "numeral"],
+define(["moment", "router", "leaflet", "gui", "numeral", "moment.de"],
function (moment, Router, L, GUI, numeral) {
return function (config) {
function handleData(data) {
diff --git a/lib/map.js b/lib/map.js
index d160dcd..6835fa8 100644
--- a/lib/map.js
+++ b/lib/map.js
@@ -1,6 +1,6 @@
define(["map/clientlayer", "map/labelslayer",
"d3", "leaflet", "moment", "locationmarker", "rbush",
- "leaflet.label", "leaflet.providers"],
+ "leaflet.label", "leaflet.providers", "moment.de"],
function (ClientLayer, LabelsLayer, d3, L, moment, LocationMarker, rbush) {
var options = {
worldCopyJump: true,
diff --git a/lib/simplenodelist.js b/lib/simplenodelist.js
index f20e02b..82f017a 100644
--- a/lib/simplenodelist.js
+++ b/lib/simplenodelist.js
@@ -1,4 +1,4 @@
-define(["moment", "virtual-dom"], function (moment, V) {
+define(["moment", "virtual-dom", "moment.de"], function (moment, V) {
return function (nodes, field, router, title) {
var self = this;
var el, tbody;
--
GitLab