Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

upgrades, moment-locales-webpack-plugin integration, easier bundle-analyzer, dutch translations #3707

Merged
merged 2 commits into from
Jul 18, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion lib/language.js
Original file line number Diff line number Diff line change
Expand Up @@ -9974,6 +9974,7 @@ function init() {
,ru: 'Избыток инсулина равного %1U, необходимого для достижения нижнего целевого значения, углеводы не будут учтены'
,sv: 'Överskott av insulin motsvarande %1U mer än nödvändigt för att nå lågt målvärde, kolhydrater ej medräknade'
,nb: 'Insulin tilsvarende %1U mer enn det trengs for å nå lavt mål, karbohydrater ikke medregnet'
,nl: 'Insulineoverschot van %1U om laag doel te behalen (excl. koolhydraten)'
,fi: 'Liikaa insuliinia: %1U enemmän kuin tarvitaan tavoitteeseen pääsyyn (huomioimatta hiilihydraatteja)'
,pt: 'Excesso de insulina equivalente a %1U além do necessário para atingir a meta inferior, sem levar em conta carboidratos'
,sk: 'Nadbytok inzulínu o %1U viac ako je potrebné na dosiahnutie spodnej cieľovej hranice. Neráta sa so sacharidmi.'
Expand All @@ -9991,6 +9992,7 @@ function init() {
,sv: 'Överskott av insulin motsvarande %1U mer än nödvändigt för att nå lågt målvärde, SÄKERSTÄLL ATT IOB TÄCKS AV KOLHYDRATER'
,es: 'Exceso de insulina en %1U más de la necesaria para alcanzar objetivo inferior. ASEGÚRESE QUE LA INSULINA ACTIVA IOB ESTA CUBIERTA POR CARBOHIDRATOS'
,nb: 'Insulin tilsvarende %1U mer enn det trengs for å nå lavt mål, PASS PÅ AT AKTIVT INSULIN ER DEKKET OPP MED KARBOHYDRATER'
,nl: 'Insulineoverschot van %1U om laag doel te behalen, ZORG VOOR VOLDOENDE KOOLHYDRATEN VOOR DE ACTIEVE INSULINE'
,fi: 'Liikaa insuliinia: %1U enemmän kuin tarvitaan tavoitteeseen pääsyyn, VARMISTA RIITTÄVÄ HIILIHYDRAATTIEN SAANTI'
,pt: 'Excesso de insulina equivalente a %1U além do necessário para atingir a meta inferior. ASSEGURE-SE DE QUE A IOB ESTEJA COBERTA POR CARBOIDRATOS'
,sk: 'Nadbytok inzulínu o %1U viac ako je potrebné na dosiahnutie spodnej cieľovej hranice. UISTITE SA, ŽE JE TO POKRYTÉ SACHARIDMI'
Expand Down Expand Up @@ -11353,42 +11355,52 @@ function init() {
'alexaUploadBattery': {
en: 'Your uploader battery is at %1'
, de: 'Der Akku deines Uploader Handys ist bei %1'
, nl: 'De batterij van je mobiel is bij %l'
},
'alexaReservoir': {
en: 'You have %1 units remaining'
, de: 'Du hast %1 Einheiten übrig'
, nl: 'Je hebt nog %l eenheden in je reservoir'
},
'alexaPumpBattery': {
en: 'Your pump battery is at %1 %2'
, de: 'Der Batteriestand deiner Pumpe ist bei %1 %2'
, nl: 'Je pomp batterij is bij %1 %2'
},
'alexaLastLoop': {
en: 'The last successful loop was %1'
, de: 'Der letzte erfolgreiche Loop war %1'
, nl: 'De meest recente goede loop was %1'
},
'alexaLoopNotAvailable': {
en: 'Loop plugin does not seem to be enabled'
, de: 'Das Loop Plugin scheint nicht aktiviert zu sein'
, nl: 'De Loop plugin is niet geactiveerd'
},
'alexaLoopForecast': {
en: 'According to the loop forecast you are expected to be %1 over the next %2'
, de: 'Entsprechend der Loop Vorhersage landest du bei %1 während der nächsten %2'
, nl: 'Volgens de Loop voorspelling is je waarde %1 over de volgnede %2'
},
'alexaForecastUnavailable': {
en: 'Unable to forecast with the data that is available',
de: 'Mit den verfügbaren Daten ist eine Loop Vorhersage nicht möglich'
de: 'Mit den verfügbaren Daten ist eine Loop Vorhersage nicht möglich',
nl: 'Niet mogelijk om een voorspelling te doen met de data die beschikbaar is'
},
'alexaRawBG': {
en: 'Your raw bg is %1'
, de: 'Dein Rohblutzucker ist %1'
, nl: 'Je raw bloedwaarde is %1'
},
'alexaOpenAPSForecast': {
en: 'The OpenAPS Eventual BG is %1'
, de: 'Der von OpenAPS vorhergesagte Blutzucker ist %1'
, nl: 'OpenAPS uiteindelijke bloedglucose van %1'
},
'alexaCOB': {
en: '%1 %2 carbohydrates on board'
, de: '%1 %2 Gramm Kohlenhydrate wirkend.'
, nl: '%1 %2 actieve koolhydraten'
},
'Fat [g]': {
cs: 'Tuk [g]'
Expand Down Expand Up @@ -11438,26 +11450,32 @@ function init() {
'TDD average': {
cs: 'Průměrná denní dávka'
, fi: 'Päivän kokonaisinsuliinin keskiarvo'
, nl: 'Gemiddelde dagelijkse insuline (TDD)'
}
,
'Carbs average': {
cs: 'Průměrné množství sacharidů'
, fi: 'Hiilihydraatit keskiarvo'
, nl: 'Gemiddelde koolhydraten per dag'
}
,
'Eating Soon': {
fi: 'Ruokailu pian'
, nl: 'Pre-maaltijd modus'
}
,
'Last entry {0} minutes ago': {
fi: 'Edellinen verensokeri {0} minuuttia sitten'
, nl: 'Laatste waarde {0} minuten geleden'
}
,
'change': {
fi: 'muutos'
, nl: 'wijziging'
},
'Speech': {
fi: 'Puhe'
, nl: 'Spraak'
}

};
Expand Down
47 changes: 30 additions & 17 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"postinstall": "webpack --mode production --config webpack.config.js && npm run-script update-buster",
"bundle": "webpack --mode production --config webpack.config.js && npm run-script update-buster",
"bundle-dev": "webpack --mode development --config webpack.config.js && npm run-script update-buster",
"bundle-analyzer": "webpack --mode development --config webpack.config.js --profile --json > stats.json && webpack-bundle-analyzer stats.json",
"update-buster": "node bin/generateCacheBuster.js >tmp/cacheBusterToken"
},
"config": {
Expand Down Expand Up @@ -96,15 +97,16 @@
"socket.io": "^2.1.1",
"style-loader": "^0.20.2",
"traverse": "^0.6.6",
"uglify-js": "^3.4.4",
"uglify-js": "^3.4.5",
"uuid": "^3.2.1",
"webpack": "^4.16.0"
"webpack": "^4.16.1"
},
"devDependencies": {
"benv": "^3.3.0",
"clear-require": "^2.0.0",
"istanbul": "^0.4.5",
"mocha": "~3.5.3",
"moment-locales-webpack-plugin": "^1.0.7",
"should": "^13.2.1",
"supertest": "^3.1.0",
"webpack-bundle-analyzer": "^2.13.1",
Expand Down
12 changes: 10 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
const path = require('path');
const webpack = require('webpack');
const MomentLocalesPlugin = require('moment-locales-webpack-plugin');


var pluginArray = [];

var sourceMapType = 'source-map';

if (process.env.NODE_ENV !== 'development') {

console.log('Production environment detected. Enabling --optimize-minimize');

/*
console.log('Development environment detected, enabling Bundle Analyzer');

Expand Down Expand Up @@ -58,6 +58,14 @@ var jq = new webpack.ProvidePlugin({

pluginArray.push(jq);

// Strip all locales except the ones defined in lib/language.js
// (“en” is built into Moment and can’t be removed, 'dk' is not defined in moment)
var momentLocales = new MomentLocalesPlugin({
localesToKeep: ['bg', 'cs', 'de', 'el', 'es', 'fi', 'fr', 'he', 'hr', 'it', 'ko', 'nb', 'nl', 'pl', 'pt', 'ro', 'ru', 'sk', 'sv', 'zh_cn', 'zh_tw'],
}) ;
pluginArray.push(momentLocales);


module.exports = {
context: path.resolve(__dirname, '.'),
entry: {
Expand Down