# HG changeset patch # User Bernhard Reiter # Date 1543924351 -3600 # Node ID 22b2e0c7c4115d7d475c33ec20d6dbf1151b2b8d # Parent 5ef81251af189bfcb0dc75fa041ea511bba445f7# Parent 5e4dcc768f90c66758553555e8aae7d0e835cea6 translations: merge translations with new strings diff -r 5e4dcc768f90 -r 22b2e0c7c411 client/package.json --- a/client/package.json Mon Dec 03 16:14:18 2018 +0000 +++ b/client/package.json Tue Dec 04 12:52:31 2018 +0100 @@ -32,30 +32,30 @@ "font-awesome": "^4.7.0", "glob-all": "^3.1.0", "locale2": "^2.2.0", - "ol": "^5.0.0", + "ol": "^5.3.0", "path": "^0.12.7", - "purgecss-webpack-plugin": "^1.2.1", + "purgecss-webpack-plugin": "^1.4.0", "v-tooltip": "^2.0.0-rc.33", "vue": "^2.5.16", "vue-clipboard2": "^0.2.1", "vue-color": "^2.6.0", "vue-highlightjs": "^1.3.3", - "vue-router": "^3.0.1", + "vue-router": "^3.0.2", "vue-snotify": "^3.2.1", "vuex": "^3.0.1", "webpack-cli": "^3.1.2" }, "devDependencies": { - "@vue/cli-plugin-babel": "^3.1.1", - "@vue/cli-plugin-e2e-nightwatch": "^3.1.1", - "@vue/cli-plugin-eslint": "^3.1.4", - "@vue/cli-plugin-unit-jest": "^3.1.1", - "@vue/cli-service": "^3.1.2", - "@vue/eslint-config-prettier": "^4.0.0", - "@vue/test-utils": "^1.0.0-beta.20", + "@vue/cli-plugin-babel": "^3.2.0", + "@vue/cli-plugin-e2e-nightwatch": "^3.2.0", + "@vue/cli-plugin-eslint": "^3.2.1", + "@vue/cli-plugin-unit-jest": "^3.2.0", + "@vue/cli-service": "^3.2.0", + "@vue/eslint-config-prettier": "^4.0.1", + "@vue/test-utils": "^1.0.0-beta.26", "babel-core": "7.0.0-bridge.0", "babel-jest": "^23.0.1", - "concurrently": "^4.0.1", + "concurrently": "^4.1.0", "copy-webpack-plugin": "^4.6.0", "easygettext": "^2.7.0", "node-sass": "^4.10.0", diff -r 5e4dcc768f90 -r 22b2e0c7c411 client/src/components/App.vue --- a/client/src/components/App.vue Mon Dec 03 16:14:18 2018 +0000 +++ b/client/src/components/App.vue Tue Dec 04 12:52:31 2018 +0100 @@ -27,9 +27,7 @@ -
- -
+
diff -r 5e4dcc768f90 -r 22b2e0c7c411 client/src/components/Login.vue --- a/client/src/components/Login.vue Mon Dec 03 16:14:18 2018 +0000 +++ b/client/src/components/Login.vue Tue Dec 04 12:52:31 2018 +0100 @@ -3,16 +3,19 @@
- +

{{ appTitle }}

- ) diff -r 5e4dcc768f90 -r 22b2e0c7c411 client/src/components/admin/Systemconfiguration.vue --- a/client/src/components/admin/Systemconfiguration.vue Mon Dec 03 16:14:18 2018 +0000 +++ b/client/src/components/admin/Systemconfiguration.vue Tue Dec 04 12:52:31 2018 +0100 @@ -2,7 +2,9 @@
-
+
Systemconfiguration
@@ -11,13 +13,13 @@

Bottleneck Areas stroke-color

- +

Bottleneck Areas fill-color

- +
@@ -128,7 +130,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); @@ -143,7 +145,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); @@ -162,7 +164,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); @@ -179,7 +181,7 @@ .catch(error => { const { status, data } = error.response; displayError({ - title: "Backend Error", + title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}` }); }); diff -r 5e4dcc768f90 -r 22b2e0c7c411 client/src/components/admin/importschedule/Importschedule.vue --- a/client/src/components/admin/importschedule/Importschedule.vue Mon Dec 03 16:14:18 2018 +0000 +++ b/client/src/components/admin/importschedule/Importschedule.vue Tue Dec 04 12:52:31 2018 +0100 @@ -3,7 +3,9 @@
-
+
Importschedule
@@ -23,27 +25,17 @@ placeholder aria-label="Search" aria-describedby="search" - > + />
- - - - - + + + + + @@ -56,10 +48,17 @@ @@ -67,7 +66,10 @@
No schedules
- diff -r 5e4dcc768f90 -r 22b2e0c7c411 client/src/components/admin/importschedule/Importscheduledetail.vue --- a/client/src/components/admin/importschedule/Importscheduledetail.vue Mon Dec 03 16:14:18 2018 +0000 +++ b/client/src/components/admin/importschedule/Importscheduledetail.vue Tue Dec 04 12:52:31 2018 +0100 @@ -1,7 +1,9 @@
- Import - - Type - - Author - - Schedule - - Email - ImportTypeAuthorScheduleEmail    
- + - +