diff --git a/android/assets/jsons/translations/English.properties b/android/assets/jsons/translations/English.properties index 083deb58f5..a350679591 100644 --- a/android/assets/jsons/translations/English.properties +++ b/android/assets/jsons/translations/English.properties @@ -881,9 +881,8 @@ Land or water only = # Requires translation! Brush ([size]): = # The letter shown in the [size] parameter above for setting "Floodfill" - # Requires translation! -F = - # Requires translation! +Floodfill_Abbreviation = F +# Requires translation! Error loading map! = # Requires translation! Map saved successfully! = diff --git a/android/assets/jsons/translations/French.properties b/android/assets/jsons/translations/French.properties index d7174ebaeb..9de8ca3340 100644 --- a/android/assets/jsons/translations/French.properties +++ b/android/assets/jsons/translations/French.properties @@ -485,7 +485,7 @@ Land or water only = Terre ou eau seulement ## Labels/messages Brush ([size]): = Pinceau ([size]) : # The letter shown in the [size] parameter above for setting "Floodfill" -F = R +Floodfill_Abbreviation = R Error loading map! = Erreur de chargement de la carte ! Map saved successfully! = Carte sauvegardée avec succès ! Current map RNG seed: [amount] = Graine RNG de la carte actuelle : [amount] diff --git a/android/assets/jsons/translations/German.properties b/android/assets/jsons/translations/German.properties index d4a4f6d0b9..4f6447b0cd 100644 --- a/android/assets/jsons/translations/German.properties +++ b/android/assets/jsons/translations/German.properties @@ -485,7 +485,7 @@ Land or water only = Nur Land/Wasser ## Labels/messages Brush ([size]): = Pinsel ([size]): # The letter shown in the [size] parameter above for setting "Floodfill" -F = A +Floodfill_Abbreviation = A Error loading map! = Fehler beim Laden der Karte Map saved successfully! = Karte erfolgreich gespeichert! Current map RNG seed: [amount] = Seed der aktuellen Karte: [amount] diff --git a/android/assets/jsons/translations/Indonesian.properties b/android/assets/jsons/translations/Indonesian.properties index 909285bf06..72a7ba4587 100644 --- a/android/assets/jsons/translations/Indonesian.properties +++ b/android/assets/jsons/translations/Indonesian.properties @@ -485,7 +485,7 @@ Land or water only = Darat atau air saja ## Labels/messages Brush ([size]): = Kuas ([size]): # The letter shown in the [size] parameter above for setting "Floodfill" -F = I +Floodfill_Abbreviation = I Error loading map! = Pemuatan peta tidak berhasil! Map saved successfully! = Peta berhasil tersimpan! Current map RNG seed: [amount] = RNG benih peta ini: [amount] diff --git a/android/assets/jsons/translations/Romanian.properties b/android/assets/jsons/translations/Romanian.properties index 718717e3bb..faea12a6eb 100644 --- a/android/assets/jsons/translations/Romanian.properties +++ b/android/assets/jsons/translations/Romanian.properties @@ -486,7 +486,7 @@ Land or water only = Doar pământ sau apă ## Labels/messages Brush ([size]): = Pensulă ([size]): # The letter shown in the [size] parameter above for setting "Floodfill" -F = U +Floodfill_Abbreviation = U Error loading map! = Eroare la încarcarea harții! Map saved successfully! = Harta salvata cu succes! Current map RNG seed: [amount] = Harta curentă RNG seed:[amount] diff --git a/android/assets/jsons/translations/Spanish.properties b/android/assets/jsons/translations/Spanish.properties index c994fccf67..e3b2dda510 100644 --- a/android/assets/jsons/translations/Spanish.properties +++ b/android/assets/jsons/translations/Spanish.properties @@ -486,7 +486,7 @@ Land or water only = Solo tierra y agua ## Labels/messages Brush ([size]): = Pincel ([size]): # The letter shown in the [size] parameter above for setting "Floodfill" -F = C +Floodfill_Abbreviation = C Error loading map! = ¡Error al cargar mapa! Map saved successfully! = ¡Mapa guardado exitosamente! Current map RNG seed: [amount] = Semilla aleatoria actuál del mapa: [amount] diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index d250285daa..0a3cd91e40 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -486,8 +486,9 @@ Land or water only = ## Labels/messages Brush ([size]): = -# The letter shown in the [size] parameter above for setting "Floodfill" -F = +# The single letter shown in the [size] parameter above for setting "Floodfill". +# Please do not make this longer, the associated slider will not handle well. +Floodfill_Abbreviation = Error loading map! = Map saved successfully! = It looks like your map can't be saved! = diff --git a/core/src/com/unciv/ui/mapeditor/MapEditorEditTab.kt b/core/src/com/unciv/ui/mapeditor/MapEditorEditTab.kt index 238a1a7823..af5085bbc7 100644 --- a/core/src/com/unciv/ui/mapeditor/MapEditorEditTab.kt +++ b/core/src/com/unciv/ui/mapeditor/MapEditorEditTab.kt @@ -75,7 +75,7 @@ class MapEditorEditTab( brushCell = add().padLeft(0f) brushSlider = UncivSlider(1f,6f,1f, initial = 1f, getTipText = { getBrushTip(it).tr() }) { brushSize = if (it > 5f) -1 else it.toInt() - brushLabel.setText("Brush ([${getBrushTip(it).take(1)}]):".tr()) + brushLabel.setText("Brush ([${getBrushTip(it, true)}]):".tr()) } add(brushSlider).padLeft(0f) } @@ -320,6 +320,10 @@ class MapEditorEditTab( } companion object { - private fun getBrushTip(value: Float) = if (value > 5f) "Floodfill" else value.toInt().toString() + private fun getBrushTip(value: Float, abbreviate: Boolean = false) = when { + value <= 5f -> value.toInt().toString() + abbreviate -> "Floodfill_Abbreviation" + else -> "Floodfill" + } } }