From b0bd57f895eb2dab8e2d46c5970ddce41efee1d1 Mon Sep 17 00:00:00 2001
From: fkiefer <none@none>
Date: Thu, 9 Mar 2017 11:41:40 +0100
Subject: [PATCH] OO-2601 wording, contexthelp

---
 .../assessment/ui/tool/_i18n/LocalStrings_de.properties   | 8 ++++----
 .../olat/course/highscore/ui/HighScoreEditController.java | 2 +-
 .../org/olat/ims/qti/_i18n/LocalStrings_en.properties     | 2 +-
 .../olat/ims/qti21/ui/QTI21DeliveryOptionsController.java | 3 ++-
 .../ims/qti21/ui/editor/_i18n/LocalStrings_de.properties  | 1 +
 .../ims/qti21/ui/editor/_i18n/LocalStrings_en.properties  | 1 +
 .../interactions/FIBTextEntrySettingsController.java      | 2 ++
 .../modules/qpool/ui/_i18n/LocalStrings_en.properties     | 2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties
index e350eeaefff..5ef0a7c9548 100644
--- a/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/assessment/ui/tool/_i18n/LocalStrings_de.properties
@@ -17,7 +17,7 @@ bulk.visible='Sichtbar' setzen
 certificate=Zertifikate
 certificates.wizard.title=$org.olat.course.certificate.ui\:certificates.wizard.title
 change.visibility=Sichtbarkeit \u00E4ndern
-change.visibility.title=Sichtbarkeit von Ergebnise \u00E4ndern
+change.visibility.title=Sichtbarkeit vom Ergebnis \u00E4ndern
 command.next=Weiter zu n\u00E4chste Benutzer
 command.previous=Zur\u00FCck zum letzten Benutzer
 confirm.certificate.deleted=$org.olat.course.certificate.ui\:confirm.certificate.deleted
@@ -61,13 +61,13 @@ table.header.scoreAverage=$org.olat.modules.assessment.ui\:table.header.scoreAve
 table.header.userVisibility=<i class='o_icon o_icon-fw o_icon_results_hidden'> </i>
 tooltip.of={0} von {1}
 title.infocoach=Bewertungsinformationen
-user.visibility=Ergebnise
+user.visibility=Ergebnis
 user.visibility.visible=sofort sichtbar f\u00FCr den Benutzer
 user.visibility.hidden=noch nicht sichtbar f\u00FCr den Benutzer
 user.visibility.visible.tooltip=Sichtbar f\u00FCr den Benutzer
 user.visibility.hidden.tooltip=Noch nicht sichtbar f\u00FCr den Benutzer
-user.visibility.hidden.select=Nicht sichtbar (Resultaten sind nicht sichtbar f\u00FCr den Benutzer) <ul><li>Resultaten sind noch nicht zum Benutzer gezeigt <i class='o_icon o_icon-fw o_icon_results_hidden'> </i></li><li>Resultaten erscheinen noch nicht in Leistungnachweise</li><li>andere Kursbausteine, die abh\u00E4ngig von diesem Kursbaustein, sind noch nicht sichtbar/zug\u00E4nglich</li></ul>
-user.visibility.visible.select=Sichtbar (Resultaten sind sichtbar f\u00FCr den Benutzer) <ul><li>Resultaten werden den Benutzer gezeigt</li><li>Resultaten erscheinen in Leistungnachweise</li><li>andere Kursbausteine, die abh\u00E4ngig von diesem Kursbaustein, sind sichtbar/zug\u00E4nglich</li></ul>
+user.visibility.hidden.select=Nicht sichtbar (Resultate sind nicht sichtbar f\u00FCr den Benutzer) <ul><li>Resultate werden dem Benutzer noch nicht gezeigt <i class='o_icon o_icon-fw o_icon_results_hidden'> </i></li><li>Resultate erscheinen noch nicht in Leistungnachweise</li><li>andere Kursbausteine, die abh\u00E4ngig von diesem Kursbaustein, sind noch nicht sichtbar/zug\u00E4nglich</li></ul>
+user.visibility.visible.select=Sichtbar (Resultate sind sichtbar f\u00FCr den Benutzer) <ul><li>Resultaten werden dem Benutzer gezeigt</li><li>Resultate erscheinen in Leistungnachweise</li><li>andere Kursbausteine, die abh\u00E4ngig von diesem Kursbaustein, sind sichtbar/zug\u00E4nglich</li></ul>
 users=Benutzer
 waiting.review=$org.olat.modules.assessment.ui\:waiting.review
 warning.bulk.done=Sie m\u00FCssen mindestens einen Eintrag w\u00E4hlen, der noch nicht geschlossen ist.
diff --git a/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java b/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java
index 002983f1741..5c5c12e18fa 100644
--- a/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java
+++ b/src/main/java/org/olat/course/highscore/ui/HighScoreEditController.java
@@ -95,7 +95,7 @@ public class HighScoreEditController extends FormBasicController {
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("controller.title");
 		setFormDescription("highscore.description");
-		setFormContextHelp("ok");
+		setFormContextHelp("Assessment#highscore");
 		
 		allowHighScore = uifactory.addCheckboxesHorizontal("highscore.show", formLayout, new String[] { "xx" },
 				new String[] { null });
diff --git a/src/main/java/org/olat/ims/qti/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/ims/qti/_i18n/LocalStrings_en.properties
index b4f609644ca..143d8cd6bfc 100644
--- a/src/main/java/org/olat/ims/qti/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/ims/qti/_i18n/LocalStrings_en.properties
@@ -29,7 +29,7 @@ column.header.assesspoints=Score
 column.header.date=Date
 column.header.details=Details
 column.header.duration=Duration
-convert.qti21.hint=You willl find informations about conversion from QTI 1.2 to QTI 2.1 in Manual
+convert.qti21.hint=You will find information about the conversion from QTI 1.2 to QTI 2.1 in the manual
 date=Date
 days=Days
 dur=Duration
diff --git a/src/main/java/org/olat/ims/qti21/ui/QTI21DeliveryOptionsController.java b/src/main/java/org/olat/ims/qti21/ui/QTI21DeliveryOptionsController.java
index d7c1b5a6e1f..e1c76818e08 100644
--- a/src/main/java/org/olat/ims/qti21/ui/QTI21DeliveryOptionsController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/QTI21DeliveryOptionsController.java
@@ -94,7 +94,7 @@ public class QTI21DeliveryOptionsController extends FormBasicController implemen
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormTitle("tab.options");
-		setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_test_konf_kurs");
+		setFormContextHelp("Test editor QTI 2.1 in detail#details_testeditor_options");
 		formLayout.setElementCssClass("o_sel_qti_resource_options");
 		
 		String[] settingTypeValues = new String[]{ translate("qti.form.setting.summative"), translate("qti.form.setting.formative") };
@@ -159,6 +159,7 @@ public class QTI21DeliveryOptionsController extends FormBasicController implemen
 				resultsOptionsKeys, resultsOptionsValues, 1);
 		assessmentResultsOnFinishEl.setElementCssClass("o_sel_qti_show_results_options");
 		assessmentResultsOnFinishEl.setHelpText(translate("qti.form.summary.help"));
+		assessmentResultsOnFinishEl.setHelpUrlForManualPage("Test editor QTI 2.1 in detail#overview_results");
 		
 		FormLayoutContainer buttonsLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		buttonsLayout.setRootForm(mainForm);
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
index b81b55d74f5..b5f51d373fb 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_de.properties
@@ -26,6 +26,7 @@ essay.min.strings=Min Anzahl W\u00F6rter
 essay.rows=H\u00F6he (Anzahl Zeilen)
 export.qpool.successful=$org.olat.ims.qti.editor\:export.qpool.successful
 fib.alternative=Varianten
+fib.alternative.help=Verschiedene Varianten werden mit Komma getrennt.
 fib.caseSensitive=Gross/Klein
 fib.expectedLength=L\u00FCckenl\u00E4nge
 fib.placeholder=Platzhalter
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
index 6e1fb236ecd..8fd4a92c65b 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/_i18n/LocalStrings_en.properties
@@ -26,6 +26,7 @@ essay.min.strings=Min. words
 essay.rows=Height (number of lines)
 export.qpool.successful=$org.olat.ims.qti.editor\:export.qpool.successful
 fib.alternative=Alternative
+fib.alternative.help=Different alternatives are separated by comma.
 fib.caseSensitive=Case sensitive
 fib.expectedLength=Gap size
 fib.placeholder=Placeholder
diff --git a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBTextEntrySettingsController.java b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBTextEntrySettingsController.java
index 784593f7419..6297b3a5726 100644
--- a/src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBTextEntrySettingsController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/editor/interactions/FIBTextEntrySettingsController.java
@@ -66,6 +66,8 @@ public class FIBTextEntrySettingsController extends FormBasicController {
 		placeholderEl = uifactory.addTextElement("fib.placeholder", "fib.placeholder", 256, placeholder, formLayout);
 		String alternatives = interaction.alternativesToString();
 		alternativeEl = uifactory.addTextElement("fib.alternative", "fib.alternative", 256, alternatives, formLayout);
+		alternativeEl.setHelpText(translate("fib.alternative.help"));
+		alternativeEl.setHelpUrlForManualPage("Test editor QTI 2.1 in detail#details_testeditor_fragetypen_fib");
 		
 		Integer expectedLength = interaction.getExpectedLength();
 		String expectedLengthStr = expectedLength == null ? null : expectedLength.toString();
diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties
index 7ea1d31804e..c7469e96dfb 100644
--- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties
@@ -20,7 +20,7 @@ convert.item.msg=Do you want to convert the {0} question(s) in the following for
 convert.item.successful={0} question(s) successfully converted.
 convert.item.warning={0} was not converted.
 convert.format=Format
-convert.qti21.hint=You willl find informations about conversion from QTI 1.2 to QTI 2.1 in Manual
+convert.qti21.hint=You will find information about the conversion from QTI 1.2 to QTI 2.1 in the manual
 copy=Copy
 copy.confirmation=Do you really want to copy this question?
 create.collection.description=Give your list a name.
-- 
GitLab