From 284cc5c924f90188c45af75ff9064290e6a60e63 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 24 Oct 2018 22:59:57 +0300
Subject: [PATCH] Can now see translation percent when picking language

---
 android/assets/jsons/Translations.json        | 32 ++++++++++++-------
 .../WorldScreenDisplayOptionsTable.kt         | 24 +++++++++-----
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index 273b9d186b..6e1e635e9b 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -79,6 +79,7 @@
 		Spanish:"Fuerza a distancia"
 	}
 
+	// Unit actions
 	"Move unit":{
 		Italian:"Sposta unità"
 		Russian:"Переместить юнит"
@@ -138,6 +139,8 @@
 		Dutch:"Versterking"
 		Spanish:"Fortificación"
 	}
+	
+	"Sleep":{}
 
 	"Set up":{ // For siege units
 		Italian:"Monta"
@@ -1215,7 +1218,10 @@
 		Spanish:"Piedra"
 	}
 	
+	"Fish":{}
+	
 	// Strategic Resources
+	
 	"Horses":{
 		Italian:"Cavalli"
 		Russian:"Лошади"
@@ -1490,6 +1496,8 @@
 		Dutch:"Steengroeve"
 		Spanish:"Cantera"
 	}
+	"Fishing boats":{}
+	
 	"Road":{
 		Italian:"Strada"
 		Russian:"Дорога"
@@ -1508,17 +1516,7 @@
 		Dutch:"Spoorweg"
 		Spanish:"Línea de ferrocarril"
 	}
-	/*
-	"Remove":{ // as in "Remove Forest/Jungle/Marsh"
-		Italian:"Rimuovi"
-		Russian:"Убрать"
-		French:"Suprimer"
-		Romanian:"Elimina"
-		German:"Entfernen:" // verb behind object again
-		Dutch:"Verwijderen" // verb behind object
-		Spanish:"Quitar"
-	}
-	*/
+	
 	"Remove Forest":{
 		Russian:"Вырубить лес"
 		Spanish:"Quitar bosque"
@@ -1532,6 +1530,7 @@
 		Spanish:"Quitar pantano"
 	}
 	
+	// Great Unit improvements
 	"Academy":{
 		Italian:"Accademia"
 		Russian:"Академия"
@@ -2380,6 +2379,15 @@
 		Dutch:"40% van het voedsel word overgedragen na de geboorte van een nieuwe burger"
 		Spanish:"40% de comida es arrastrada cada vez que nace un nuevo habitante"
 	}
+	"25% of food is carried over after a new citizen is born":{
+		Italian:"Il 25% del cibo viene immagazzinato dopo la nascita di un nuovo cittadino"
+		Russian:"25% продовольствия сохраняется после рождения нового гражданина"
+		French:"25% de la nourriture est reportée après la naissance d'un nouveau citoyen"
+		Romanian:"25% din produsele alimentare sunt mentinute după ce se naște un nou cetățean"
+		German:"25% vom Essensvorrat wird behalten, wenn ein neuer Bewohner geboren wird"
+		Dutch:"25% van het voedsel word overgedragen na de geboorte van een nieuwe burger"
+		Spanish:"25% de comida es arrastrada cada vez que nace un nuevo habitante"
+	}
 	"Jungles provide +2 science":{
 		Italian:"+2 scienzada giungle"
 		Russian:"Джунгли обеспечивают +2 науки"
@@ -2434,6 +2442,8 @@
 		Dutch:"Een gratis geweldige artiest verschijnt"
 		Spanish:"Aparece un Gran Artista gratis"
 	}
+	"Free great scientist appears":{}
+	
 	"Culture cost of adopting new Policies reduced by 10%":{
 		Italian:"-10% costo in cultura per nuove politiche"
 		Russian:"Колличество культуры для принятия новых общественных институтов -10%"
diff --git a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenDisplayOptionsTable.kt b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenDisplayOptionsTable.kt
index d63723781c..c5a0cc4f17 100644
--- a/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenDisplayOptionsTable.kt
+++ b/core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenDisplayOptionsTable.kt
@@ -1,13 +1,11 @@
 package com.unciv.ui.worldscreen.optionstable
 
 import com.badlogic.gdx.scenes.scene2d.Actor
-import com.badlogic.gdx.scenes.scene2d.ui.CheckBox
 import com.badlogic.gdx.scenes.scene2d.ui.SelectBox
 import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener
 import com.unciv.UnCivGame
 import com.unciv.models.gamebasics.GameBasics
 import com.unciv.ui.utils.CameraStageBaseScreen
-import com.unciv.ui.utils.ImageGetter
 import com.unciv.ui.utils.center
 import com.unciv.ui.worldscreen.WorldScreen
 
@@ -29,15 +27,25 @@ class WorldScreenDisplayOptionsTable() : PopupTable(){
         else addButton("{Show} {resources and improvements}") { settings.showResourcesAndImprovements = true; update() }
 
 
-        val languageSelectBox = SelectBox<String>(CameraStageBaseScreen.skin)
-        val languageArray = com.badlogic.gdx.utils.Array<String>()
-        GameBasics.Translations.getLanguages().forEach { languageArray.add(it) }
-        languageSelectBox.setItems(languageArray)
-        languageSelectBox.selected = UnCivGame.Current.settings.language
+        class Language(val language:String){
+            override fun toString(): String {
+                val percentComplete:Int
+                val availableTranslations = GameBasics.Translations.filter { it.value.containsKey(language) }
+                if(language=="English") percentComplete = 100
+                else percentComplete = (availableTranslations.size*100 / GameBasics.Translations.size)
+                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)) }
+        languageSelectBox.items = languageArray
+        languageSelectBox.selected = languageArray.first { it.language== UnCivGame.Current.settings.language}
         add(languageSelectBox).pad(10f).row()
         languageSelectBox.addListener(object : ChangeListener() {
             override fun changed(event: ChangeEvent?, actor: Actor?) {
-                UnCivGame.Current.settings.language = languageSelectBox.selected;
+                UnCivGame.Current.settings.language = languageSelectBox.selected.language;
                 UnCivGame.Current.settings.save()
                 UnCivGame.Current.worldScreen = WorldScreen()
                 UnCivGame.Current.setWorldScreen()