From 656246cd10d5531f23fa52770f11fc02e3aa07c2 Mon Sep 17 00:00:00 2001 From: lishaoxia1985 Date: Fri, 10 May 2019 22:35:54 +0800 Subject: [PATCH] all chinese font can be show well --- .../BasicHelp_Simplified_Chinese.json | 2 +- .../assets/jsons/Translations/Buildings.json | 4 ++ android/assets/jsons/Translations/Other.json | 12 +++--- .../jsons/Translations/Units,Promotions.json | 38 ++++++++----------- core/src/com/unciv/ui/utils/Fonts.kt | 8 +++- 5 files changed, 31 insertions(+), 33 deletions(-) diff --git a/android/assets/jsons/BasicHelp/BasicHelp_Simplified_Chinese.json b/android/assets/jsons/BasicHelp/BasicHelp_Simplified_Chinese.json index 3952c73097..330253822b 100644 --- a/android/assets/jsons/BasicHelp/BasicHelp_Simplified_Chinese.json +++ b/android/assets/jsons/BasicHelp/BasicHelp_Simplified_Chinese.json @@ -33,7 +33,7 @@ }, { name:"快乐", - description: "基本资源。\n每座城市会-3快乐，每个人口-1快乐。\n可以通过建造建筑或奇观和开发奢侈资源来增加快乐。\n文明处于不满(快乐为负)状态时，城市的食物产出将-75%，这会极大地减慢城市发展速度，同时军事单位的战斗力也会下降。\n当积累足够的快乐时，你的文明就会开启一个黄金时代！" + description: "基本资源。\n每座城市-3快乐，每个人口-1快乐。\n可以通过建造建筑或奇观和开发奢侈资源来增加快乐。\n文明处于不满(快乐为负)状态时，城市的食物产出将-75%，这会极大地减慢城市发展速度，同时军事单位的战斗力也会下降。\n当积累足够的快乐时，你的文明就会开启一个黄金时代！" }, { name:"单位与战斗", diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json index 9a4f6cb57b..1f62429f9e 100644 --- a/android/assets/jsons/Translations/Buildings.json +++ b/android/assets/jsons/Translations/Buildings.json @@ -807,6 +807,10 @@ German:"Bank" } + "Hanse":{ + Simplified_Chinese:"汉萨会馆" + } + "Forbidden Palace":{ Italian:"Palazzo Proibito" Russian:"Запретный дворец" diff --git a/android/assets/jsons/Translations/Other.json b/android/assets/jsons/Translations/Other.json index 7cfc5fe614..449456f71b 100644 --- a/android/assets/jsons/Translations/Other.json +++ b/android/assets/jsons/Translations/Other.json @@ -416,7 +416,7 @@ German:"Gold" Dutch:"Goud" Spanish:"Oro" - Simplified_Chinese:"金" + Simplified_Chinese:"Gold"//the basic resource and the luxury resource have the same name,if we do not solve this problem,i will not translate it. Portuguese:"Ouro" Japanese:"ゴールド" } @@ -2060,11 +2060,13 @@ Russian:"Юниты сражаются, как будто они в полной силе, даже когда повреждены" } - /* "Germany":{ Italian:"Germania" French:"Allemagne" + Simplified_Chinese:"德意志" } + +/* "India":{ Italian:"India" @@ -3179,9 +3181,5 @@ Simplified_Chinese:"语言设置" French:"langage" } - - //If don't do this,when game runs in Chinese,it will be lost some font. - "missing Chinese font":{ - Simplified_Chinese:"。、，：查俱左右详细介绍节哪绚丽多彩概念奇妙等虽然待健康但距影响范围欢迎第就也而应然情况该智屏按钮促几例如脑终至因容熟还永味着担告问题激励善竭尽求感谢-足让旅教扣余灾菜程库差财富谋慢乏较貌段看控少缺顶遥栏随稍奖棒如果欢请评系页允些使径断穿份吧具起旦决赛难绝送依另皂白注许负两" - } + } diff --git a/android/assets/jsons/Translations/Units,Promotions.json b/android/assets/jsons/Translations/Units,Promotions.json index 346a745a72..ed9af0826a 100644 --- a/android/assets/jsons/Translations/Units,Promotions.json +++ b/android/assets/jsons/Translations/Units,Promotions.json @@ -493,7 +493,7 @@ German:"Langbogenschütze" } - "Chu-ko-nu":{ + "Chu-Ko-Nu":{ Italian:"Chu-ko-nu"//same in Italian Romanian:"Chu-ko-nu" Spanish:"Chu-ko-nu" @@ -502,13 +502,20 @@ //same in French } // Chinese unique, can transliterate -/* - "Chu-Ko-Nu":{ //it seems that it's useless to keep this one - //Same as in Italian - Simplified_Chinese:"诸葛弩" - French:"Chu Ko Nu" + "Logistics":{ + Italian:"Logistica" + German:"Logistick" + French:"Logistique" + Russian:"Логистика" + Simplified_Chinese:"后勤补给" + } + + "1 additional attack per turn":{ + Italian:"L'unità può attaccare due volte ogni turno" + French:"1 attaque supplémentaire par tour" + Russian:"Дополнительная атака за ход" + Simplified_Chinese:"每回合有一次额外的攻击机会" } -*/ "Trebuchet":{ Italian:"Trabocco" @@ -1508,7 +1515,7 @@ German:"Reichweite" French:"Portée" Russian:"Расширенный радиус" - Simplified_Chinese:"攻击范围" + Simplified_Chinese:"Range"// the unit attribute and the promotions ability have the same name,if we do not solve this problem,i will not translate it. } "+1 Range":{ @@ -1550,21 +1557,6 @@ Simplified_Chinese:"闪击战术" } - "1 additional attack per turn":{ - Italian:"L'unità può attaccare due volte ogni turno" - French:"1 attaque supplémentaire par tour" - Russian:"Дополнительная атака за ход" - Simplified_Chinese:"每回合有一次额外的攻击机会" - } - - "Logistics":{ - Italian:"Logistica" - German:"Logistick" - French:"Logistique" - Russian:"Логистика" - Simplified_Chinese:"后勤补给" - } - "Bombardment I":{ Italian:"Bombardamento I" German:"Bombardierung I" diff --git a/core/src/com/unciv/ui/utils/Fonts.kt b/core/src/com/unciv/ui/utils/Fonts.kt index b3db18b290..e5ec8e866d 100644 --- a/core/src/com/unciv/ui/utils/Fonts.kt +++ b/core/src/com/unciv/ui/utils/Fonts.kt @@ -29,10 +29,14 @@ class Fonts { "‘?’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.*|" if (font == "Arial") return defaultText if (font == chineseFont) { - val constants = "‘?’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.*|" val charSet = HashSet() - charSet.addAll(constants.asIterable()) charSet.addAll(defaultText.asIterable()) + var BasicHelpString=Gdx.files.internal("jsons/BasicHelp/BasicHelp_Simplified_Chinese.json").readString() + BasicHelpString.forEach {charSet.add(it)} + var NationsString=Gdx.files.internal("jsons/Nations_Simplified_Chinese.json").readString() + NationsString.forEach {charSet.add(it)} + var TutorialsString=Gdx.files.internal("jsons/Tutorials/Tutorials_Simplified_Chinese.json").readString() + TutorialsString.forEach {charSet.add(it)} for (entry in GameBasics.Translations.entries) { for (lang in entry.value) { if (lang.key.contains("Chinese")) charSet.addAll(lang.value.asIterable())