[rkward-cvs] [rkward] /: Finish adding i18n() calls to IRT plugins, and extract messages for IRT plugins.

[Thomas F. <tho...@ru...>]

Git commit b1b76b243a42e4cde9667e44446a746efe75e883 by Thomas Friedrichsmeier.
Committed on 10/01/2015 at 21:02.
Pushed by tfry into branch 'master'.

Finish adding i18n() calls to IRT plugins, and extract messages for IRT plugins.

M  +2    -0    Messages.sh
M  +1    -1    rkward/plugins/analysis/irt/polytomous/par_est_gpcm.rkh
M  +1    -1    rkward/plugins/irt.pluginmap
M  +7    -7    rkward/plugins/plots/irt/dichotomous/plot_ltm.js
M  +7    -7    rkward/plugins/plots/irt/dichotomous/plot_rasch.js
M  +7    -7    rkward/plugins/plots/irt/dichotomous/plot_tpm.js
M  +7    -7    rkward/plugins/plots/irt/polytomous/plot_grm.js
M  +1    -1    rkward/plugins/plots/irt/polytomous/plot_pcm.js
M  +1    -1    rkward/plugins/plots/irt/polytomous/plot_rsm.js
M  +1    -1    rkward/plugins/plots/irt/tests/eRm_plotLR.js
M  +1    -1    tests/item_response_theory/Andersen_LR_plot.rkcommands.R
M  +1    -1    tests/item_response_theory/plot_2PL.rkcommands.R
M  +1    -1    tests/item_response_theory/plot_3PL.rkcommands.R
M  +1    -1    tests/item_response_theory/plot_GRM.rkcommands.R
M  +1    -1    tests/item_response_theory/plot_PCM.rkcommands.R
M  +1    -1    tests/item_response_theory/plot_RSM.rkcommands.R
M  +1    -1    tests/item_response_theory/plot_Rasch.rkcommands.R

http://commits.kde.org/rkward/b1b76b243a42e4cde9667e44446a746efe75e883

diff --git a/Messages.sh b/Messages.sh
index 5483cdf..0781fce 100755
--- a/Messages.sh
+++ b/Messages.sh
@@ -18,4 +18,6 @@ python scripts/update_plugin_messages.py --extract-only --outdir=$podir rkward/p
 python scripts/update_plugin_messages.py --extract-only --outdir=$podir rkward/plugins/data.pluginmap
 # extract messages from data plugins: >> rkward__plots.pot
 python scripts/update_plugin_messages.py --extract-only --outdir=$podir rkward/plugins/plots.pluginmap
+# extract messages from data plugins: >> rkward__item_response_theory.pot
+python scripts/update_plugin_messages.py --extract-only --outdir=$podir rkward/plugins/irt.pluginmap
 # messages of embedded plugins are extracted implicitly, as part of the above extraction calls: >> rkward__embedded.pot
diff --git a/rkward/plugins/analysis/irt/polytomous/par_est_gpcm.rkh b/rkward/plugins/analysis/irt/polytomous/par_est_gpcm.rkh
index 3e9a9ac..d6d25fe 100644
--- a/rkward/plugins/analysis/irt/polytomous/par_est_gpcm.rkh
+++ b/rkward/plugins/analysis/irt/polytomous/par_est_gpcm.rkh
@@ -20,7 +20,7 @@
       </setting>
 
       <caption id="tab_options"/>
-      <setting id="frame_constraints">
+      <setting id="constraint">
 	Choose if discrimination parameters should be computed for each item individually. Alternatively, you can estimate one discrimination parameter that is equal for all items, or fix it at 1 for all items.
       </setting>
       <setting id="startval">
diff --git a/rkward/plugins/irt.pluginmap b/rkward/plugins/irt.pluginmap
index 3a7e575..8504649 100644
--- a/rkward/plugins/irt.pluginmap
+++ b/rkward/plugins/irt.pluginmap
@@ -1,6 +1,6 @@
 <!DOCTYPE rkpluginmap>
 
-<document base_prefix="" namespace="rkward" id="irt">
+<document base_prefix="" namespace="rkward" id="irt" po_id="item_response_theory">
 	<include file="pluginmap_meta.inc"/>
 	<about
 		name="Item Response Theory"
diff --git a/rkward/plugins/plots/irt/dichotomous/plot_ltm.js b/rkward/plugins/plots/irt/dichotomous/plot_ltm.js
index 697424e..2644a67 100644
--- a/rkward/plugins/plots/irt/dichotomous/plot_ltm.js
+++ b/rkward/plugins/plots/irt/dichotomous/plot_ltm.js
@@ -74,7 +74,7 @@ function doPrintout (full) {
 		options[options.length] = "annot=FALSE" ;
 
 	if (full) {
-		echo ('rk.header("Two parameter logistic model plot")\n');
+		new Header (i18n ("Two parameter logistic model plot")).print ();
 		echo ('\n');
 		echo ('rk.graph.on()\n');
 	}
@@ -85,19 +85,19 @@ function doPrintout (full) {
 	// first we'll check wheter standard error curves should be plotted,
 	// because it takes two steps to draw them:
 	if (plot_type == "SEC") {
-	echo ('# two steps are needed to plot standard error curves\n');
-		echo ('	# first some values are generated...\n');
+		comment ('two steps are needed to plot standard error curves', '\t');
+		comment ('first some values are generated...', '\t');
 		echo ('	res <- plot(' + getValue("x"));
 		if (options.length > 0) echo(", "+options.join(", "));
 		echo (')\n');
 		echo ('\n');
-		echo ('	# ... and then they\'re used to plot the curves:\n');
+		comment ('... and then they\'re used to plot the curves:', '\t');
 		echo ('	plot(res[,"z"], 1/sqrt(res[,"info"]), lwd=2');
 		// we give some defaults, but they can be changed via the embedded plot options:
 		if (!plot_ops_type) echo(", type=\"l\"");
-		if (!plot_ops_xlab) echo(", xlab=\"Ability\"");
-		if (!plot_ops_ylab) echo(", ylab=\"Standard Error\"");
-		if (!plot_ops_main) echo(", main=\"Stadard Error of Measurement\"");
+		if (!plot_ops_xlab) echo(", xlab=" + i18nc ("Item response theory", "Ability"));
+		if (!plot_ops_ylab) echo(", ylab=" + i18n ("Standard Error"));
+		if (!plot_ops_main) echo(", main="+ i18n ("Standard Error of Measurement"));
 		if (plot_options) echo(plot_options);
 		echo (')\n');
 	}
diff --git a/rkward/plugins/plots/irt/dichotomous/plot_rasch.js b/rkward/plugins/plots/irt/dichotomous/plot_rasch.js
index 9b5cd38..eda4ef7 100644
--- a/rkward/plugins/plots/irt/dichotomous/plot_rasch.js
+++ b/rkward/plugins/plots/irt/dichotomous/plot_rasch.js
@@ -71,7 +71,7 @@ function doPrintout (full) {
 		options[options.length] = "annot=FALSE" ;
 
 	if (full) {
-		echo ('rk.header("Rasch model plot")\n');
+		new Header (i18n ("Rasch model plot")).print ();
 		echo ('\n');
 		echo ('rk.graph.on()\n');
 	}
@@ -82,19 +82,19 @@ function doPrintout (full) {
 	// first we'll check wheter standard error curves should be plotted,
 	// because it takes two steps to draw them:
 	if (plot_type == "SEC") {
-		echo ('	# two steps are needed to plot standard error curves\n');
-		echo ('	# first some values are generated...\n');
+		comment ('two steps are needed to plot standard error curves', '\t');
+		comment ('first some values are generated...', '\t');
 		echo ('	res <- plot(' + getValue("x"));
 		if (options.length > 0) echo(", "+options.join(", "));
 		echo (')\n');
 		echo ('\n');
-		echo ('	# ... and then they\'re used to plot the curves:\n');
+		comment ('... and then they\'re used to plot the curves:', '\t');
 		echo ('	plot(res[,"z"], 1/sqrt(res[,"info"]), lwd=2');
 		// we give come defaults, but they can be changed via the embedded plot options:
 		if (!plot_ops_type) echo(", type=\"l\"");
-		if (!plot_ops_xlab) echo(", xlab=\"Ability\"");
-		if (!plot_ops_ylab) echo(", ylab=\"Standard Error\"");
-		if (!plot_ops_main) echo(", main=\"Stadard Error of Measurement\"");
+		if (!plot_ops_xlab) echo(", xlab=" + i18nc ("Item response theory", "Ability"));
+		if (!plot_ops_ylab) echo(", ylab=" + i18n ("Standard Error"));
+		if (!plot_ops_main) echo(", main=" + i18n ("Standard Error of Measurement"));
 		if (plot_options) echo(plot_options);
 		echo (')\n');
 	}
diff --git a/rkward/plugins/plots/irt/dichotomous/plot_tpm.js b/rkward/plugins/plots/irt/dichotomous/plot_tpm.js
index 1cb3bd3..d243b46 100644
--- a/rkward/plugins/plots/irt/dichotomous/plot_tpm.js
+++ b/rkward/plugins/plots/irt/dichotomous/plot_tpm.js
@@ -71,7 +71,7 @@ function doPrintout (full) {
 		options[options.length] = "annot=FALSE" ;
 
 	if (full) {
-		echo ('rk.header("Birnbaum three parameter model plot")\n');
+		new Header (i18n ("Birnbaum three parameter model plot")).print ();
 		echo ('\n');
 		echo ('rk.graph.on()\n');
 	}
@@ -82,19 +82,19 @@ function doPrintout (full) {
 	// first we'll check wheter standard error curves should be plotted,
 	// because it takes two steps to draw them:
 	if (plot_type == "SEC") {
-		echo ('	# two steps are needed to plot standard error curves\n');
-		echo ('	# first some values are generated...\n');
+		comment ('two steps are needed to plot standard error curves', '\t');
+		comment ('first some values are generated...', '\t');
 		echo ('	res <- plot(' + getValue("x"));
 		if (options.length > 0) echo(", "+options.join(", "));
 		echo (')\n');
 		echo ('\n');
-		echo ('	# ... and then they\'re used to plot the curves:\n');
+		comment ('... and then they\'re used to plot the curves:', '\t');
 		echo ('	plot(res[,"z"], 1/sqrt(res[,"info"]), lwd=2');
 		// we give some defaults, but they can be changed via the embedded plot options:
 		if (!plot_ops_type) echo(", type=\"l\"");
-		if (!plot_ops_xlab) echo(", xlab=\"Ability\"");
-		if (!plot_ops_ylab) echo(", ylab=\"Standard Error\"");
-		if (!plot_ops_main) echo(", main=\"Stadard Error of Measurement\"");
+		if (!plot_ops_xlab) echo(", xlab=" + i18nc ("Item response theory", "Ability"));;
+		if (!plot_ops_ylab) echo(", ylab=" + i18n ("Standard Error"));
+		if (!plot_ops_main) echo(", main=" + i18n ("Standard Error of Measurement"));
 		if (plot_options) echo(plot_options);
 		echo (')\n');
 	}
diff --git a/rkward/plugins/plots/irt/polytomous/plot_grm.js b/rkward/plugins/plots/irt/polytomous/plot_grm.js
index 9b9849f..10facff 100644
--- a/rkward/plugins/plots/irt/polytomous/plot_grm.js
+++ b/rkward/plugins/plots/irt/polytomous/plot_grm.js
@@ -79,7 +79,7 @@ function doPrintout (full) {
 		options[options.length] = "annot=FALSE" ;
 
 	if (full) {
-		echo ('rk.header("Graded response model plot")\n');
+		new Header (i18n ("Graded response model plot")).print ();
 		echo ('\n');
 		echo ('rk.graph.on()\n');
 	}
@@ -90,19 +90,19 @@ function doPrintout (full) {
 	// first we'll check wheter standard error curves should be plotted,
 	// because it takes two steps to draw them:
 	if (plot_type == "SEC") {
-		echo ('	# two steps are needed to plot standard error curves\n');
-		echo ('	# first some values are generated...\n');
+		comment ('two steps are needed to plot standard error curves', '\t');
+		comment ('first some values are generated...', '\t');
 		echo ('	res <- plot(' + getValue("x"));
 		if (options.length > 0) echo(", "+options.join(", "));
 		echo (')\n');
 		echo ('\n');
-		echo ('	# ... and then they\'re used to plot the curves:\n');
+		comment ('... and then they\'re used to plot the curves:', '\t');
 		echo ('	plot(res[,"z"], 1/sqrt(res[,"test.info"]), lwd=2');
 		// we give come defaults, but they can be changed via the embedded plot options:
 		if (!plot_ops_type) echo(", type=\"l\"");
-		if (!plot_ops_xlab) echo(", xlab=\"Ability\"");
-		if (!plot_ops_ylab) echo(", ylab=\"Standard Error\"");
-		if (!plot_ops_main) echo(", main=\"Stadard Error of Measurement\"");
+		if (!plot_ops_xlab) echo(", xlab=" + i18nc ("Item response theory", "Ability"));;
+		if (!plot_ops_ylab) echo(", ylab=" + i18n ("Standard Error"));
+		if (!plot_ops_main) echo(", main=" + i18n ("Standard Error of Measurement"));
 		if (plot_options) echo(plot_options);
 		echo (')\n');
 	}
diff --git a/rkward/plugins/plots/irt/polytomous/plot_pcm.js b/rkward/plugins/plots/irt/polytomous/plot_pcm.js
index 544053b..220c602 100644
--- a/rkward/plugins/plots/irt/polytomous/plot_pcm.js
+++ b/rkward/plugins/plots/irt/polytomous/plot_pcm.js
@@ -65,7 +65,7 @@ function doPrintout (full) {
 		options[options.length] = "legpos=FALSE" ;
 
 	if (full) {
-		echo ('rk.header("Partial credit model plot")\n');
+		new Header (i18n ("Partial credit model plot")).print ();
 		echo ('\n');
 		echo ('rk.graph.on()\n');
 	}
diff --git a/rkward/plugins/plots/irt/polytomous/plot_rsm.js b/rkward/plugins/plots/irt/polytomous/plot_rsm.js
index 1898c5b..71d6409 100644
--- a/rkward/plugins/plots/irt/polytomous/plot_rsm.js
+++ b/rkward/plugins/plots/irt/polytomous/plot_rsm.js
@@ -65,7 +65,7 @@ function doPrintout (full) {
 		options[options.length] = "legpos=FALSE" ;
 
 	if (full) {
-		echo ('rk.header("Rating scale model plot")\n');
+		new Header (i18n ("Rating scale model plot")).print ();
 		echo ('\n');
 		echo ('rk.graph.on()\n');
 	}
diff --git a/rkward/plugins/plots/irt/tests/eRm_plotLR.js b/rkward/plugins/plots/irt/tests/eRm_plotLR.js
index d1c19a7..10ac92f 100644
--- a/rkward/plugins/plots/irt/tests/eRm_plotLR.js
+++ b/rkward/plugins/plots/irt/tests/eRm_plotLR.js
@@ -82,7 +82,7 @@ function doPrintout (full) {
 		options_plotgof[options_plotgof.length] = "tlab=\""+annotation+"\"" ;
 
 	if (full) {
-		echo ('rk.header("Andersen\'s LR test")\n');
+		new Header (i18n ("Andersen's LR test")).print ();
 		echo ('\n');
 		echo ('rk.graph.on()\n');
 	}
diff --git a/tests/item_response_theory/Andersen_LR_plot.rkcommands.R b/tests/item_response_theory/Andersen_LR_plot.rkcommands.R
index 027448d..a7eb179 100644
--- a/tests/item_response_theory/Andersen_LR_plot.rkcommands.R
+++ b/tests/item_response_theory/Andersen_LR_plot.rkcommands.R
@@ -2,7 +2,7 @@ local({
 ## Prepare
 require(eRm)
 ## Print result
-rk.header("Andersen's LR test")
+rk.header ("Andersen's LR test")
 
 rk.graph.on()
 try({
diff --git a/tests/item_response_theory/plot_2PL.rkcommands.R b/tests/item_response_theory/plot_2PL.rkcommands.R
index bbd89a9..47ba1ea 100644
--- a/tests/item_response_theory/plot_2PL.rkcommands.R
+++ b/tests/item_response_theory/plot_2PL.rkcommands.R
@@ -2,7 +2,7 @@ local({
 ## Prepare
 require(ltm)
 ## Print result
-rk.header("Two parameter logistic model plot")
+rk.header ("Two parameter logistic model plot")
 
 rk.graph.on()
 try({
diff --git a/tests/item_response_theory/plot_3PL.rkcommands.R b/tests/item_response_theory/plot_3PL.rkcommands.R
index c140644..e6fc25a 100644
--- a/tests/item_response_theory/plot_3PL.rkcommands.R
+++ b/tests/item_response_theory/plot_3PL.rkcommands.R
@@ -2,7 +2,7 @@ local({
 ## Prepare
 require(ltm)
 ## Print result
-rk.header("Birnbaum three parameter model plot")
+rk.header ("Birnbaum three parameter model plot")
 
 rk.graph.on()
 try({
diff --git a/tests/item_response_theory/plot_GRM.rkcommands.R b/tests/item_response_theory/plot_GRM.rkcommands.R
index f712c95..902c4d4 100644
--- a/tests/item_response_theory/plot_GRM.rkcommands.R
+++ b/tests/item_response_theory/plot_GRM.rkcommands.R
@@ -2,7 +2,7 @@ local({
 ## Prepare
 require(ltm)
 ## Print result
-rk.header("Graded response model plot")
+rk.header ("Graded response model plot")
 
 rk.graph.on()
 try({
diff --git a/tests/item_response_theory/plot_PCM.rkcommands.R b/tests/item_response_theory/plot_PCM.rkcommands.R
index 329504f..552991b 100644
--- a/tests/item_response_theory/plot_PCM.rkcommands.R
+++ b/tests/item_response_theory/plot_PCM.rkcommands.R
@@ -2,7 +2,7 @@ local({
 ## Prepare
 require(eRm)
 ## Print result
-rk.header("Partial credit model plot")
+rk.header ("Partial credit model plot")
 
 rk.graph.on()
 try({
diff --git a/tests/item_response_theory/plot_RSM.rkcommands.R b/tests/item_response_theory/plot_RSM.rkcommands.R
index a814986..d5374ef 100644
--- a/tests/item_response_theory/plot_RSM.rkcommands.R
+++ b/tests/item_response_theory/plot_RSM.rkcommands.R
@@ -2,7 +2,7 @@ local({
 ## Prepare
 require(eRm)
 ## Print result
-rk.header("Rating scale model plot")
+rk.header ("Rating scale model plot")
 
 rk.graph.on()
 try({
diff --git a/tests/item_response_theory/plot_Rasch.rkcommands.R b/tests/item_response_theory/plot_Rasch.rkcommands.R
index 10ba7ab..c601365 100644
--- a/tests/item_response_theory/plot_Rasch.rkcommands.R
+++ b/tests/item_response_theory/plot_Rasch.rkcommands.R
@@ -2,7 +2,7 @@ local({
 ## Prepare
 require(ltm)
 ## Print result
-rk.header("Rasch model plot")
+rk.header ("Rasch model plot")
 
 rk.graph.on()
 try({