Commit d3ca8bea authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Topic/860-addButton' into 'Product/504-mergeWorkflow'

New: Add UserProfile keys and remove unnecessary vue dependency

See merge request coscine/app/i18n!8
parents 1a8b1b53 102dba35
{ {
"name": "@coscine/i18n", "name": "@coscine/i18n",
"version": "0.0.1", "version": "1.0.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
...@@ -6862,12 +6862,6 @@ ...@@ -6862,12 +6862,6 @@
"integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==", "integrity": "sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==",
"dev": true "dev": true
}, },
"de-indent": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
"integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=",
"dev": true
},
"debug": { "debug": {
"version": "4.1.1", "version": "4.1.1",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
...@@ -19712,11 +19706,6 @@ ...@@ -19712,11 +19706,6 @@
"integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
"dev": true "dev": true
}, },
"vue": {
"version": "2.6.11",
"resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
"integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="
},
"vue-hot-reload-api": { "vue-hot-reload-api": {
"version": "2.3.4", "version": "2.3.4",
"resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz",
...@@ -19744,11 +19733,6 @@ ...@@ -19744,11 +19733,6 @@
} }
} }
}, },
"vue-runtime-helpers": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/vue-runtime-helpers/-/vue-runtime-helpers-1.1.2.tgz",
"integrity": "sha512-pZfGp+PW/IXEOyETE09xQHR1CKkR9HfHZdnMD/FVLUNI+HxYTa82evx5WrF6Kz4s82qtqHvMZ8MZpbk2zT2E1Q=="
},
"vue-style-loader": { "vue-style-loader": {
"version": "4.1.2", "version": "4.1.2",
"resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz", "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.2.tgz",
...@@ -19767,16 +19751,6 @@ ...@@ -19767,16 +19751,6 @@
} }
} }
}, },
"vue-template-compiler": {
"version": "2.6.11",
"resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz",
"integrity": "sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA==",
"dev": true,
"requires": {
"de-indent": "^1.0.2",
"he": "^1.1.0"
}
},
"vue-template-es2015-compiler": { "vue-template-es2015-compiler": {
"version": "1.9.1", "version": "1.9.1",
"resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz", "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz",
......
...@@ -11,10 +11,6 @@ ...@@ -11,10 +11,6 @@
"lint": "vue-cli-service lint", "lint": "vue-cli-service lint",
"test:unit": "vue-cli-service test:unit" "test:unit": "vue-cli-service test:unit"
}, },
"dependencies": {
"vue": "^2.6.11",
"vue-runtime-helpers": "^1.1.2"
},
"devDependencies": { "devDependencies": {
"@babel/preset-env": "^7.10.2", "@babel/preset-env": "^7.10.2",
"@hutson/semantic-delivery-gitlab": "^9.1.0", "@hutson/semantic-delivery-gitlab": "^9.1.0",
...@@ -32,8 +28,7 @@ ...@@ -32,8 +28,7 @@
"@vue/test-utils": "1.0.3", "@vue/test-utils": "1.0.3",
"chai": "^4.2.0", "chai": "^4.2.0",
"semantic-release": "^17.0.8", "semantic-release": "^17.0.8",
"typescript": "^3.9.5", "typescript": "^3.9.5"
"vue-template-compiler": "^2.6.11"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
......
<script lang="ts">
import Vue from 'vue';
import Default from './apps/default';
import FormGenerator from './apps/form-generator';
import Project from './apps/project';
import ProjectCreation from './apps/project-creation';
import ProjectCreate from './apps/projectcreate';
import ProjectEdit from './apps/projectedit';
import ProjectView from './apps/projectview';
import ResourceContentView from './apps/resourcecontentview';
import ResourceCreation from './apps/resourcecreation';
import Resources from './apps/resources';
import RWTHMaster from './apps/rwthmaster';
import Search from './apps/search';
import SidebarMenu from './apps/sidebarmenu';
import ToastMessage from './apps/toastmessage';
import UserList from './apps/userlist';
import UserManagement from './apps/usermanagement';
import UserProfile from './apps/userprofile';
window.coscine = {
i18n: {
'default': Default,
'form-generator': FormGenerator.languageStrings,
'project': Project.languageStrings,
'project-creation': ProjectCreation.languageStrings,
'projectcreate': ProjectCreate.languageStrings,
'projectedit': ProjectEdit.languageStrings,
'projectview': ProjectView.languageStrings,
'resourcecontentview': ResourceContentView.languageStrings,
'resourcecreation': ResourceCreation.languageStrings,
'resources': Resources.languageStrings,
'rwthmaster': RWTHMaster.languageStrings,
'search': Search.languageStrings,
'sidebarmenu': SidebarMenu.languageStrings,
'toastmessage': ToastMessage.languageStrings,
'userlist': UserList.languageStrings,
'usermanagement': UserManagement.languageStrings,
'userprofile': UserProfile.languageStrings,
},
};
export default Vue.extend({
name: 'i18n',
});
</script>
...@@ -13,6 +13,7 @@ const appLanguageStrings = { ...@@ -13,6 +13,7 @@ const appLanguageStrings = {
institute: 'Institute', institute: 'Institute',
discipline: 'Select Discipline(s)', discipline: 'Select Discipline(s)',
userpreferences: 'User Preferences', userpreferences: 'User Preferences',
connectedaccounts: 'Connected Accounts',
titleLabel: 'Title:', titleLabel: 'Title:',
givennameLabel: 'First Name:', givennameLabel: 'First Name:',
...@@ -22,6 +23,10 @@ const appLanguageStrings = { ...@@ -22,6 +23,10 @@ const appLanguageStrings = {
instituteLabel: 'Institute:', instituteLabel: 'Institute:',
disciplineLabel: 'Discipline:', disciplineLabel: 'Discipline:',
languageLabel: 'Language:', languageLabel: 'Language:',
orcidLabel: 'ORCID:',
shibbolethLabel: 'Single-Sign On:',
connect: 'connect',
connected: 'connected',
save: 'save', save: 'save',
MultiselectPlaceholderTitle: 'Please select a title.', MultiselectPlaceholderTitle: 'Please select a title.',
...@@ -43,6 +48,7 @@ const appLanguageStrings = { ...@@ -43,6 +48,7 @@ const appLanguageStrings = {
institute: 'Institut', institute: 'Institut',
discipline: 'Disziplin', discipline: 'Disziplin',
userpreferences: 'Benutzer Voreinstellungen', userpreferences: 'Benutzer Voreinstellungen',
connectedaccounts: 'Verbundene Accounts',
titleLabel: 'Titel:', titleLabel: 'Titel:',
givennameLabel: 'Vorname:', givennameLabel: 'Vorname:',
...@@ -52,6 +58,10 @@ const appLanguageStrings = { ...@@ -52,6 +58,10 @@ const appLanguageStrings = {
instituteLabel: 'Institut:', instituteLabel: 'Institut:',
disciplineLabel: 'Disziplin:', disciplineLabel: 'Disziplin:',
languageLabel: 'Sprache:', languageLabel: 'Sprache:',
orcidLabel: 'ORCID:',
shibbolethLabel: 'Single-Sign On:',
connect: 'verbinden',
connected: 'verbunden',
save: 'save', save: 'save',
MultiselectPlaceholderTitle: 'Bitte wählen Sie einen Titel.', MultiselectPlaceholderTitle: 'Bitte wählen Sie einen Titel.',
......
import Vue from 'vue'; import Default from './apps/default';
import I18nApp from './I18nApp.vue'; import FormGenerator from './apps/form-generator';
import Project from './apps/project';
import ProjectCreation from './apps/project-creation';
import ProjectCreate from './apps/projectcreate';
import ProjectEdit from './apps/projectedit';
import ProjectView from './apps/projectview';
import ResourceContentView from './apps/resourcecontentview';
import ResourceCreation from './apps/resourcecreation';
import Resources from './apps/resources';
import RWTHMaster from './apps/rwthmaster';
import Search from './apps/search';
import SidebarMenu from './apps/sidebarmenu';
import ToastMessage from './apps/toastmessage';
import UserList from './apps/userlist';
import UserManagement from './apps/usermanagement';
import UserProfile from './apps/userprofile';
Vue.config.productionTip = false; window.coscine = {
i18n: {
new Vue({ 'default': Default,
render: (h) => h(I18nApp), 'form-generator': FormGenerator.languageStrings,
}); 'project': Project.languageStrings,
'project-creation': ProjectCreation.languageStrings,
'projectcreate': ProjectCreate.languageStrings,
'projectedit': ProjectEdit.languageStrings,
'projectview': ProjectView.languageStrings,
'resourcecontentview': ResourceContentView.languageStrings,
'resourcecreation': ResourceCreation.languageStrings,
'resources': Resources.languageStrings,
'rwthmaster': RWTHMaster.languageStrings,
'search': Search.languageStrings,
'sidebarmenu': SidebarMenu.languageStrings,
'toastmessage': ToastMessage.languageStrings,
'userlist': UserList.languageStrings,
'usermanagement': UserManagement.languageStrings,
'userprofile': UserProfile.languageStrings,
},
};
import Vue, { VNode } from 'vue';
declare global {
namespace JSX {
// tslint:disable no-empty-interface
interface Element extends VNode {}
// tslint:disable no-empty-interface
interface ElementClass extends Vue {}
interface IntrinsicElements {
[elem: string]: any;
}
}
}
declare module '*.vue' {
import Vue from 'vue';
export default Vue;
}
declare module "*.png" {
const value: any;
export default value;
}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment