#43: More Buffs localization

Arcnor · Oct 15, 2014 · 83a45b6 · 83a45b6
1 parent 0be1c94
commit 83a45b6
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 25 deletions.
diff --git a/android/assets/i18n/l10n.properties b/android/assets/i18n/l10n.properties
@@ -336,10 +336,14 @@ mob_larva_name = god's larva
 buff_amok_name = Amok
 buff_barkskin_name = Barkskin
 buff_bleeding_name = Bleeding
+buff_bleeding_killed = You bled to death...
 buff_blindness_name = Blinded
 buff_burning_name = Burning
+buff_burning_killed = You burned to death...
+buff_burning_burns = {0} burns up!
 buff_charm_name = Charmed
 buff_combo_name = Combo
+buff_combo_combo = {0,number,integer} hit combo!
 buff_cripple_name = Crippled
 buff_frost_name = Frozen
 buff_fury_name = Fury
@@ -351,8 +355,10 @@ buff_levitation_name = Levitating
 buff_light_name = Illuminated
 buff_mindvision_name = Mind vision
 buff_ooze_name = Caustic ooze
+buff_ooze_killed = Caustic ooze killed you...
 buff_paralysis_name = Paralysed
 buff_poison_name = Poisoned
+buff_poison_killed = You died from poison...
 buff_roots_name = Rooted
 buff_shadows_name = Shadowmelded
 buff_slow_name = Slowed

diff --git a/core/src/com/watabou/pixeldungeon/actors/buffs/Bleeding.java b/core/src/com/watabou/pixeldungeon/actors/buffs/Bleeding.java
@@ -30,7 +30,8 @@
 
 public class Bleeding extends Buff {
 	private static final String TXT_NAME = "buff_bleeding_name";
-
+	private static final String TXT_HERO_KILLED = "buff_bleeding_killed";
+
 	protected int level;
 
 	private static final String BUNDLE_KEY_LEVEL = "level";
@@ -76,7 +77,7 @@ public boolean act() {
 
 				if (target == Dungeon.hero && !target.isAlive()) {
 					Dungeon.fail( tr(ResultDescriptions.BLEEDING, Dungeon.depth) );
-					GLog.n( "You bled to death..." );
+					GLog.n(tr(TXT_HERO_KILLED));
 				}
 
 				spend( TICK );

diff --git a/core/src/com/watabou/pixeldungeon/actors/buffs/Burning.java b/core/src/com/watabou/pixeldungeon/actors/buffs/Burning.java
@@ -43,26 +43,25 @@
 
 public class Burning extends Buff implements Hero.Doom {
 	private static final String TXT_NAME = "buff_burning_name";
+	private static final String TXT_HERO_KILLED = "buff_burning_killed";
+	private static final String TXT_BURNS_UP = "buff_burning_burns";
 
-	private static final String TXT_BURNS_UP		= "%s burns up!";
-	private static final String TXT_BURNED_TO_DEATH	= "You burned to death...";
-
 	private static final float DURATION = 8f;
 
 	private float left;
 
-	private static final String LEFT	= "left";
+	private static final String BUNDLE_KEY_LEFT = "left";
 
 	@Override
 	public void storeInBundle( Bundle bundle ) {
 		super.storeInBundle( bundle );
-		bundle.put( LEFT, left );
+		bundle.put(BUNDLE_KEY_LEFT, left );
 	}
 
 	@Override
 	public void restoreFromBundle( Bundle bundle ) {
 		super.restoreFromBundle(bundle);
-		left = bundle.getFloat( LEFT );
+		left = bundle.getFloat(BUNDLE_KEY_LEFT);
 	}
 
 	@Override
@@ -82,7 +81,7 @@ public boolean act() {
 				if (item instanceof Scroll) {
 
 					item = item.detach( ((Hero)target).belongings.backpack );
-					GLog.w( TXT_BURNS_UP, item.toString() );
+					GLog.w(tr(TXT_BURNS_UP, item.toString()));
 
 					Heap.burnFX( target.pos );
 
@@ -151,6 +150,6 @@ public void onDeath() {
 		Badges.validateDeathFromFire();
 
 		Dungeon.fail( tr(ResultDescriptions.BURNING, Dungeon.depth) );
-		GLog.n( TXT_BURNED_TO_DEATH );
+		GLog.n(tr(TXT_HERO_KILLED));
 	}
 }
diff --git a/core/src/com/watabou/pixeldungeon/actors/buffs/Combo.java b/core/src/com/watabou/pixeldungeon/actors/buffs/Combo.java
@@ -26,8 +26,7 @@
 
 public class Combo extends Buff {
 	private static final String TXT_NAME = "buff_combo_name";
-
-	private static final String TXT_COMBO = "%d hit combo!";
+	private static final String TXT_COMBO = "buff_combo_combo";
 
 	public int count = 0;
 
@@ -49,7 +48,7 @@ public int hit( Char enemy, int damage ) {
 
 			Badges.validateMasteryCombo( count );
 
-			GLog.p( TXT_COMBO, count );
+			GLog.p(tr(TXT_COMBO, count));
 			postpone( 1.41f - count / 10f );
 			return (int)(damage * (count - 2) / 5f);
 

diff --git a/core/src/com/watabou/pixeldungeon/actors/buffs/Ooze.java b/core/src/com/watabou/pixeldungeon/actors/buffs/Ooze.java
@@ -27,8 +27,7 @@
 
 public class Ooze extends Buff {
 	private static final String TXT_NAME = "buff_ooze_name";
-
-	private static final String TXT_HERO_KILLED = "%s killed you...";
+	private static final String TXT_HERO_KILLED = "buff_ooze_killed";
 
 	public int damage	= 1;
 
@@ -48,7 +47,7 @@ public boolean act() {
 			target.damage( damage, this );
 			if (!target.isAlive() && target == Dungeon.hero) {
 				Dungeon.fail( tr(ResultDescriptions.OOZE, Dungeon.depth) );
-				GLog.n( TXT_HERO_KILLED, toString() );
+				GLog.n(tr(TXT_HERO_KILLED));
 			}
 			spend( TICK );
 		}

diff --git a/core/src/com/watabou/pixeldungeon/actors/buffs/Poison.java b/core/src/com/watabou/pixeldungeon/actors/buffs/Poison.java
@@ -31,24 +31,25 @@
 
 public class Poison extends Buff implements Hero.Doom {
 	private static final String TXT_NAME = "buff_poison_name";
-
+	private static final String TXT_HERO_KILLED = "buff_poison_killed";
+
 	public static final int DOT	= 2;
-	
+
 	protected float left;
 
-	private static final String LEFT	= "left";
+	private static final String BUNDLE_KEY_LEFT = "left";
 
 	@Override
 	public void storeInBundle( Bundle bundle ) {
 		super.storeInBundle( bundle );
-		bundle.put( LEFT, left );
+		bundle.put(BUNDLE_KEY_LEFT, left );
 
 	}
 
 	@Override
 	public void restoreFromBundle( Bundle bundle ) {
 		super.restoreFromBundle( bundle );
-		left = bundle.getFloat( LEFT );
+		left = bundle.getFloat(BUNDLE_KEY_LEFT);
 	}
 
 	public void set( float duration ) {
@@ -95,6 +96,6 @@ public void onDeath() {
 		Badges.validateDeathFromPoison();
 
 		Dungeon.fail( tr(ResultDescriptions.POISON, Dungeon.depth) );
-		GLog.n( "You died from poison..." );
+		GLog.n(tr(TXT_HERO_KILLED));
 	}
 }
diff --git a/core/src/com/watabou/pixeldungeon/actors/buffs/Shadows.java b/core/src/com/watabou/pixeldungeon/actors/buffs/Shadows.java
@@ -31,19 +31,19 @@ public class Shadows extends Invisibility {
 
 	protected float left;
 
-	private static final String LEFT	= "left";
+	private static final String BUNDLE_KEY_LEFT = "left";
 
 	@Override
 	public void storeInBundle( Bundle bundle ) {
 		super.storeInBundle( bundle );
-		bundle.put( LEFT, left );
+		bundle.put(BUNDLE_KEY_LEFT, left );
 
 	}
 
 	@Override
 	public void restoreFromBundle( Bundle bundle ) {
 		super.restoreFromBundle( bundle );
-		left = bundle.getFloat( LEFT );
+		left = bundle.getFloat(BUNDLE_KEY_LEFT);
 	}
 
 	@Override