Fixed issue #7157: Some languages cannot be represented by flags

jlpoolen · Jan 14, 2013 · 749540a · 749540a
1 parent cac21ba
commit 749540a
Show file tree

Hide file tree

Showing 62 changed files with 18 additions and 7 deletions.
diff --git a/application/views/admin/survey/surveySummary_view.php b/application/views/admin/survey/surveySummary_view.php
@@ -9,17 +9,28 @@
 	</tr>
 	<tr>
 		<td>
-			<strong><?php echo $clang->gT("Survey URL") ." (".getLanguageNameFromCode($surveyinfo['language'],false)."):";?></strong>
+			<strong><?php echo $clang->gT("Survey URL") ." - ".getLanguageNameFromCode($surveyinfo['language'],false).":";?></strong>
 		</td>
 		<td>
-		<?php $tmp_url = $this->createAbsoluteUrl("/survey/index/sid/{$surveyinfo['sid']}");
-        echo "<a href='{$tmp_url}/lang/{$surveyinfo['language']}' target='_blank'>{$tmp_url}/lang/{$surveyinfo['language']}</a>";
+		<?php $tmp_url = $this->createAbsoluteUrl("/survey/index/sid/{$surveyinfo['sid']}/lang/{$surveyinfo['language']}"); ?>
+        <a href='<?php echo $tmp_url?>/lang/<?php echo $surveyinfo['language']; ?>' target='_blank'><?php echo $tmp_url; ?></a>
+        </td>
+    </tr>
+        <?php
         foreach ($aAdditionalLanguages as $langname)
-        {
-            echo "&nbsp;<a href='{$tmp_url}/lang/$langname' target='_blank'><img title='".$clang->gT("Survey URL for language:")." ".getLanguageNameFromCode($langname,false)
-            ."' alt='".getLanguageNameFromCode($langname,false)." ".$clang->gT("Flag")."' src='".Yii::app()->getConfig("imageurl")."/flags/{$langname}.png' /></a>";
+        {?>
+        <tr>
+            <td>
+                <strong><?php echo getLanguageNameFromCode($langname,false).":";?></strong>
+            </td>
+            <td>
+            <?php $tmp_url = $this->createAbsoluteUrl("/survey/index/sid/{$surveyinfo['sid']}/lang/{$langname}"); ?>
+            <a href='<?php echo $tmp_url?>/lang/<?php echo $langname; ?>' target='_blank'><?php echo $tmp_url; ?></a>
+            </td>
+        </tr>
+
+        <?php
         } ?>
-		</td>
 	</tr>
     <tr>
     	<td>

diff --git a/images/flags/af.png b/images/flags/af.png
diff --git a/images/flags/ar.png b/images/flags/ar.png
diff --git a/images/flags/be.png b/images/flags/be.png
diff --git a/images/flags/bg.png b/images/flags/bg.png
diff --git a/images/flags/bs.png b/images/flags/bs.png
diff --git a/images/flags/ca.png b/images/flags/ca.png
diff --git a/images/flags/cs.png b/images/flags/cs.png
diff --git a/images/flags/cy.png b/images/flags/cy.png
diff --git a/images/flags/da.png b/images/flags/da.png
diff --git a/images/flags/de-informal.png b/images/flags/de-informal.png
diff --git a/images/flags/de.png b/images/flags/de.png
diff --git a/images/flags/el.png b/images/flags/el.png
diff --git a/images/flags/en.png b/images/flags/en.png
diff --git a/images/flags/es-MX.png b/images/flags/es-MX.png
diff --git a/images/flags/es.png b/images/flags/es.png
diff --git a/images/flags/et.png b/images/flags/et.png
diff --git a/images/flags/eu.png b/images/flags/eu.png
diff --git a/images/flags/fa.png b/images/flags/fa.png
diff --git a/images/flags/fi.png b/images/flags/fi.png
diff --git a/images/flags/fr.png b/images/flags/fr.png
diff --git a/images/flags/gl.png b/images/flags/gl.png
diff --git a/images/flags/he.png b/images/flags/he.png
diff --git a/images/flags/hi.png b/images/flags/hi.png
diff --git a/images/flags/hr.png b/images/flags/hr.png
diff --git a/images/flags/hu.png b/images/flags/hu.png
diff --git a/images/flags/id.png b/images/flags/id.png
diff --git a/images/flags/ie.png b/images/flags/ie.png
diff --git a/images/flags/index.html b/images/flags/index.html
diff --git a/images/flags/is.png b/images/flags/is.png
diff --git a/images/flags/it-formal.png b/images/flags/it-formal.png
diff --git a/images/flags/it.png b/images/flags/it.png
diff --git a/images/flags/ja.png b/images/flags/ja.png
diff --git a/images/flags/ko.png b/images/flags/ko.png
diff --git a/images/flags/lt.png b/images/flags/lt.png
diff --git a/images/flags/lv.png b/images/flags/lv.png
diff --git a/images/flags/mk.png b/images/flags/mk.png
diff --git a/images/flags/ms.png b/images/flags/ms.png
diff --git a/images/flags/mt.png b/images/flags/mt.png
diff --git a/images/flags/nb.png b/images/flags/nb.png
diff --git a/images/flags/nl-informal.png b/images/flags/nl-informal.png
diff --git a/images/flags/nl.png b/images/flags/nl.png
diff --git a/images/flags/nn.png b/images/flags/nn.png
diff --git a/images/flags/pa.png b/images/flags/pa.png
diff --git a/images/flags/pl.png b/images/flags/pl.png
diff --git a/images/flags/pt-BR.png b/images/flags/pt-BR.png
diff --git a/images/flags/pt.png b/images/flags/pt.png
diff --git a/images/flags/ro.png b/images/flags/ro.png
diff --git a/images/flags/ru.png b/images/flags/ru.png
diff --git a/images/flags/si.png b/images/flags/si.png
diff --git a/images/flags/sk.png b/images/flags/sk.png
diff --git a/images/flags/sl.png b/images/flags/sl.png
diff --git a/images/flags/sq.png b/images/flags/sq.png
diff --git a/images/flags/sr.png b/images/flags/sr.png
diff --git a/images/flags/sv.png b/images/flags/sv.png
diff --git a/images/flags/th.png b/images/flags/th.png
diff --git a/images/flags/tr.png b/images/flags/tr.png
diff --git a/images/flags/vi.png b/images/flags/vi.png
diff --git a/images/flags/zh-Hans.png b/images/flags/zh-Hans.png
diff --git a/images/flags/zh-Hant-HK.png b/images/flags/zh-Hant-HK.png
diff --git a/images/flags/zh-Hant-TW.png b/images/flags/zh-Hant-TW.png
diff --git a/images/flags/zh-Hant.png b/images/flags/zh-Hant.png