Skip to content

Commit

Permalink
update language management following v0.42.0 release
Browse files Browse the repository at this point in the history
  • Loading branch information
sdumetz committed Jun 28, 2024
1 parent 0004705 commit 9fd9ca8
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 11 deletions.
3 changes: 0 additions & 3 deletions source/server/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ export default async function createServer(config = defaultConfig) :Promise<expr
scene,
thumb: thumb.toString(),
referrer: referrer.toString(),
lang: ((typeof lang === "string")?lang.toUpperCase():"FR"),
script
});
});
Expand All @@ -153,7 +152,6 @@ export default async function createServer(config = defaultConfig) :Promise<expr
thumb: thumb.toString(),
referrer: referrer.toString(),
mode: "Edit",
lang: ((typeof lang === "string")?lang.toUpperCase():"FR"),
});
});

Expand All @@ -167,7 +165,6 @@ export default async function createServer(config = defaultConfig) :Promise<expr
mode: "Standalone",
thumb: "/images/sketch_ethesaurus.png",
referrer: referrer.toString(),
lang: ((typeof lang === "string")?lang.toUpperCase():"FR"),
});
});

Expand Down
2 changes: 1 addition & 1 deletion source/server/templates/explorer.hbs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

<voyager-explorer resourceroot="/dist/" dracoRoot="/dist/js/draco/" root="/scenes/{{scene}}/" referrer="{{referrer}}" lang="{{lang}}"></voyager-explorer>
<voyager-explorer resourceroot="/dist/" dracoRoot="/dist/js/draco/" root="/scenes/{{scene}}/" referrer="{{referrer}}"></voyager-explorer>
<script type="text/javascript" src="/dist/js/voyager-explorer.js"></script>
{{#if script }}<script type="text/javascript">
{{{script}}}
Expand Down
2 changes: 1 addition & 1 deletion source/server/utils/schema/default.svx.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"type": "application/si-dpo-3d.document+json",
"version": "1.0",
"copyright": "(c) Holusion SAS, all rights reserved",
"generator": "Voyager"
"generator": "eCorpus"
},
"scene": 0,
"scenes": [{
Expand Down
4 changes: 2 additions & 2 deletions source/ui/composants/SceneCard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ import { AccessType, AccessTypes, Scene } from "../state/withScenes";
}

protected render() :TemplateResult {
let explorer = `/ui/scenes/${encodeURIComponent(this.name)}/view?lang=${this.language.toUpperCase()}`;
let story = `/ui/scenes/${encodeURIComponent(this.name)}/edit?lang=${this.language.toUpperCase()}`;
let explorer = `/ui/scenes/${encodeURIComponent(this.name)}/view`;
let story = `/ui/scenes/${encodeURIComponent(this.name)}/edit`;
return html`
<div class="scene-card-inner ${this.cardStyle == "list" ? "scene-card-inner-list": ""}" }>
<div style="display:flex; flex:auto; align-items:center;">
Expand Down
2 changes: 1 addition & 1 deletion source/ui/screens/LandingPage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import "../composants/UserLogin"
<img src="${sketch}" alt="dessin représentant l'application voyager et son utilisation dans une borne holographique">
<p>${this.t("info.lead")}.</p>
<p style="text-align:right">
<a href="/ui/standalone/?lang=${this.language.toUpperCase()}">${this.t("info.useStandalone")}</a>
<a href="/ui/standalone/}">${this.t("info.useStandalone")}</a>
</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions source/ui/screens/SceneHistory.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,10 +200,10 @@ class SceneVersion{
<h3>Total size: <b-size b=${size}></b-size></h3>
<h3>${articles.size} article${(1 < articles.size?"s":"")}</h3>
<div style="max-width: 300px">
${this.can("write")?html`<a class="btn btn-main" href=${`/ui/scenes/${scene}/edit?lang=${this.language.toUpperCase()}`}>
${this.can("write")?html`<a class="btn btn-main" href=${`/ui/scenes/${scene}/edit`}>
<ui-icon name="edit"></ui-icon> ${this.t("ui.editScene")}
</a>`:null}
<a class="btn btn-main" style="margin-top:10px" href=${`/ui/scenes/${scene}/view?lang=${this.language.toUpperCase()}`}><ui-icon name="eye"></ui-icon> ${this.t("ui.viewScene")}</a>
<a class="btn btn-main" style="margin-top:10px" href=${`/ui/scenes/${scene}/view`}><ui-icon name="eye"></ui-icon> ${this.t("ui.viewScene")}</a>
<a class="btn btn-main" style="margin-top:10px" download href="/api/v1/scenes/${scene}?format=zip"><ui-icon name="save"></ui-icon> ${this.t("ui.downloadScene")}</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion source/voyager
Submodule voyager updated 32 files
+2 −2 package-lock.json
+1 −1 package.json
+1 −1 source/client/annotations/ExtendedSprite.ts
+6 −1 source/client/components/CVAnnotationView.ts
+1 −29 source/client/components/CVAnnotationsTask.ts
+4 −23 source/client/components/CVArticlesTask.ts
+24 −22 source/client/components/CVAudioManager.ts
+8 −27 source/client/components/CVAudioTask.ts
+1 −1 source/client/components/CVDocument.ts
+2 −0 source/client/components/CVFloor.ts
+22 −14 source/client/components/CVLanguageManager.ts
+3 −0 source/client/components/CVMeta.ts
+19 −17 source/client/components/CVOrbitNavigation.ts
+1 −11 source/client/components/CVTaskProvider.ts
+0 −22 source/client/components/CVToursTask.ts
+3 −0 source/client/schema/json/setup.schema.json
+1 −0 source/client/schema/setup.ts
+33 −15 source/client/ui/PropertyNumber.ts
+39 −8 source/client/ui/PropertyOptions.ts
+6 −14 source/client/ui/explorer/ChromeView.ts
+15 −0 source/client/ui/explorer/styles.scss
+6 −5 source/client/ui/story/AnnotationsTaskView.ts
+2 −1 source/client/ui/story/ArticleEditor.ts
+4 −3 source/client/ui/story/ArticlesTaskView.ts
+2 −1 source/client/ui/story/AudioTaskView.ts
+7 −8 source/client/ui/story/CollectionPanel.ts
+3 −1 source/client/ui/story/MainView.ts
+2 −1 source/client/ui/story/TourPanel.ts
+5 −4 source/client/ui/story/ToursTaskView.ts
+7 −0 source/client/ui/story/editor_css/overrides.css
+3 −2 source/client/ui/story/styles.scss
+1 −0 source/client/ui/styles.scss

0 comments on commit 9fd9ca8

Please sign in to comment.