Merge branch 'fixes' into 'pregmod-master'

Custom Slave Trade Display Consistency

See merge request pregmodfan/fc-pregmod!2490

src/events/intro/introSummary.tw

@@ -76,9 +76,11 @@ You are using standardized slave trading channels. [[Customize the slave trade|C
 	<</if>>
 	<br style="clear:both" /><hr style="margin:0">
 	<<set _len = Object.keys($nationalitiescheck).length>>
+	<<set _j = 0>>
 	<<for _nation, _i range $nationalitiescheck>>
 		<<print _nation>> @@.orange;<<print (($nationalities[_nation]/hashSum($nationalities))*100).toFixed(2)>>%@@
-	<<if _i < _len-1>> | <</if>>
+		<<set _j++>>
+		<<if _j < _len>> | <</if>>
 	<</for>>
 	<br style="clear:both" /><hr style="margin:0">
 <</if>> /* closes $customVariety is defined */

src/pregmod/basenationalitiesControls.tw

@@ -20,9 +20,11 @@
 /* Prints distribution of $nationalities, using $nationalitiescheck to render array */
 <<set _percentPerPoint = 100.0 / hashSum($nationalities)>>
 <<set _len = Object.keys($nationalitiescheck).length>>
+<<set _j = 0>>
 <<for _nation, _i range $nationalitiescheck>>
 	_nation @@.orange;<<= ($nationalities[_nation] * _percentPerPoint).toFixed(2)>>%@@
-	<<if _len != 0>> | <</if>>
+	<<set _j++>>
+	<<if _j < _len>> | <</if>>
 <</for>>
 <<unset _percentPerPoint>>
 <br><br>