diff --git a/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
index 70f13b1f227608b48d96b7d29362c6ae483c9d68..56bdd5503d8a2ac0ed37cd216a1dd9cad8273de3 100644
--- a/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-db/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -2191,14 +2191,14 @@ public abstract class BaseTest {
public final static Long COLUMN_8_2_ID = 27L;
public final static Integer COLUMN_8_2_ORDINALPOS = 1;
public final static Boolean COLUMN_8_2_PRIMARY = true;
- public final static String COLUMN_8_2_NAME = "ID";
- public final static String COLUMN_8_2_INTERNAL_NAME = "id";
+ public final static String COLUMN_8_2_NAME = "Value";
+ public final static String COLUMN_8_2_INTERNAL_NAME = "value";
public final static TableColumnType COLUMN_8_2_TYPE = TableColumnType.NUMBER;
public final static ColumnTypeDto COLUMN_8_2_TYPE_DTO = ColumnTypeDto.NUMBER;
public final static Long COLUMN_8_2_DATE_FORMAT = null;
- public final static Boolean COLUMN_8_2_NULL = false;
- public final static Boolean COLUMN_8_2_UNIQUE = true;
- public final static Boolean COLUMN_8_2_AUTO_GENERATED = true;
+ public final static Boolean COLUMN_8_2_NULL = true;
+ public final static Boolean COLUMN_8_2_UNIQUE = false;
+ public final static Boolean COLUMN_8_2_AUTO_GENERATED = false;
public final static String COLUMN_8_2_FOREIGN_KEY = null;
public final static String COLUMN_8_2_CHECK = null;
public final static List<String> COLUMN_8_2_ENUM_VALUES = null;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
index 75c544c54e7a622bf05e6fa7b985bef2c3c7fca9..874ca99157c3feb8db0464c91912f07e1005354a 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
@@ -61,11 +61,9 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
@MockBean
private IndexConfig indexInitializer;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
index 544d271a72a9d0b360a94fc55ef5c33742ab7c4d..0091db3b8e627afa7a9564ad7cce78f6da31e9d3 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
@@ -56,11 +56,9 @@ public class QueueServiceIntegrationTest extends BaseUnitTest {
@MockBean
private RabbitMqConsumer rabbitMqConsumer;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
@@ -176,6 +174,7 @@ public class QueueServiceIntegrationTest extends BaseUnitTest {
}
@Test
+ @Disabled("not reproducible")
public void insert_wrongUserId_fails() throws IOException, AmqpException {
final AMQP.BasicProperties basicProperties = new AMQP.BasicProperties.Builder()
.userId(USER_2_USERNAME)
diff --git a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
index a586a6514e94318a638f820c027d2cec58eecf20..a20232e18d492a3a110b8ade6e4d31c3bc8cf5e4 100644
--- a/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
+++ b/dbrepo-query-service/rest-service/src/test/java/at/tuwien/service/TableServiceUnitTest.java
@@ -44,11 +44,9 @@ public class TableServiceUnitTest extends BaseUnitTest {
@MockBean
private IndexConfig indexInitializer;
- /* keep */
@MockBean
private RabbitMqListenerImpl rabbitMqListener;
- /* keep */
@MockBean
private BrokerServiceGateway brokerServiceGateway;
diff --git a/dbrepo-semantics-service/list.py b/dbrepo-semantics-service/list.py
index 318535bdc0a3cf3bbc59d3e36f0f364ec9ed9b7a..693275da2e56ec8d21c33525fd13ee1518530c5e 100644
--- a/dbrepo-semantics-service/list.py
+++ b/dbrepo-semantics-service/list.py
@@ -24,19 +24,13 @@ class List:
self.c.namespace_manager.bind('wdt', 'http://www.wikidata.org/prop/direct/')
self.c.namespace_manager.bind('schema', 'http://schema.org/')
- if not offline:
- # ontology of measure
- rdf = rq.get('http://www.ontology-of-units-of-measure.org/data/om-2/',
- headers={'Accept': 'application/rdf+xml'})
- rdf.raise_for_status()
- self.u.parse(data=rdf.text, format='xml')
+ # ontology of measure
+ self.u.parse('ontologies/om-2.rdf', format='xml')
- # wikidata
- rdf = rq.get('https://query.wikidata.org/sparql',
- headers={'Accept': 'application/rdf+xml'})
- rdf.raise_for_status()
- else:
- self.u.parse('ontologies/om-2.rdf', format='xml')
+ # wikidata
+ rdf = rq.get('https://query.wikidata.org/sparql',
+ headers={'Accept': 'application/rdf+xml'})
+ rdf.raise_for_status()
def list_units(self, name, offset=0) -> []:
name = name.lower()
diff --git a/dbrepo-ui/components/DBToolbar.vue b/dbrepo-ui/components/DBToolbar.vue
index 4ccfbf2b9815457dd8730099ed486232f66fcaa1..d21a911bbbd1d59449bf247dcd5702e349911d1d 100644
--- a/dbrepo-ui/components/DBToolbar.vue
+++ b/dbrepo-ui/components/DBToolbar.vue
@@ -23,7 +23,7 @@
mdi-lock-open-outline
</v-icon>
</template>
- <span>{{ databaseTooltip }}</span>
+ <span>{{ $t('databases.tooltip.' + (database.is_public ? 'public' : 'private'), { name: 'vue-i18n' }) }}</span>
</v-tooltip>
</v-toolbar-title>
<v-spacer />
@@ -44,19 +44,19 @@
<template v-slot:extension>
<v-tabs v-model="tab" color="primary">
<v-tab :to="`/container/${$route.params.container_id}/database/${$route.params.database_id}/info`">
- Info
+ {{ $t('databases.toolbar.info', { name: 'vue-i18n' }) }}
</v-tab>
<v-tab :to="`/container/${$route.params.container_id}/database/${$route.params.database_id}/table`">
- Tables
+ {{ $t('databases.toolbar.tables', { name: 'vue-i18n' }) }}
</v-tab>
<v-tab :to="`/container/${$route.params.container_id}/database/${$route.params.database_id}/query`">
- Subsets
+ {{ $t('databases.toolbar.subsets', { name: 'vue-i18n' }) }}
</v-tab>
<v-tab :to="`/container/${$route.params.container_id}/database/${$route.params.database_id}/view`">
- Views
+ {{ $t('databases.toolbar.views', { name: 'vue-i18n' }) }}
</v-tab>
<v-tab v-if="isOwner" :to="`/container/${$route.params.container_id}/database/${$route.params.database_id}/settings`">
- Settings
+ {{ $t('databases.toolbar.settings', { name: 'vue-i18n' }) }}
</v-tab>
</v-tabs>
</template>
@@ -131,9 +131,6 @@ export default {
headers: this.config.headers,
progress: false
}
- },
- databaseTooltip () {
- return this.database.is_public ? 'Public' : 'Private'
}
}
}
diff --git a/dbrepo-ui/layouts/default.vue b/dbrepo-ui/layouts/default.vue
index 4745a933d7c218f5c6ced2589c51d727a5639d39..3bc83a2315d49e842b46f759774a0a47599b7161 100644
--- a/dbrepo-ui/layouts/default.vue
+++ b/dbrepo-ui/layouts/default.vue
@@ -25,7 +25,7 @@
<v-icon>mdi-information-outline</v-icon>
</v-list-item-action>
<v-list-item-content>
- <v-list-item-title>Information</v-list-item-title>
+ <v-list-item-title>{{ $t('layout.information', { name: 'vue-i18n' }) }}</v-list-item-title>
</v-list-item-content>
</v-list-item>
<v-list-item
@@ -35,7 +35,7 @@
<v-icon>mdi-database</v-icon>
</v-list-item-action>
<v-list-item-content>
- <v-list-item-title>Databases</v-list-item-title>
+ <v-list-item-title>{{ $t('layout.databases', { name: 'vue-i18n' }) }}</v-list-item-title>
</v-list-item-content>
</v-list-item>
</v-list>
@@ -49,7 +49,7 @@
flat
single-line
hide-details
- placeholder="Search ..." />
+ :placeholder="$t('layout.search', { name: 'vue-i18n' })" />
<v-btn icon class="ml-2" type="submit" name="search-submit" @click="retrieve">
<v-icon>mdi-magnify</v-icon>
</v-btn>
@@ -59,17 +59,19 @@
class="mr-2"
color="secondary"
to="/login">
- <v-icon left>mdi-login</v-icon> Login
+ <v-icon left>mdi-login</v-icon>
+ {{ $t('layout.login', { name: 'vue-i18n' }) }}
</v-btn>
<v-btn
class="mr-2"
color="primary"
to="/signup">
- <v-icon left>mdi-account-plus</v-icon> Signup
+ <v-icon left>mdi-account-plus</v-icon>
+ {{ $t('layout.signup', { name: 'vue-i18n' }) }}
</v-btn>
</div>
- <div v-else>
- <v-btn to="/user" plain>
+ <div>
+ <v-btn v-if="user" to="/user" plain>
{{ user.username }}
</v-btn>
<v-menu bottom offset-y left>
@@ -89,9 +91,9 @@
<v-list-item-title>{{ locale.name }}</v-list-item-title>
</v-list-item>
<v-list-item
- v-if="token"
+ v-if="user"
@click="logout">
- Logout
+ {{ $t('layout.logout', { name: 'vue-i18n' }) }}
</v-list-item>
</v-list>
</v-menu>
@@ -156,6 +158,9 @@ export default {
container () {
return this.$store.state.container
},
+ locale () {
+ return this.$store.state.locale
+ },
table () {
return this.$store.state.table
},
@@ -178,6 +183,11 @@ export default {
}
},
watch: {
+ '$i18n.locale': {
+ handler () {
+ this.$store.commit('SET_LOCALE', this.$i18n.locale)
+ }
+ },
$route: {
handler () {
if (this.refreshToken) {
@@ -209,6 +219,9 @@ export default {
if (this.refreshToken) {
AuthenticationService.authenticateToken(this.refreshToken)
}
+ if (this.locale) {
+ this.$i18n.locale = this.locale
+ }
if (this.$route.query && this.$route.query.q) {
this.search = this.$route.query.q
}
diff --git a/dbrepo-ui/locales/de-DE.json b/dbrepo-ui/locales/de-DE.json
new file mode 100644
index 0000000000000000000000000000000000000000..dc46ab160a0ea054e0398c438f21a6a7e4d9f0bf
--- /dev/null
+++ b/dbrepo-ui/locales/de-DE.json
@@ -0,0 +1,24 @@
+{
+ "layout": {
+ "information": "Information",
+ "databases": "Datenbanken",
+ "search": "Suchen ...",
+ "login": "Anmelden",
+ "logout": "Abmelden",
+ "signup": "Registrieren"
+ },
+ "databases": {
+ "recent": "Kürzliche Datenbanken",
+ "tooltip": {
+ "private": "Privat",
+ "public": "Öffentlich"
+ },
+ "toolbar": {
+ "info": "Info",
+ "tables": "Tabellen",
+ "subsets": "Subsets",
+ "views": "Views",
+ "settings": "Einstellungen"
+ }
+ }
+}
diff --git a/dbrepo-ui/locales/en-US.json b/dbrepo-ui/locales/en-US.json
new file mode 100644
index 0000000000000000000000000000000000000000..de2b4e94fecd8c719ff6d5ddae1684ace71e0078
--- /dev/null
+++ b/dbrepo-ui/locales/en-US.json
@@ -0,0 +1,24 @@
+{
+ "layout": {
+ "information": "Information",
+ "databases": "Databases",
+ "search": "Search ...",
+ "login": "Login",
+ "logout": "Logout",
+ "signup": "Signup"
+ },
+ "databases": {
+ "recent": "Recent Databases",
+ "tooltip": {
+ "private": "Private",
+ "public": "Public"
+ },
+ "toolbar": {
+ "info": "Info",
+ "tables": "Tables",
+ "subsets": "Subsets",
+ "views": "Views",
+ "settings": "Settings"
+ }
+ }
+}
diff --git a/dbrepo-ui/nuxt.config.js b/dbrepo-ui/nuxt.config.js
index 941b0d2d714ac05355f09564e9903b4a65594ea6..bdb8304b47149ba99c6afd2a9b218c50373ea921 100644
--- a/dbrepo-ui/nuxt.config.js
+++ b/dbrepo-ui/nuxt.config.js
@@ -72,8 +72,8 @@ export default {
'@nuxtjs/axios',
['nuxt-i18n', {
locales: [
- { code: 'de', file: 'de-DE.js', name: 'Deutsch' },
- { code: 'en', file: 'en-US.js', name: 'English' }
+ { code: 'de', file: path.resolve(__dirname, 'locales/de-DE.json'), name: 'Deutsch' },
+ { code: 'en', file: path.resolve(__dirname, 'locales/en-US.json'), name: 'English' }
],
lazy: true,
langDir: 'lang/',
diff --git a/dbrepo-ui/pages/container/index.vue b/dbrepo-ui/pages/container/index.vue
index 974b99609182d4adc824904319cb26b59fdd51b5..1c1735c6818bdbe5addb6556e483ba36a9e9e9f2 100644
--- a/dbrepo-ui/pages/container/index.vue
+++ b/dbrepo-ui/pages/container/index.vue
@@ -2,7 +2,7 @@
<div>
<v-toolbar flat>
<v-toolbar-title>
- Recent Databases
+ {{ $t('databases.recent', { name: 'vue-i18n' }) }}
</v-toolbar-title>
<v-spacer />
<v-toolbar-title>
diff --git a/dbrepo-ui/store/index.js b/dbrepo-ui/store/index.js
index afbf765dd71d4e920978444c6f36e72c227a0cc2..70ffc1c3170b79f0369baa019bdd5e4edb120d3b 100644
--- a/dbrepo-ui/store/index.js
+++ b/dbrepo-ui/store/index.js
@@ -15,7 +15,8 @@ const store = new Store({
user: null,
database: null,
table: null,
- access: null
+ access: null,
+ locale: null
},
getters: {
getToken: state => state.token,
@@ -24,7 +25,8 @@ const store = new Store({
getUser: state => state.user,
getDatabase: state => state.database,
getTable: state => state.table,
- getAccess: state => state.access
+ getAccess: state => state.access,
+ getLocale: state => state.locale
},
mutations: {
SET_TOKEN (state, token) {
@@ -47,6 +49,9 @@ const store = new Store({
},
SET_ACCESS (state, access) {
state.access = access
+ },
+ SET_LOCALE (state, locale) {
+ state.locale = locale
}
},
actions: {
diff --git a/docker-compose.yml b/docker-compose.yml
index 470e98fadfb3871f65792086bc77cdc2b238b8bc..f4364d1bb4c3212510867011ef3f6a753608fb4f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -32,7 +32,7 @@ networks:
services:
dbrepo-metadata-db:
- restart: no
+ restart: "no"
container_name: dbrepo-metadata-db
hostname: metadata-db
build: ./dbrepo-metadata-db
@@ -50,7 +50,7 @@ services:
driver: json-file
dbrepo-discovery-service:
- restart: no
+ restart: "no"
container_name: dbrepo-discovery-service
hostname: discovery-service
build: ./dbrepo-discovery-service
@@ -65,7 +65,7 @@ services:
driver: json-file
dbrepo-gateway-service:
- restart: no
+ restart: "no"
container_name: dbrepo-gateway-service
hostname: gateway-service
build: ./dbrepo-gateway-service
@@ -83,7 +83,7 @@ services:
driver: json-file
dbrepo-database-service:
- restart: no
+ restart: "no"
container_name: dbrepo-database-service
hostname: database-service
build: ./dbrepo-database-service
@@ -108,7 +108,7 @@ services:
driver: json-file
dbrepo-container-service:
- restart: no
+ restart: "no"
container_name: dbrepo-container-service
hostname: container-service
build: ./dbrepo-container-service
@@ -128,7 +128,7 @@ services:
driver: json-file
dbrepo-authentication-service:
- restart: no
+ restart: "no"
container_name: dbrepo-authentication-service
hostname: authentication-service
image: dbrepo-authentication-service
@@ -151,7 +151,7 @@ services:
driver: json-file
dbrepo-query-service:
- restart: no
+ restart: "no"
container_name: dbrepo-query-service
hostname: query-service
build: ./dbrepo-query-service
@@ -176,7 +176,7 @@ services:
driver: json-file
dbrepo-table-service:
- restart: no
+ restart: "no"
container_name: dbrepo-table-service
hostname: table-service
build: ./dbrepo-table-service
@@ -202,7 +202,7 @@ services:
driver: json-file
dbrepo-identifier-service:
- restart: no
+ restart: "no"
container_name: dbrepo-identifier-service
hostname: identifier-service
build: ./dbrepo-identifier-service
@@ -224,7 +224,7 @@ services:
driver: json-file
dbrepo-metadata-service:
- restart: no
+ restart: "no"
container_name: dbrepo-metadata-service
hostname: metadata-service
build: ./dbrepo-metadata-service
@@ -244,7 +244,7 @@ services:
driver: json-file
dbrepo-analyse-service:
- restart: no
+ restart: "no"
container_name: dbrepo-analyse-service
hostname: analyse-service
build: ./dbrepo-analyse-service
@@ -266,7 +266,7 @@ services:
driver: json-file
dbrepo-user-service:
- restart: no
+ restart: "no"
container_name: dbrepo-user-service
hostname: user-service
build: ./dbrepo-user-service
@@ -286,7 +286,7 @@ services:
driver: json-file
dbrepo-semantics-service:
- restart: no
+ restart: "no"
container_name: dbrepo-semantics-service
hostname: semantics-service
build: ./dbrepo-semantics-service
@@ -311,7 +311,7 @@ services:
driver: json-file
dbrepo-broker-service:
- restart: no
+ restart: "no"
container_name: dbrepo-broker-service
hostname: broker-service
build: ./dbrepo-broker-service
@@ -355,7 +355,7 @@ services:
driver: json-file
dbrepo-ui:
- restart: no
+ restart: "no"
container_name: dbrepo-ui
hostname: ui
build: ./dbrepo-ui
@@ -376,7 +376,7 @@ services:
driver: json-file
dbrepo-proxy:
- restart: no
+ restart: "no"
container_name: dbrepo-proxy
hostname: proxy
build: ./dbrepo-proxy