mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 09:48:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

More translation stuff

Browse Source
This commit is contained in:
Yair Morgenstern
2018-06-25 21:50:56 +03:00
parent a59d6e7a46
commit 4bbffe318b
5 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
android/assets/jsons/Translations.json
View File

@ -7,12 +7,7 @@
German:"Nächste Runde" German:"Nächste Runde"
} }
"Waiting":{ // Displayed when next turn is being...turned "Working...":{ // Displayed when next turn is being...turned
Italian:"In attesa"
Russian:"В ожидании"
French:"Attendre"
Romanian:"Aşteptare"
German:"Warten..."
} }
"Turn":{ // For main screen at top left, e.g. Turn 234 "Turn":{ // For main screen at top left, e.g. Turn 234
@ -633,20 +628,20 @@
German:"Ein(e) feindliche(r) [unit] wurde zerstört beim Angriff auf unsere(n) [ourUnit]" // Gender sensitive German:"Ein(e) feindliche(r) [unit] wurde zerstört beim Angriff auf unsere(n) [ourUnit]" // Gender sensitive
} }
"spotted near our territory":{ "An enemy [unit] was spotted near our territory":{
Italian:"avvistato vicino al nostro territorio" Italian:"Un'unità [unit] avvistato vicino al nostro territorio"
Russian:"пятнистый у нашей территории" Russian:"Враг [unit] пятнистый у нашей территории"
French:"repéré près de notre territoire" French:"Un ennemi [unit] repéré près de notre territoire"
Romanian:"reperat în apropierea teritoriului nostru" Romanian:"Un inamic [unit] reperat în apropierea teritoriului nostru"
German:"wurde nahe unserer Grenzen entdeckt" German:"Ein(e) feindliche(r) [unit] wurde nahe unserer Grenzen entdeckt"
} }
"spotted in our territory":{ "An enemy [unit] was spotted in our territory":{
Italian:"avvistato nel nostro territorio" Italian:"Un'unità [unit] avvistato nel nostro territorio"
Russian:"пятнистый на нашей территории" Russian:"Враг [unit] пятнистый на нашей территории"
French:"repéré sur notre territoire" French:"Un ennemi [unit] repéré sur notre territoire"
Romanian:"reperat pe teritoriul nostru" Romanian:"Un inamic [unit] reperat pe teritoriul nostru"
German:"wurde in unseren Grenzen entdeckt" German:"Ein(e) feindliche(r) [unit] wurde in unseren Grenzen entdeckt"
} }
@ -1609,6 +1604,8 @@
German:"Zukünftige Technologien" German:"Zukünftige Technologien"
} }
"Who knows what the future holds?":{}
// Tech Eras // Tech Eras
"Ancient":{} "Ancient":{}
"Classical":{} "Classical":{}

4
android/build.gradle
View File

@ -21,8 +21,8 @@ android {
applicationId "com.unciv.game" applicationId "com.unciv.game"
minSdkVersion 14 minSdkVersion 14
targetSdkVersion 26 targetSdkVersion 26
versionCode 93 versionCode 94
versionName "2.5.7" versionName "2.5.8"
} }
buildTypes { buildTypes {
release { release {

2
core/src/com/unciv/logic/GameInfo.kt
View File

@ -55,7 +55,7 @@ class GameInfo {
&& (it.getOwner()==player || it.neighbors.any { neighbor -> neighbor.getOwner()==player }) } && (it.getOwner()==player || it.neighbors.any { neighbor -> neighbor.getOwner()==player }) }
for(enemyUnitTile in enemyUnitsCloseToTerritory) { for(enemyUnitTile in enemyUnitsCloseToTerritory) {
val inOrNear = if(enemyUnitTile.getOwner()==player) "in" else "near" val inOrNear = if(enemyUnitTile.getOwner()==player) "in" else "near"
player.addNotification("Enemy spotted $inOrNear our territory!", enemyUnitTile.position, Color.RED) player.addNotification("An enemy [${enemyUnitTile.militaryUnit!!.name}] was spotted $inOrNear our territory", enemyUnitTile.position, Color.RED)
} }
turns++ turns++

4
core/src/com/unciv/logic/automation/UnitAutomation.kt
View File

@ -49,12 +49,12 @@ class UnitAutomation{
val rangeOfAttack = if(MapUnitCombatant(unit).isMelee()) 1 else unit.getBaseUnit().range val rangeOfAttack = if(MapUnitCombatant(unit).isMelee()) 1 else unit.getBaseUnit().range
val attackableTiles = ArrayList<AttackableTile>() val attackableTiles = ArrayList<AttackableTile>()
// The +0.09 solves a bug where you've moved 2/3 road tiles, // The >0.1 (instead of >0) solves a bug where you've moved 2/3 road tiles,
// you come to move a third (distance is less that remaining movements), // you come to move a third (distance is less that remaining movements),
// and then later we round it off to a whole. // and then later we round it off to a whole.
// So the poor unit thought it could attack from the tile, but when it comes to do so it has no moveement points! // So the poor unit thought it could attack from the tile, but when it comes to do so it has no moveement points!
// Silly floats, basically // Silly floats, basically
val tilesToAttackFrom = distanceToTiles.filter { (it.value+0.09) < unit.currentMovement } val tilesToAttackFrom = distanceToTiles.filter { unit.currentMovement - it.value > 0.1 }
.map { it.key } .map { it.key }
.filter { unit.canMoveTo(it) || it==unit.getTile() } .filter { unit.canMoveTo(it) || it==unit.getTile() }
for(reachableTile in tilesToAttackFrom){ // tiles we'll still have energy after we reach there for(reachableTile in tilesToAttackFrom){ // tiles we'll still have energy after we reach there

7
core/src/com/unciv/models/gamebasics/unit/Unit.kt
View File

@ -46,7 +46,7 @@ class Unit : INamed, IConstruction, ICivilopedia {
fun getDescription(forPickerScreen:Boolean): String { fun getDescription(forPickerScreen:Boolean): String {
val sb = StringBuilder() val sb = StringBuilder()
if(baseDescription!=null) sb.appendln(baseDescription) if(baseDescription!=null) sb.appendln(baseDescription!!.tr())
if(!forPickerScreen) { if(!forPickerScreen) {
if (unbuildable) sb.appendln("Unbuildable") if (unbuildable) sb.appendln("Unbuildable")
else sb.appendln("Cost: $cost") else sb.appendln("Cost: $cost")
@ -60,8 +60,9 @@ class Unit : INamed, IConstruction, ICivilopedia {
} }
if(uniques!=null){ if(uniques!=null){
for(unique in uniques!!) for(unique in uniques!!) {
sb.appendln(unique) sb.appendln(unique.tr())
}
} }
sb.appendln("{Movement}: $movement".tr()) sb.appendln("{Movement}: $movement".tr())
return sb.toString() return sb.toString()