diff --git a/packages/person-profile/assets/index.html b/packages/person-profile/assets/index.html index 20f669bb214eafbf570a7b9902d87627e03f07e7..203379580e878c714d8beda2552cec8a05c7519c 100644 --- a/packages/person-profile/assets/index.html +++ b/packages/person-profile/assets/index.html @@ -7,6 +7,6 @@ <body> -<vpu-person-profile-demo lang="de"></vpu-person-profile-demo> +<vpu-person-profile-demo id="vpu-person-profile-src" lang="de"></vpu-person-profile-demo> </body> </html> diff --git a/packages/person-profile/src/i18n/de/translation.json b/packages/person-profile/src/i18n/de/translation.json index a9b63f1367c6e89ac50f6e6922b3d6e3fedbf6d3..e468f0127c5b15ace9a6060f8eb95873843a9cd8 100644 --- a/packages/person-profile/src/i18n/de/translation.json +++ b/packages/person-profile/src/i18n/de/translation.json @@ -8,6 +8,7 @@ "role": "Rolle", "none-selected": "Keine Person ausgewählt", "staff": "Mitarbeiter/in", - "alumni": "Absolvent/in" + "alumni": "Absolvent/in", + "unknown": "unbekannt" } } diff --git a/packages/person-profile/src/i18n/en/translation.json b/packages/person-profile/src/i18n/en/translation.json index 712a774f18805388f1bd1eec45802319af4321a7..b4cc34a2bfeaad2c4e74f7873d83b1d5221d78cf 100644 --- a/packages/person-profile/src/i18n/en/translation.json +++ b/packages/person-profile/src/i18n/en/translation.json @@ -1,13 +1,14 @@ { "person-profile": { "profile-caption": "Profile for", - "given-name": "given name", - "family-name": "family name", - "email": "email", - "telephone": "telephone", - "role": "role", + "given-name": "Given name", + "family-name": "Family name", + "email": "Email", + "telephone": "Telephone", + "role": "Role", "none-selected": "No person selected", "staff": "staff", - "alumni": "alumni" + "alumni": "alumni", + "unknown": "unknown" } } diff --git a/packages/person-profile/src/person-profile-demo.js b/packages/person-profile/src/person-profile-demo.js index 45ad1642466432b48257916d99f0b7783e96ab2d..b491e6f92c0a5a23ec66d52de406f16bbec83595 100644 --- a/packages/person-profile/src/person-profile-demo.js +++ b/packages/person-profile/src/person-profile-demo.js @@ -4,7 +4,6 @@ import VPULitElement from 'vpu-common/vpu-lit-element'; import './person-profile.js'; import * as commonUtils from 'vpu-common/utils'; import bulmaCSSPath from "bulma/css/bulma.min.css"; -import {getAssetURL} from "./utils"; import $ from 'jquery'; import 'vpu-person-select'; @@ -63,7 +62,8 @@ class PersonProfileDemo extends VPULitElement { } render() { - const bulmaCSS = getAssetURL(bulmaCSSPath); + commonUtils.initAssetBaseURL('vpu-person-profile-src'); + const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath); return html` <link rel="stylesheet" href="${bulmaCSS}"> diff --git a/packages/person-profile/src/person-profile.js b/packages/person-profile/src/person-profile.js index a23a1a060a1156e14cbea80659701e5261e9902c..4b8ff46edfa6a7c93fd126b7db22517c94be3e32 100644 --- a/packages/person-profile/src/person-profile.js +++ b/packages/person-profile/src/person-profile.js @@ -1,4 +1,4 @@ -import {getAssetURL} from './utils.js'; + import JSONLD from 'vpu-common/jsonld'; import {html} from 'lit-element'; import {i18n} from './i18n.js'; @@ -71,7 +71,7 @@ class PersonProfile extends VPULitElement { } render() { - let role = 'unbekannt'; + let role = i18n.t('person-profile.unknown'); if (this.person !== null && this.person.roles !== undefined) { // roles are only defined for self-disclosure if (this.person.roles.indexOf('ROLE_STAFF') > -1) { @@ -80,7 +80,8 @@ class PersonProfile extends VPULitElement { role = i18n.t('person-profile.alumni'); } } - const bulmaCSS = getAssetURL(bulmaCSSPath); + commonUtils.initAssetBaseURL('vpu-person-profile-src'); + const bulmaCSS = commonUtils.getAssetURL(bulmaCSSPath); return html` <link rel="stylesheet" href="${bulmaCSS}"> <style> diff --git a/packages/person-profile/src/utils.js b/packages/person-profile/src/utils.js deleted file mode 100644 index ce1da2b82c374f7629d4179d1b0e21bfe6ed0e54..0000000000000000000000000000000000000000 --- a/packages/person-profile/src/utils.js +++ /dev/null @@ -1,9 +0,0 @@ -export const getAssetURL = (path) => { - const elm = document.getElementById('vpu-library-shelving-wc-src'); - if (!elm) - return path; - const url = elm.src; - // newer browsers only - //var url = import.meta.url; - return new URL(path, url).href; -}; diff --git a/packages/person-profile/vendor/common b/packages/person-profile/vendor/common index d99ddf4deb91f0710d3f2f87ed3157c74dbcb8c6..c15bde62fbf022d666378e115d24b6c0b0bfad20 160000 --- a/packages/person-profile/vendor/common +++ b/packages/person-profile/vendor/common @@ -1 +1 @@ -Subproject commit d99ddf4deb91f0710d3f2f87ed3157c74dbcb8c6 +Subproject commit c15bde62fbf022d666378e115d24b6c0b0bfad20