Commit 4e1f3b54 authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Sprint/2020-10' into 'master'

Sprint/2020-10

See merge request coscine/app/usermanagement!31
parents 5db7dbdc e2919eb2
This diff is collapsed.
......@@ -131,7 +131,7 @@
<script lang="ts">
import Vue from 'vue';
import { RoleApi, UserApi, ProjectRoleApi, ProjectApi, defaultOnCatch } from '@coscine/api-connection';
import { RoleApi, UserApi, ProjectRoleApi, ProjectApi } from '@coscine/api-connection';
import { LanguageUtil } from '@coscine/app-util';
import vSelect from 'vue-select';
import 'vue-select/dist/vue-select.css';
......@@ -276,7 +276,6 @@ export default Vue.extend({
},
(error: any) => {
loading(false);
defaultOnCatch(error);
},
);
}
......@@ -306,9 +305,7 @@ export default Vue.extend({
}
this.isBusy = false;
this.filteredRows = this.projectRoles.length;
},
defaultOnCatch,
);
});
},
setRole(projectRole: {
projectId: string,
......@@ -396,8 +393,7 @@ export default Vue.extend({
this.candidateForDeletion.role.id,
(response: any) => {
this.getProjectRoles();
this.makeToast(text, this.$t('userManagement').toString()); },
defaultOnCatch);
this.makeToast(text, this.$t('userManagement').toString()); });
},
filterMock(option: any, label: any, search: string) {
return search.length > 0;
......
declare var coscine: {
i18n: {
usermanagement: {},
},
};
declare var _spPageContextInfo: any;
\ No newline at end of file
export default {
back: 'Zurück',
changeRole: 'Rolle ändern',
deleteUser: 'Entfernen',
noUserOptions: 'Kein Nutzer gefunden.',
setRole: 'Nutzer hinzufügen',
createUsersMenu: 'Nutzer Menü öffnen',
save: 'Speichern',
user: 'Nutzer',
role: 'Rolle',
loading: 'Laden...',
typeToSearch: 'Zur Suche tippen',
clear: 'Leeren',
perPage: 'Pro Seite',
searchUserPlaceholder: 'Nutzer suchen...',
alreadyGotRole: '(bereits Teilnehmer)',
selectRolePlaceholder: 'Rolle auswählen',
firstName: 'Vorname',
lastName: 'Nachname',
email: 'E-Mail',
actions: 'Aktionen',
userManagement: 'Nutzerverwaltung',
pleaseTypeSomething: 'Bitte geben Sie einen Namen ein.',
deleteUser1: 'Sind Sie sicher, dass Sie den Benutzer ',
deleteUser2: ' aus dem Projekt ',
deleteUser3: ' entfernen möchten?',
deleteUserTitle: 'Benutzer löschen',
delete: 'Löschen',
cancel: 'Abbrechen',
emptyTableText: 'Keine Nutzer gefunden.',
emptyFilterText: 'Keine Nutzer gefunden die mit Ihrer Anfrage übereinstimmen.',
addedUser1: '',
addedUser2: ' als ',
addedUser3: ' zu ',
addedUser4: ' hinzugefügt',
removedUser1: '',
removedUser2: ' von ',
removedUser3: ' gelöscht',
changedRole1: '',
changedRole2: ' ist nun ',
changedRole3: ' in ',
};
export default {
back: 'Back',
changeRole: 'Change role',
deleteUser: 'Delete',
noUserOptions: 'No user found.',
setRole: 'Add user',
createUsersMenu: 'Open user menu',
save: 'Save',
user: 'User',
role: 'Role',
loading: 'Loading...',
typeToSearch: 'Type to Search',
clear: 'Clear',
perPage: 'Per page',
searchUserPlaceholder: 'Search a user...',
alreadyGotRole: '(Already added)',
selectRolePlaceholder: 'Select Role',
firstName: 'First Name',
lastName: 'Last Name',
email: 'Email',
actions: 'Actions',
userManagement: 'User Management',
pleaseTypeSomething: 'Please enter a name.',
deleteUser1: 'Are you sure you want to remove ',
deleteUser2: ' from the project ',
deleteUser3: '?',
deleteUserTitle: 'Delete User',
delete: 'Delete',
cancel: 'Cancel',
emptyTableText: 'No user found.',
emptyFilterText: 'No user found matching your request.',
addedUser1: 'Added ',
addedUser2: ' to ',
addedUser3: ' as ',
addedUser4: '',
removedUser1: 'Removed ',
removedUser2: ' from ',
removedUser3: '',
changedRole1: 'Changed ',
changedRole2: ' in ',
changedRole3: ' to ',
};
import de from './de';
import en from './en';
export default {
de,
en,
};
......@@ -2,7 +2,6 @@ import jQuery from 'jquery';
import BootstrapVue from 'bootstrap-vue';
import Vue from 'vue';
import UserManagementApp from './UserManagementApp.vue';
import locales from './locale/locales';
import VueI18n from 'vue-i18n';
import { LanguageUtil } from '@coscine/app-util';
......@@ -17,8 +16,8 @@ Vue.use(VueI18n);
jQuery(() => {
const i18n = new VueI18n({
locale: LanguageUtil.getLanguage(), // set locale
messages: locales, // set locale messages
locale: LanguageUtil.getLanguage(),
messages: coscine.i18n.usermanagement,
silentFallbackWarn: true,
});
......
Markdown is supported
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