From 0e3df6e79a4dfbc97df48fe89281b4b589f10535 Mon Sep 17 00:00:00 2001 From: Gabriel Jenik Date: Wed, 28 Jul 2021 07:10:00 -0300 Subject: [PATCH] Fixed issue #17410: String "Label for 'Other:' option" showing entities (#1975) Co-authored-by: encuestabizdevgit --- .../questions/answer/boilerplate/config.xml | 22 ++++++------ .../survey/questions/answer/date/config.xml | 2 +- .../questions/answer/hugefreetext/config.xml | 22 ++++++------ .../questions/answer/list_dropdown/config.xml | 30 ++++++++-------- .../questions/answer/listradio/config.xml | 34 +++++++++---------- .../questions/answer/longfreetext/config.xml | 22 ++++++------ .../answer/multiplechoice/config.xml | 8 ++--- .../multiplechoice_with_comments/config.xml | 12 +++---- .../answer/multiplenumeric/config.xml | 4 +-- .../questions/answer/shortfreetext/config.xml | 24 ++++++------- .../questions/answer/listradio/config.xml | 30 ++++++++-------- 11 files changed, 105 insertions(+), 105 deletions(-) diff --git a/application/views/survey/questions/answer/boilerplate/config.xml b/application/views/survey/questions/answer/boilerplate/config.xml index 9af39adbdbc..5b73f8977bc 100644 --- a/application/views/survey/questions/answer/boilerplate/config.xml +++ b/application/views/survey/questions/answer/boilerplate/config.xml @@ -241,8 +241,8 @@ Timer 102 integer - Display the 'time limit expiry message' for this many seconds before performing - the 'time limit action' (defaults to 1 second if left blank) + Display the 'time limit expiry message' for this many seconds before performing + the 'time limit action' (defaults to 1 second if left blank) Time limit expiry message display time @@ -269,7 +269,7 @@ Timer 106 textarea - CSS style for the 'time limit expiry message' + CSS style for the 'time limit expiry message' Time limit message CSS style @@ -281,7 +281,7 @@ Timer 108 integer - Display a 'time limit warning' when there are this many seconds remaining in the + Display a 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 1st time limit warning message timer @@ -295,7 +295,7 @@ Timer 110 integer - The 'time limit warning' will stay visible for this many seconds (will not turn + The 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 1st time limit warning message display time @@ -311,7 +311,7 @@ textarea 1 1 - The message to display as a 'time limit warning' (a default warning will display + The message to display as a 'time limit warning' (a default warning will display if this is left blank) 1st time limit warning message @@ -323,7 +323,7 @@ Timer 114 textarea - CSS style used when the 'time limit warning' message is displayed + CSS style used when the 'time limit warning' message is displayed 1st time limit warning CSS style @@ -335,7 +335,7 @@ Timer 116 integer - Display the 2nd 'time limit warning' when there are this many seconds remaining + Display the 2nd 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 2nd time limit warning message timer @@ -349,7 +349,7 @@ Timer 118 integer - The 2nd 'time limit warning' will stay visible for this many seconds (will not + The 2nd 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 2nd time limit warning message display time @@ -365,7 +365,7 @@ textarea 1 1 - The 2nd message to display as a 'time limit warning' (a default warning will + The 2nd message to display as a 'time limit warning' (a default warning will display if this is left blank) 2nd time limit warning message @@ -377,7 +377,7 @@ Timer 122 textarea - CSS style used when the 2nd 'time limit warning' message is displayed + CSS style used when the 2nd 'time limit warning' message is displayed 2nd time limit warning CSS style diff --git a/application/views/survey/questions/answer/date/config.xml b/application/views/survey/questions/answer/date/config.xml index 82f519bbada..8fff49eece4 100644 --- a/application/views/survey/questions/answer/date/config.xml +++ b/application/views/survey/questions/answer/date/config.xml @@ -377,7 +377,7 @@ text Specify a custom date/time format (the <i>d/dd m/mm yy/yyyy H/HH M/MM</i> formats and "-./: " characters are allowed for day/month/year/hour/minutes without or - with leading zero respectively. Defaults to survey's date format + with leading zero respectively. Defaults to survey's date format Date/Time format diff --git a/application/views/survey/questions/answer/hugefreetext/config.xml b/application/views/survey/questions/answer/hugefreetext/config.xml index 2edfdaf2a49..7b666468137 100644 --- a/application/views/survey/questions/answer/hugefreetext/config.xml +++ b/application/views/survey/questions/answer/hugefreetext/config.xml @@ -362,8 +362,8 @@ Timer 102 integer - Display the 'time limit expiry message' for this many seconds before performing - the 'time limit action' (defaults to 1 second if left blank) + Display the 'time limit expiry message' for this many seconds before performing + the 'time limit action' (defaults to 1 second if left blank) Time limit expiry message display time @@ -390,7 +390,7 @@ Timer 106 textarea - CSS style for the 'time limit expiry message' + CSS style for the 'time limit expiry message' Time limit message CSS style @@ -402,7 +402,7 @@ Timer 108 integer - Display a 'time limit warning' when there are this many seconds remaining in the + Display a 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 1st time limit warning message timer @@ -416,7 +416,7 @@ Timer 110 integer - The 'time limit warning' will stay visible for this many seconds (will not turn + The 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 1st time limit warning message display time @@ -432,7 +432,7 @@ textarea 1 1 - The message to display as a 'time limit warning' (a default warning will display + The message to display as a 'time limit warning' (a default warning will display if this is left blank) 1st time limit warning message @@ -444,7 +444,7 @@ Timer 114 textarea - CSS style used when the 'time limit warning' message is displayed + CSS style used when the 'time limit warning' message is displayed 1st time limit warning CSS style @@ -456,7 +456,7 @@ Timer 116 integer - Display the 2nd 'time limit warning' when there are this many seconds remaining + Display the 2nd 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 2nd time limit warning message timer @@ -470,7 +470,7 @@ Timer 118 integer - The 2nd 'time limit warning' will stay visible for this many seconds (will not + The 2nd 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 2nd time limit warning message display time @@ -486,7 +486,7 @@ textarea 1 1 - The 2nd message to display as a 'time limit warning' (a default warning will + The 2nd message to display as a 'time limit warning' (a default warning will display if this is left blank) 2nd time limit warning message @@ -498,7 +498,7 @@ Timer 122 textarea - CSS style used when the 2nd 'time limit warning' message is displayed + CSS style used when the 2nd 'time limit warning' message is displayed 2nd time limit warning CSS style diff --git a/application/views/survey/questions/answer/list_dropdown/config.xml b/application/views/survey/questions/answer/list_dropdown/config.xml index 0955dd8c7a0..9d5a0f9178f 100644 --- a/application/views/survey/questions/answer/list_dropdown/config.xml +++ b/application/views/survey/questions/answer/list_dropdown/config.xml @@ -137,8 +137,8 @@ text 1 1 - Replaces the label of the 'Other:' answer option with a custom text - Label for 'Other:' option + Replaces the label of the 'Other:' answer option with a custom text + Label for 'Other:' option @@ -282,10 +282,10 @@ 0 - Make the 'Other:' comment field mandatory when the 'Other:' + Make the 'Other:' comment field mandatory when the 'Other:' option is active - 'Other:' comment mandatory + 'Other:' comment mandatory @@ -467,8 +467,8 @@ Timer 102 integer - Display the 'time limit expiry message' for this many seconds before performing - the 'time limit action' (defaults to 1 second if left blank) + Display the 'time limit expiry message' for this many seconds before performing + the 'time limit action' (defaults to 1 second if left blank) Time limit expiry message display time @@ -495,7 +495,7 @@ Timer 106 textarea - CSS style for the 'time limit expiry message' + CSS style for the 'time limit expiry message' Time limit message CSS style @@ -507,7 +507,7 @@ Timer 108 integer - Display a 'time limit warning' when there are this many seconds remaining in the + Display a 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 1st time limit warning message timer @@ -521,7 +521,7 @@ Timer 110 integer - The 'time limit warning' will stay visible for this many seconds (will not turn + The 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 1st time limit warning message display time @@ -537,7 +537,7 @@ textarea 1 1 - The message to display as a 'time limit warning' (a default warning will display + The message to display as a 'time limit warning' (a default warning will display if this is left blank) 1st time limit warning message @@ -549,7 +549,7 @@ Timer 114 textarea - CSS style used when the 'time limit warning' message is displayed + CSS style used when the 'time limit warning' message is displayed 1st time limit warning CSS style @@ -561,7 +561,7 @@ Timer 116 integer - Display the 2nd 'time limit warning' when there are this many seconds remaining + Display the 2nd 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 2nd time limit warning message timer @@ -575,7 +575,7 @@ Timer 118 integer - The 2nd 'time limit warning' will stay visible for this many seconds (will not + The 2nd 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 2nd time limit warning message display time @@ -591,7 +591,7 @@ textarea 1 1 - The 2nd message to display as a 'time limit warning' (a default warning will + The 2nd message to display as a 'time limit warning' (a default warning will display if this is left blank) 2nd time limit warning message @@ -603,7 +603,7 @@ Timer 122 textarea - CSS style used when the 2nd 'time limit warning' message is displayed + CSS style used when the 2nd 'time limit warning' message is displayed 2nd time limit warning CSS style diff --git a/application/views/survey/questions/answer/listradio/config.xml b/application/views/survey/questions/answer/listradio/config.xml index c7eba7ccf15..80c21b25d98 100644 --- a/application/views/survey/questions/answer/listradio/config.xml +++ b/application/views/survey/questions/answer/listradio/config.xml @@ -89,8 +89,8 @@ text 1 1 - Replaces the label of the 'Other:' answer option with a custom text - Label for 'Other:' option + Replaces the label of the 'Other:' answer option with a custom text + Label for 'Other:' option @@ -342,8 +342,8 @@ 0 - Allow only numerical input for 'Other' text - Numbers only for 'Other' + Allow only numerical input for 'Other' text + Numbers only for 'Other' @@ -391,10 +391,10 @@ 0 - Make the 'Other:' comment field mandatory when the 'Other:' + Make the 'Other:' comment field mandatory when the 'Other:' option is active - 'Other:' comment mandatory + 'Other:' comment mandatory @@ -576,8 +576,8 @@ Timer 102 integer - Display the 'time limit expiry message' for this many seconds before performing - the 'time limit action' (defaults to 1 second if left blank) + Display the 'time limit expiry message' for this many seconds before performing + the 'time limit action' (defaults to 1 second if left blank) Time limit expiry message display time @@ -604,7 +604,7 @@ Timer 106 textarea - CSS style for the 'time limit expiry message' + CSS style for the 'time limit expiry message' Time limit message CSS style @@ -616,7 +616,7 @@ Timer 108 integer - Display a 'time limit warning' when there are this many seconds remaining in the + Display a 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 1st time limit warning message timer @@ -630,7 +630,7 @@ Timer 110 integer - The 'time limit warning' will stay visible for this many seconds (will not turn + The 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 1st time limit warning message display time @@ -646,7 +646,7 @@ textarea 1 1 - The message to display as a 'time limit warning' (a default warning will display + The message to display as a 'time limit warning' (a default warning will display if this is left blank) 1st time limit warning message @@ -658,7 +658,7 @@ Timer 114 textarea - CSS style used when the 'time limit warning' message is displayed + CSS style used when the 'time limit warning' message is displayed 1st time limit warning CSS style @@ -670,7 +670,7 @@ Timer 116 integer - Display the 2nd 'time limit warning' when there are this many seconds remaining + Display the 2nd 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 2nd time limit warning message timer @@ -684,7 +684,7 @@ Timer 118 integer - The 2nd 'time limit warning' will stay visible for this many seconds (will not + The 2nd 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 2nd time limit warning message display time @@ -700,7 +700,7 @@ textarea 1 1 - The 2nd message to display as a 'time limit warning' (a default warning will + The 2nd message to display as a 'time limit warning' (a default warning will display if this is left blank) 2nd time limit warning message @@ -712,7 +712,7 @@ Timer 122 textarea - CSS style used when the 2nd 'time limit warning' message is displayed + CSS style used when the 2nd 'time limit warning' message is displayed 2nd time limit warning CSS style diff --git a/application/views/survey/questions/answer/longfreetext/config.xml b/application/views/survey/questions/answer/longfreetext/config.xml index dbf64956904..7dac767dc01 100644 --- a/application/views/survey/questions/answer/longfreetext/config.xml +++ b/application/views/survey/questions/answer/longfreetext/config.xml @@ -362,8 +362,8 @@ Timer 102 integer - Display the 'time limit expiry message' for this many seconds before performing - the 'time limit action' (defaults to 1 second if left blank) + Display the 'time limit expiry message' for this many seconds before performing + the 'time limit action' (defaults to 1 second if left blank) Time limit expiry message display time @@ -390,7 +390,7 @@ Timer 106 textarea - CSS style for the 'time limit expiry message' + CSS style for the 'time limit expiry message' Time limit message CSS style @@ -402,7 +402,7 @@ Timer 108 integer - Display a 'time limit warning' when there are this many seconds remaining in the + Display a 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 1st time limit warning message timer @@ -416,7 +416,7 @@ Timer 110 integer - The 'time limit warning' will stay visible for this many seconds (will not turn + The 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 1st time limit warning message display time @@ -432,7 +432,7 @@ textarea 1 1 - The message to display as a 'time limit warning' (a default warning will display + The message to display as a 'time limit warning' (a default warning will display if this is left blank) 1st time limit warning message @@ -444,7 +444,7 @@ Timer 114 textarea - CSS style used when the 'time limit warning' message is displayed + CSS style used when the 'time limit warning' message is displayed 1st time limit warning CSS style @@ -456,7 +456,7 @@ Timer 116 integer - Display the 2nd 'time limit warning' when there are this many seconds remaining + Display the 2nd 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 2nd time limit warning message timer @@ -470,7 +470,7 @@ Timer 118 integer - The 2nd 'time limit warning' will stay visible for this many seconds (will not + The 2nd 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 2nd time limit warning message display time @@ -486,7 +486,7 @@ textarea 1 1 - The 2nd message to display as a 'time limit warning' (a default warning will + The 2nd message to display as a 'time limit warning' (a default warning will display if this is left blank) 2nd time limit warning message @@ -498,7 +498,7 @@ Timer 122 textarea - CSS style used when the 2nd 'time limit warning' message is displayed + CSS style used when the 2nd 'time limit warning' message is displayed 2nd time limit warning CSS style diff --git a/application/views/survey/questions/answer/multiplechoice/config.xml b/application/views/survey/questions/answer/multiplechoice/config.xml index a73a1edfc08..8e3d0c87422 100644 --- a/application/views/survey/questions/answer/multiplechoice/config.xml +++ b/application/views/survey/questions/answer/multiplechoice/config.xml @@ -66,8 +66,8 @@ text 1 1 - Replaces the label of the 'Other:' answer option with a custom text - Label for 'Other:' option + Replaces the label of the 'Other:' answer option with a custom text + Label for 'Other:' option @@ -282,8 +282,8 @@ 0 - Allow only numerical input for 'Other' text - Numbers only for 'Other' + Allow only numerical input for 'Other' text + Numbers only for 'Other' diff --git a/application/views/survey/questions/answer/multiplechoice_with_comments/config.xml b/application/views/survey/questions/answer/multiplechoice_with_comments/config.xml index 7b09b5f54da..579fc6da67a 100644 --- a/application/views/survey/questions/answer/multiplechoice_with_comments/config.xml +++ b/application/views/survey/questions/answer/multiplechoice_with_comments/config.xml @@ -134,8 +134,8 @@ text 1 1 - Replaces the label of the 'Other:' answer option with a custom text - Label for 'Other:' option + Replaces the label of the 'Other:' answer option with a custom text + Label for 'Other:' option @@ -391,8 +391,8 @@ 0 - Allow only numerical input for 'Other' text - Numbers only for 'Other' + Allow only numerical input for 'Other' text + Numbers only for 'Other' @@ -538,8 +538,8 @@ 0 - Make the 'Other:' comment field mandatory when the 'Other:' option is active - 'Other:' comment mandatory + Make the 'Other:' comment field mandatory when the 'Other:' option is active + 'Other:' comment mandatory diff --git a/application/views/survey/questions/answer/multiplenumeric/config.xml b/application/views/survey/questions/answer/multiplenumeric/config.xml index 81bd20b35cb..b4058828d16 100644 --- a/application/views/survey/questions/answer/multiplenumeric/config.xml +++ b/application/views/survey/questions/answer/multiplenumeric/config.xml @@ -677,7 +677,7 @@ 0 - Set the handle shape. 'Custom' is defined in CSS using the Font Awesome font. + Set the handle shape. 'Custom' is defined in CSS using the Font Awesome font. Handle shape @@ -957,7 +957,7 @@ 1 - Is no answer (missing) allowed when either 'Equals sum value' or 'Minimum sum value' are set? + Is no answer (missing) allowed when either 'Equals sum value' or 'Minimum sum value' are set? Value range allows missing diff --git a/application/views/survey/questions/answer/shortfreetext/config.xml b/application/views/survey/questions/answer/shortfreetext/config.xml index ff4fa612f82..c4d7a107668 100644 --- a/application/views/survey/questions/answer/shortfreetext/config.xml +++ b/application/views/survey/questions/answer/shortfreetext/config.xml @@ -436,8 +436,8 @@ Timer 102 integer - Display the 'time limit expiry message' for this many seconds before performing - the 'time limit action' (defaults to 1 second if left blank) + Display the 'time limit expiry message' for this many seconds before performing + the 'time limit action' (defaults to 1 second if left blank) Time limit expiry message display time @@ -464,7 +464,7 @@ Timer 106 textarea - CSS style for the 'time limit expiry message' + CSS style for the 'time limit expiry message' Time limit message CSS style @@ -476,7 +476,7 @@ Timer 108 integer - Display a 'time limit warning' when there are this many seconds remaining in the + Display a 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 1st time limit warning message timer @@ -490,7 +490,7 @@ Timer 110 integer - The 'time limit warning' will stay visible for this many seconds (will not turn + The 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 1st time limit warning message display time @@ -506,7 +506,7 @@ textarea 1 1 - The message to display as a 'time limit warning' (a default warning will display + The message to display as a 'time limit warning' (a default warning will display if this is left blank) 1st time limit warning message @@ -518,7 +518,7 @@ Timer 114 textarea - CSS style used when the 'time limit warning' message is displayed + CSS style used when the 'time limit warning' message is displayed 1st time limit warning CSS style @@ -530,7 +530,7 @@ Timer 116 integer - Display the 2nd 'time limit warning' when there are this many seconds remaining + Display the 2nd 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 2nd time limit warning message timer @@ -544,7 +544,7 @@ Timer 118 integer - The 2nd 'time limit warning' will stay visible for this many seconds (will not + The 2nd 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 2nd time limit warning message display time @@ -560,7 +560,7 @@ textarea 1 1 - The 2nd message to display as a 'time limit warning' (a default warning will + The 2nd message to display as a 'time limit warning' (a default warning will display if this is left blank) 2nd time limit warning message @@ -572,7 +572,7 @@ Timer 122 textarea - CSS style used when the 2nd 'time limit warning' message is displayed + CSS style used when the 2nd 'time limit warning' message is displayed 2nd time limit warning CSS style @@ -736,7 +736,7 @@ 0 - Get the default location using the user's IP address? + Get the default location using the user's IP address? IP as default location diff --git a/docs/themes/questiontheme_example/survey/questions/answer/listradio/config.xml b/docs/themes/questiontheme_example/survey/questions/answer/listradio/config.xml index 60e862ff578..4a3df53b494 100644 --- a/docs/themes/questiontheme_example/survey/questions/answer/listradio/config.xml +++ b/docs/themes/questiontheme_example/survey/questions/answer/listradio/config.xml @@ -257,8 +257,8 @@ 0 - Allow only numerical input for 'Other' text - Numbers only for 'Other' + Allow only numerical input for 'Other' text + Numbers only for 'Other' @@ -306,10 +306,10 @@ 0 - Make the 'Other:' comment field mandatory when the 'Other:' + Make the 'Other:' comment field mandatory when the 'Other:' option is active - 'Other:' comment mandatory + 'Other:' comment mandatory @@ -491,8 +491,8 @@ Timer 102 integer - Display the 'time limit expiry message' for this many seconds before performing - the 'time limit action' (defaults to 1 second if left blank) + Display the 'time limit expiry message' for this many seconds before performing + the 'time limit action' (defaults to 1 second if left blank) Time limit expiry message display time @@ -519,7 +519,7 @@ Timer 106 textarea - CSS style for the 'time limit expiry message' + CSS style for the 'time limit expiry message' Time limit message CSS style @@ -531,7 +531,7 @@ Timer 108 integer - Display a 'time limit warning' when there are this many seconds remaining in the + Display a 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 1st time limit warning message timer @@ -545,7 +545,7 @@ Timer 110 integer - The 'time limit warning' will stay visible for this many seconds (will not turn + The 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 1st time limit warning message display time @@ -561,7 +561,7 @@ textarea 1 1 - The message to display as a 'time limit warning' (a default warning will display + The message to display as a 'time limit warning' (a default warning will display if this is left blank) 1st time limit warning message @@ -573,7 +573,7 @@ Timer 114 textarea - CSS style used when the 'time limit warning' message is displayed + CSS style used when the 'time limit warning' message is displayed 1st time limit warning CSS style @@ -585,7 +585,7 @@ Timer 116 integer - Display the 2nd 'time limit warning' when there are this many seconds remaining + Display the 2nd 'time limit warning' when there are this many seconds remaining in the countdown (warning will not display if left blank) 2nd time limit warning message timer @@ -599,7 +599,7 @@ Timer 118 integer - The 2nd 'time limit warning' will stay visible for this many seconds (will not + The 2nd 'time limit warning' will stay visible for this many seconds (will not turn off if this setting is left blank) 2nd time limit warning message display time @@ -615,7 +615,7 @@ textarea 1 1 - The 2nd message to display as a 'time limit warning' (a default warning will + The 2nd message to display as a 'time limit warning' (a default warning will display if this is left blank) 2nd time limit warning message @@ -627,7 +627,7 @@ Timer 122 textarea - CSS style used when the 2nd 'time limit warning' message is displayed + CSS style used when the 2nd 'time limit warning' message is displayed 2nd time limit warning CSS style