From f7021154f3252a23095835b72acac469840e7ad8 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 24 Oct 2018 23:08:41 +0300
Subject: [PATCH] Available languages now sorted by percentage translated Added
 missing tilda vowels in font for Spanish translation

---
 core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt     | 2 +-
 .../optionstable/WorldScreenDisplayOptionsTable.kt       | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
index e9be8e3096..9cc340f3c5 100644
--- a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
+++ b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
@@ -165,7 +165,7 @@ fun getFont(size: Int): BitmapFont {
 //    parameter.genMipMaps = true
     parameter.minFilter = Texture.TextureFilter.Linear
     parameter.magFilter = Texture.TextureFilter.Linear
-    parameter.characters = "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽaäàâăbcčćdđeéfghiîjklmnoöpqrsșštțuüvwxyzžАБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюяΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάΆέΈέΉίϊΐΊόΌύΰϋΎΫΏĂÂÊÔƠƯăâêôơư1234567890‘?’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.*|"
+    parameter.characters = "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽaäàâăbcčćdđeéfghiîjklmnoöpqrsșštțuüvwxyzžАБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюяΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάΆέΈέΉίϊΐΊόΌύΰϋΎΫΏĂÂÊÔƠƯăâêôơưáéíóú1234567890‘?’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.*|"
     //generator.scaleForPixelHeight(size)
 
 
diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenDisplayOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenDisplayOptionsTable.kt
index c5a0cc4f17..97786f6fc3 100644
--- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenDisplayOptionsTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenDisplayOptionsTable.kt
@@ -28,18 +28,21 @@ class WorldScreenDisplayOptionsTable() : PopupTable(){
 
 
         class Language(val language:String){
-            override fun toString(): String {
-                val percentComplete:Int
+            val percentComplete:Int
+            init{
                 val availableTranslations = GameBasics.Translations.filter { it.value.containsKey(language) }
                 if(language=="English") percentComplete = 100
                 else percentComplete = (availableTranslations.size*100 / GameBasics.Translations.size)
+            }
+            override fun toString(): String {
                 return "$language - $percentComplete%"
             }
         }
 
         val languageSelectBox = SelectBox<Language>(CameraStageBaseScreen.skin)
         val languageArray = com.badlogic.gdx.utils.Array<Language>()
-        GameBasics.Translations.getLanguages().forEach { languageArray.add(Language(it)) }
+        GameBasics.Translations.getLanguages().map { Language(it) }.sortedByDescending { it.percentComplete }
+                .forEach { languageArray.add(it) }
         languageSelectBox.items = languageArray
         languageSelectBox.selected = languageArray.first { it.language== UnCivGame.Current.settings.language}
         add(languageSelectBox).pad(10f).row()