Merge branch 'develop' into feature/ExtJS-5.1.1

Edirom · Dec 12, 2024 · 519e938 · 519e938
2 parents 4a413c7 + 01aa130
commit 519e938
Show file tree

Hide file tree

Showing 6 changed files with 802 additions and 1,938 deletions.
diff --git a/add/data/locale/edirom-lang-de.xml b/add/data/locale/edirom-lang-de.xml
@@ -68,8 +68,8 @@
         <entry key="view.desktop.TaskBar_Desktop" value="Desktop {0}"/>
         <entry key="view.desktop.TaskBar_searchWin" value="Öffne Suchfenster"/>
         <entry key="view.desktop.TaskBar_Sort_grid" value="Im Raster anordnen"/>
-        <entry key="view.desktop.TaskBar_Sort_vertical" value="Übereinander anordnen"/>
-        <entry key="view.desktop.TaskBar_Sort_horizontal" value="Nebeneinander anordnen"/>
+        <entry key="view.desktop.TaskBar_Sort_vertical" value="Nebeneinander anordnen"/>
+        <entry key="view.desktop.TaskBar_Sort_horizontal" value="Übereinander anordnen"/>
         <entry key="view.desktop.TopBar_homeBtnLabel" value="Edirom Online"/>
         <entry key="view.window.AnnotationView_Title" value="Anmerkungen"/>
         <entry key="view.window.AnnotationView_No" value="Nr."/>
@@ -138,14 +138,14 @@
 
         <!-- naming gui elements -->
         <entry key="view.desktop.Desktop" value="Desktop"/>
-        <entry key="view.desktop.TopBar" value="Symbolleiste"/>
+        <entry key="view.desktop.TopBar" value="Toolbar"/>
         <entry key="view.desktop.TopBar_searchField" value="Suchfeld"/>
         <entry key="view.desktop.TopBar_homeBtn" value="{key=view.desktop.TaskBar_home} Button"/>
-        <entry key="view.desktop.TaskBar" value="Task-Leiste"/>
+        <entry key="view.desktop.TaskBar" value="Taskbar"/>
         <entry key="view.desktop.TaskBar_btnDesktop" value="Button der Task-Leiste"/>
-        <entry key="view.window.TopBar" value="Symbolleiste im Fenster"/>
-        <entry key="view.window.BottomBar" value="Task-Leiste im Fenster"/>
-        <entry key="view.navigator.Navigator" value="Navigator"/>
+        <entry key="view.window.TopBar" value="Fenster-Toolbar"/>
+        <entry key="view.window.BottomBar" value="Fenster-Taskleiste"/>
+        <entry key="view.navigator.Navigator" value="Inhaltsübersicht"/>
         <entry key="global_appName" value="Edirom Online"/>
         <entry key="clickAndHoldDragging" value="dragging"/>
         <entry key="drag-and-drop" value="Drag-and-Drop"/>

diff --git a/add/data/locale/edirom-lang-en.xml b/add/data/locale/edirom-lang-en.xml
@@ -145,7 +145,7 @@
         <entry key="view.desktop.TaskBar_btnDesktop" value="Taskbar"/>
         <entry key="view.window.TopBar" value="Window toolbar"/>
         <entry key="view.window.BottomBar" value="Window taskbar"/>
-        <entry key="view.navigator.Navigator" value="Navigator"/>
+        <entry key="view.navigator.Navigator" value="Content overview"/>
         <entry key="global_appName" value="Edirom Online"/>
         <entry key="clickAndHoldDragging" value="dragging"/>
         <entry key="drag-and-drop" value="drag-and-drop"/>

diff --git a/add/data/xql/getHelp.xql b/add/data/xql/getHelp.xql
@@ -21,11 +21,15 @@ declare option output:omit-xml-declaration "yes";
 
 let $lang := request:get-parameter('lang', 'en')
 let $idPrefix := request:get-parameter('idPrefix', '')
-let $contextPath := request:get-context-path()
 
 let $base := replace(system:get-module-load-path(), 'embedded-eXist-server', '') (:TODO:)
 
 let $doc := doc(concat('../../help/help_', $lang, '.xml'))
+let $contextPath := if(starts-with(document-uri($doc), '/db'))
+                    then substring-after(document-uri($doc), '/db')
+                    else document-uri($doc)
+let $contextPath := substring-before($contextPath, concat('help/help_', $lang, '.xml'))
+let $contextPath := request:get-context-path() || $contextPath
 
 let $xsl := doc('../xslt/edirom_langReplacement.xsl')
 let $doc := 
@@ -43,7 +47,6 @@ let $doc :=
             <param name="base" value="{concat($base, '/../xslt/')}"/>
             <param name="lang" value="{$lang}"/>
             <param name="tocDepth" value="1"/>
-            <param name="graphicsPrefix" value="help/"/>
             <param name="contextPath" value="{$contextPath}"/>
             (: == passing empty value for docUri (XSLT expects xs:anyURI, but ExtJS view does not provide value) -> github#480 == :)
             <param name="docUri" value="''"/>