Added new "replace" line in welcome.pstpl - {THEREAREXQUESTIONS} - wh…

…ich uses new constants defined in the public language file _THEREAREXQUESTIONS -or- _THEREAREXQUESTIONS_SINGLE to display the text "There are X questions in this survey". This is the last of all hard-coded text in the template files. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/trunk/unstable@1034 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · May 20, 2004 · ecdf374 · ecdf374
1 parent 27c05cd
commit ecdf374
Show file tree

Hide file tree

Showing 15 changed files with 45 additions and 4 deletions.
diff --git a/index.php b/index.php
@@ -304,7 +304,15 @@ function templatereplace($line)
 	$line=str_replace("{QUESTION}", $question, $line);
 	$line=str_replace("{QUESTION_CODE}", $questioncode, $line);
 	$line=str_replace("{ANSWER}", $answer, $line);
-	$line=str_replace("{NUMBEROFQUESTIONS}", $totalquestions, $line);
+	if ($totalquestions < 2)
+		{
+		$line=str_replace("{THEREAREXQUESTIONS}", _THEREAREXQUESTIONS_SINGLE, $line); //Singular
+	    }
+	else
+		{
+		$line=str_replace("{THEREAREXQUESTIONS}", _THEREAREXQUESTIONS, $line); //Note this line MUST be before {NUMBEROFQUESTIONS}
+		$line=str_replace("{NUMBEROFQUESTIONS}", $totalquestions, $line);
+		}
 	$line=str_replace("{TOKEN}", $token, $line);
 	$line=str_replace("{SID}", $sid, $line);
 	if ($help) {

diff --git a/lang/chinese.lang.php b/lang/chinese.lang.php
@@ -142,6 +142,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/lang/danish.lang.php b/lang/danish.lang.php
@@ -144,6 +144,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/lang/english.lang.php b/lang/english.lang.php
@@ -140,6 +140,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/lang/french.lang.php b/lang/french.lang.php
@@ -144,6 +144,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/lang/hungarian.lang.php b/lang/hungarian.lang.php
@@ -145,6 +145,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/lang/italian.lang.php b/lang/italian.lang.php
@@ -144,6 +144,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/lang/norwegian.lang.php b/lang/norwegian.lang.php
@@ -144,6 +144,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/lang/simplified-chinese.lang.php b/lang/simplified-chinese.lang.php
@@ -142,6 +142,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/lang/slovenian.lang.php b/lang/slovenian.lang.php
@@ -146,6 +146,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/lang/spanish.lang.php b/lang/spanish.lang.php
@@ -144,6 +144,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/lang/swedish.lang.php b/lang/swedish.lang.php
@@ -144,6 +144,9 @@
 						  ."(or haven't) completed this survey. There is no way of matching "
 						  ."identification tokens with survey responses in this survey."); //New for 0.98rc9
 
+define("_THEREAREXQUESTIONS", "There are {NUMBEROFQUESTIONS} questions in this survey."); //New for 0.98rc9 Must contain {NUMBEROFQUESTIONS} which gets replaced with a question count.
+define("_THEREAREXQUESTIONS_SINGLE", "There is 1 question in this survey."); //New for 0.98rc9 - singular version of above
+
 define ("_RG_REGISTER1", "You must be registered to complete this survey"); //NEW for 0.98rc9
 define ("_RG_REGISTER2", "You may register for this survey if you wish to take part.<br />\n"
 						."Enter your details below, and an email containing the link to "

diff --git a/templates/bubblegum/welcome.pstpl b/templates/bubblegum/welcome.pstpl
@@ -8,7 +8,7 @@
 	<tr>
 		<td align='center' bgcolor='#F0F0FF'>
 			<font size='2'>{WELCOME}<br /><br />
-			<i>There are {NUMBEROFQUESTIONS} questions in this survey.</i>
+			<i>{THEREAREXQUESTIONS}</i>
 		</td>
 	</tr>
 </table>
diff --git a/templates/default/welcome.pstpl b/templates/default/welcome.pstpl
@@ -8,7 +8,7 @@
 	<tr>
 		<td align='center' bgcolor='#DEDEDE'>
 			<font face='verdana' size='2'>{WELCOME}<br /><br />
-			<i>There are {NUMBEROFQUESTIONS} questions in this survey.</i>
+			<i>{THEREAREXQUESTIONS}</i>
 		</font></td>
 	</tr>
 </table>
diff --git a/templates/edgyblue/welcome.pstpl b/templates/edgyblue/welcome.pstpl
@@ -20,7 +20,7 @@
 		<td></td>
 		<td align='center'>
 			<font size='2'><br />{WELCOME}<br /><br />
-			<i>There are {NUMBEROFQUESTIONS} questions in this survey.</i><br />&nbsp;
+			<i>{THEREAREXQUESTIONS}</i><br />&nbsp;
 		</td>
 		<td></td>
 	</tr>