Merge "viewing fonts had layout problems (Bug #1297516)"

htdocs/lang/en.utf8/skin.php

@@ -229,19 +229,19 @@ $string['samplesort'] = 'Sorting';
 $string['sampletext'] = 'Text';
 $string['samplefonttitle'] = 'Font name';
 $string['sampletitle11'] = 'Latin alphabet (ASCII only)';
-$string['sampletext11'] = 'AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz';
+$string['sampletext11'] = 'Aa Bb Cc Dd Ee Ff Gg Hh Ii Jj Kk Ll Mm Nn Oo Pp Qq Rr Ss Tt Uu Vv Ww Xx Yy Zz';
 $string['sampletitle12'] = 'Latin alphabet (ISO/IEC 8859-1)';
-$string['sampletext12'] = 'ÀàÁáÂâÃãÄäÅåÆæÇçÈèÉéÊêËëÌìÍíÎîÏïÐðÑñÒòÓóÔôÕõÖöØøÙùÚúÛûÜüÝýÞþß';
+$string['sampletext12'] = 'Àà Áá Ââ Ãã Ää Åå Ææ Çç Èè Éé Êê Ëë Ìì Íí Îî Ïï Ðð Ññ Òò Óó Ôô Õõ Öö Øø Ùù Úú Ûû Üü Ýý Þþ ß';
 $string['sampletitle13'] = 'Latin alphabet (ISO/IEC 8859-2)';
-$string['sampletext13'] = 'ĀāĂ㥹ĆćČčĎďĐđĒēĖėĘęĚěĞğĢģĪīĬĭĮįİıĶķĹĺĻļĽľŁłŃńŅņŇňŌōŐőŒœŔŕŖŗŘřŚśŞşŠšŢţŤťŪūŬŭŮůŰűŲųŹźŻżŽžſ';
+$string['sampletext13'] = 'Āā Ăă Ąą Ćć Čč Ďď Đđ Ēē Ėė Ęę Ěě Ğğ Ģģ Īī Ĭĭ Įį İı Ķķ Ĺĺ Ļļ Ľľ Łł Ńń Ņņ Ňň Ōō Őő Œœ Ŕŕ Ŗŗ Řř Śś Şş Šš Ţţ Ťť Ūū Ŭŭ Ůů Űű Ųų Źź Żż Žž ſ';
 $string['sampletitle14'] = 'Cyrillic alphabet (ISO/IEC 8859-5)';
-$string['sampletext14'] = 'АаБбВвГгДдЕеЁёЖжЗзИиЙйКкЛлМмНнОоПпРрСсТтУуФфХхЦцЧчШшЩщЪъЫыЬьЭэЮюЯя';
+$string['sampletext14'] = 'Аа Бб Вв Гг Дд Ее Ёё Жж Зз Ии Йй Кк Лл Мм Нн Оо Пп Рр Сс Тт Уу Фф Хх Цц Чч Шш Щщ Ъъ Ыы Ьь Ээ Юю Яя';
 $string['sampletitle15'] = 'Greek alphabet (ISO/IEC 8859-7)';
-$string['sampletext15'] = 'ΑαΒβΓγΔδΕεΖζΗηΘθΙιΚκΛλΜμΝνΞξΟοΠπΡρΣσςΤτΥυΦφΧχΨψΩω';
+$string['sampletext15'] = 'Αα Ββ Γγ Δδ Εε Ζζ Ηη Θθ Ιι Κκ Λλ Μμ Νν Ξξ Οο Ππ Ρρ Σσς Ττ Υυ Φφ Χχ Ψψ Ωω';
 $string['sampletitle18'] = 'Numbers and fractions';
-$string['sampletext18'] = '1234567890¼½¾⅓⅔⅛⅜⅝⅞¹²³';
+$string['sampletext18'] = '1 2 3 4 5 6 7 8 9 0 ¼ ½ ¾ ⅓ ⅔ ⅛ ⅜ ⅝ ⅞ ¹ ² ³';
 $string['sampletitle19'] = 'Punctuation';
-$string['sampletext19'] = '&!?»«@$€§*#%%/()\{}[]';
+$string['sampletext19'] = '& ! ? » « @ $ € § * # %% / () \ {} []';
 $string['sampletitle20'] = 'Lorem ipsum...';
 $string['sampletext20'] = 'Lorem ipsum dolor sit amet, consectetur adipiscing elit.';
 $string['sampletitle21'] = 'Grumpy wizards make...';

htdocs/theme/raw/templates/skin/sitefonts.tpl

@@ -32,7 +32,7 @@
                         </ul>
                         <div style="font-family:'{$font.title|escape_css_string}';font-size:{$size}pt;line-height:{$size}pt;padding:3px 0;">
                             {if $preview == 10}{$font.title}{/if}
-                            {if $preview >= 11}{str tag="sampletext$preview" section="skin"{/if}
+                            {if $preview >= 11}{str tag="sampletext$preview" section="skin"}{/if}
                         </div>
                         <div class="cb"></div>
                     </div>