Index: openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml,v
diff -u -r1.2.2.7 -r1.2.2.8
--- openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml 3 Feb 2020 22:35:50 -0000 1.2.2.7
+++ openacs-4/packages/xowf/catalog/xowf.de_DE.ISO-8859-1.xml 5 Feb 2020 20:48:42 -0000 1.2.2.8
@@ -78,11 +78,16 @@
Pro Benutzer
Immer
- Kurztextfrage
+ Kurztextfrage
Single-Choice-Frage
Multiple-Choice-Frage
Textfrage
Teilfrage
Zeige maximal
+ Textfrage
+ Kurztextfrage
+ MC-Frage
+ SC-Frage
+
Index: openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml,v
diff -u -r1.2.2.7 -r1.2.2.8
--- openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml 3 Feb 2020 22:35:50 -0000 1.2.2.7
+++ openacs-4/packages/xowf/catalog/xowf.en_US.ISO-8859-1.xml 5 Feb 2020 20:48:42 -0000 1.2.2.8
@@ -99,5 +99,11 @@
None
Per user
- Always
+ Always
+
+ Text Interaction
+ Short Text Interaction
+ MC Interaction
+ SC Interaction
+
Index: openacs-4/packages/xowf/lib/inclass-quiz.wf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/lib/inclass-quiz.wf,v
diff -u -r1.1.2.9 -r1.1.2.10
--- openacs-4/packages/xowf/lib/inclass-quiz.wf 30 Jan 2020 18:05:50 -0000 1.1.2.9
+++ openacs-4/packages/xowf/lib/inclass-quiz.wf 5 Feb 2020 20:48:42 -0000 1.1.2.10
@@ -19,10 +19,10 @@
#
# {clear_menu -menu New}
#
-# {entry -name New.Item.TextInteraction -label "Text Interaction" -form en:TestItemText.form}
-# {entry -name New.Item.ShortTextInteraction -label "Short Text Interaction" -form en:TestItemShortText.form}
-# {entry -name New.Item.MCInteraction -label "MC Interaction" -form en:TestItemMC.form}
-# {entry -name New.Item.SCInteraction -label "SC Interaction" -form en:TestItemSC.form}
+# {entry -name New.Item.TextInteraction -form en:TestItemText.form}
+# {entry -name New.Item.ShortTextInteraction -form en:TestItemShortText.form}
+# {entry -name New.Item.MCInteraction -form en:TestItemMC.form}
+# {entry -name New.Item.SCInteraction -form en:TestItemSC.form}
# {entry -name New.App.Quiz -label "Inclass Quiz" -form en:inclass-quiz.wf}
#
# The policy has to allow the following methods on FormPages:
Index: openacs-4/packages/xowf/lib/online-exam.wf
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/lib/online-exam.wf,v
diff -u -r1.6.2.17 -r1.6.2.18
--- openacs-4/packages/xowf/lib/online-exam.wf 3 Feb 2020 22:59:50 -0000 1.6.2.17
+++ openacs-4/packages/xowf/lib/online-exam.wf 5 Feb 2020 20:48:42 -0000 1.6.2.18
@@ -24,10 +24,10 @@
#
# {clear_menu -menu New}
#
-# {entry -name New.Item.TextInteraction -label "Text Interaction" -form en:TestItemText.form}
-# {entry -name New.Item.ShortTextInteraction -label "Short Text Interaction" -form en:TestItemShortText.form}
-# {entry -name New.Item.MCInteraction -label "MC Interaction" -form en:TestItemMC.form}
-# {entry -name New.Item.SCInteraction -label "SC Interaction" -form en:TestItemSC.form}
+# {entry -name New.Item.TextInteraction -form en:TestItemText.form}
+# {entry -name New.Item.ShortTextInteraction -form en:TestItemShortText.form}
+# {entry -name New.Item.MCInteraction -form en:TestItemMC.form}
+# {entry -name New.Item.SCInteraction -form en:TestItemSC.form}
# {entry -name New.App.Exam -label "Online Exam" -form en:online-exam.wf}
#
# The policy has to allow the following methods on FormPages:
Index: openacs-4/packages/xowiki/tcl/menu-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/menu-procs.tcl,v
diff -u -r1.19.2.3 -r1.19.2.4
--- openacs-4/packages/xowiki/tcl/menu-procs.tcl 29 Sep 2019 17:32:29 -0000 1.19.2.3
+++ openacs-4/packages/xowiki/tcl/menu-procs.tcl 5 Feb 2020 20:48:42 -0000 1.19.2.4
@@ -315,6 +315,15 @@
set item [list url $link]
if {[dict exists $properties -label]} {
lappend item label [dict get $properties -label]
+ } else {
+ set name [dict get $properties -name]
+ set locale [::xo::cc locale]
+ ns_log notice "[list lang::message::message_exists_p $locale xowiki.$name] [lang::message::message_exists_p $locale xowiki.$name]"
+ if {[lang::message::message_exists_p $locale xowiki.$name]} {
+ lappend item label [lang::message::lookup $locale xowiki.$name]
+ } elseif {[lang::message::message_exists_p $locale xowf.$name]} {
+ lappend item label [lang::message::lookup $locale xowf.$name]
+ }
}
:add_menu_item -name [dict get $properties -name] -item $item
}