From 19d591dd894bf580ca0ee5d92043af6a015eede2 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Tue, 22 Nov 2022 00:17:10 +0200 Subject: [PATCH] Fixed json tests --- .../GreatPeopleNames.json | 123 ------------------ .../Civ V - Vanilla/GreatPeopleNames.json | 123 ------------------ .../translations/TranslationFileWriter.kt | 1 + 3 files changed, 1 insertion(+), 246 deletions(-) delete mode 100644 android/assets/jsons/Civ V - Gods & Kings/GreatPeopleNames.json delete mode 100644 android/assets/jsons/Civ V - Vanilla/GreatPeopleNames.json diff --git a/android/assets/jsons/Civ V - Gods & Kings/GreatPeopleNames.json b/android/assets/jsons/Civ V - Gods & Kings/GreatPeopleNames.json deleted file mode 100644 index f82c7992ba..0000000000 --- a/android/assets/jsons/Civ V - Gods & Kings/GreatPeopleNames.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "Great Generals": [ - "Boudicca", - "Hannibal Barca", - "Sun Tzu", - "El Cid", - "Genghis Khan", - "Timur", - "Napoleon Bonaparte", - "Jeanne d'Arc", - "Simòn Bolìvar", - "Ahuitzotl", - "Arminius", - "Belisarius", - "Cao Cao", - "Chandragupta Maurya", - "Hernan Cortez", - "Oliver Cromwell", - "Epaminondas", - "Gaius Marius", - "Geronimo", - "Ivan the Terrible", - "Leonidas", - "Lysander", - "Pompey", - "Francisco Pizarro", - "George Patton", - "Bernard Montgomery", - "Charles Martel", - "Pyrrhus", - "Erwin Rommel", - "Sargon", - "Scipio Africanus", - "Sitting Bull", - "Spartacus", - "Sun Tzu", - "Vercingetorix", - "William the Conqueror", - "Zhuge Liang" - ], - "Great Scientists": [ - "Euclid", - "Marie Curie", - "Michael Faraday", - "Nikola Tesla", - "Hypatia", - "Galileo Galilei", - "Isaac Newton", - "Thomas Edison", - "Alessandro Volta", - "Johannes Kepler", - "Charles Darwin", - "Dmitri Mendeleev", - "Alan Turing", - "Albert Einstein", - "Alfred Nobel", - "Nicolaus Copernicus", - "Ptolemy", - "Plato", - "Socrates", - "Andrey Sakharov", - "Louis Pasteur", - "Merit-Ptah", - "Voltaire" - ], - "Great Merchants": [ - "Marco Polo", - "Coco Chanel", - "Ibn Battuta", - "Steve Jobs", - "Giovanni de Medici", - "Enrico Dandolo", - "Henri Nestlé" - ], - "Great Artists": [ - "Michelangelo Buonarroti", - "Raffello", - "Leonardo da Vinci", - "Sandro Botticelli", - "Donatello", - "Caravaggio", - "Paul Cézanne", - "Vincent van Gogh", - "Pieter Brueghel", - "Paul Gaugion", - "Giotto di Bondone", - "Francisco Goya", - "Pablo Picasso", - "Tintoretto", - "Utagawa Hiroshige", - "Yanagawa Shigenobu", - "Vittorio Alfieri", - "Ludovico Ariosto", - "Aristophanes", - "Miguel de Cervantes", - "Charles Dickens", - "George Orwell", - "Homer", - "Victor Hugo", - "Francesco Petrarca", - "Dante Alighieri", - "Giovanni Boccaccio", - "William Shakespeare", - "Levi Tolstoy", - "Mark Twaine", - "Johann Sebastian Back", - "Ludwing van Beethoven", - "Wolfgang Amadeus Mozart", - "Giuseppe Verdi", - "Ugo Mameli", - "Yamada Kengyo" - ], - "Great Engineers": [ - "Archimedes", - "Imhotep", - "Henry Ford", - "Thomas Edison", - "Guglielmo Marconi", - "Nikola Tesla", - "James Watt", - "Alexandre Gustave Eiffel" - ] -} diff --git a/android/assets/jsons/Civ V - Vanilla/GreatPeopleNames.json b/android/assets/jsons/Civ V - Vanilla/GreatPeopleNames.json deleted file mode 100644 index f82c7992ba..0000000000 --- a/android/assets/jsons/Civ V - Vanilla/GreatPeopleNames.json +++ /dev/null @@ -1,123 +0,0 @@ -{ - "Great Generals": [ - "Boudicca", - "Hannibal Barca", - "Sun Tzu", - "El Cid", - "Genghis Khan", - "Timur", - "Napoleon Bonaparte", - "Jeanne d'Arc", - "Simòn Bolìvar", - "Ahuitzotl", - "Arminius", - "Belisarius", - "Cao Cao", - "Chandragupta Maurya", - "Hernan Cortez", - "Oliver Cromwell", - "Epaminondas", - "Gaius Marius", - "Geronimo", - "Ivan the Terrible", - "Leonidas", - "Lysander", - "Pompey", - "Francisco Pizarro", - "George Patton", - "Bernard Montgomery", - "Charles Martel", - "Pyrrhus", - "Erwin Rommel", - "Sargon", - "Scipio Africanus", - "Sitting Bull", - "Spartacus", - "Sun Tzu", - "Vercingetorix", - "William the Conqueror", - "Zhuge Liang" - ], - "Great Scientists": [ - "Euclid", - "Marie Curie", - "Michael Faraday", - "Nikola Tesla", - "Hypatia", - "Galileo Galilei", - "Isaac Newton", - "Thomas Edison", - "Alessandro Volta", - "Johannes Kepler", - "Charles Darwin", - "Dmitri Mendeleev", - "Alan Turing", - "Albert Einstein", - "Alfred Nobel", - "Nicolaus Copernicus", - "Ptolemy", - "Plato", - "Socrates", - "Andrey Sakharov", - "Louis Pasteur", - "Merit-Ptah", - "Voltaire" - ], - "Great Merchants": [ - "Marco Polo", - "Coco Chanel", - "Ibn Battuta", - "Steve Jobs", - "Giovanni de Medici", - "Enrico Dandolo", - "Henri Nestlé" - ], - "Great Artists": [ - "Michelangelo Buonarroti", - "Raffello", - "Leonardo da Vinci", - "Sandro Botticelli", - "Donatello", - "Caravaggio", - "Paul Cézanne", - "Vincent van Gogh", - "Pieter Brueghel", - "Paul Gaugion", - "Giotto di Bondone", - "Francisco Goya", - "Pablo Picasso", - "Tintoretto", - "Utagawa Hiroshige", - "Yanagawa Shigenobu", - "Vittorio Alfieri", - "Ludovico Ariosto", - "Aristophanes", - "Miguel de Cervantes", - "Charles Dickens", - "George Orwell", - "Homer", - "Victor Hugo", - "Francesco Petrarca", - "Dante Alighieri", - "Giovanni Boccaccio", - "William Shakespeare", - "Levi Tolstoy", - "Mark Twaine", - "Johann Sebastian Back", - "Ludwing van Beethoven", - "Wolfgang Amadeus Mozart", - "Giuseppe Verdi", - "Ugo Mameli", - "Yamada Kengyo" - ], - "Great Engineers": [ - "Archimedes", - "Imhotep", - "Henry Ford", - "Thomas Edison", - "Guglielmo Marconi", - "Nikola Tesla", - "James Watt", - "Alexandre Gustave Eiffel" - ] -} diff --git a/core/src/com/unciv/models/translations/TranslationFileWriter.kt b/core/src/com/unciv/models/translations/TranslationFileWriter.kt index 09be5049ba..c5c6b0c48f 100644 --- a/core/src/com/unciv/models/translations/TranslationFileWriter.kt +++ b/core/src/com/unciv/models/translations/TranslationFileWriter.kt @@ -473,6 +473,7 @@ object TranslationFileWriter { "Units" -> emptyArray().javaClass "UnitTypes" -> emptyArray().javaClass "VictoryTypes" -> emptyArray().javaClass + "CityStateTypes" -> emptyArray().javaClass else -> this.javaClass // dummy value } }