[Freecol-commits] SF.net SVN: freecol:[9572] freecol/trunk

[<bur...@us...>]

Revision: 9572
          http://freecol.svn.sourceforge.net/freecol/?rev=9572&view=rev
Author:   burschik
Date:     2012-01-22 09:21:27 +0000 (Sun, 22 Jan 2012)
Log Message:
-----------
Add Indian role messages.

Modified Paths:
--------------
    freecol/trunk/data/strings/FreeColMessages.properties
    freecol/trunk/test/src/net/sf/freecol/client/gui/i18n/MessagesTest.java

Modified: freecol/trunk/data/strings/FreeColMessages.properties
===================================================================
--- freecol/trunk/data/strings/FreeColMessages.properties	2012-01-22 04:13:24 UTC (rev 9571)
+++ freecol/trunk/data/strings/FreeColMessages.properties	2012-01-22 09:21:27 UTC (rev 9572)
@@ -1754,6 +1754,8 @@
 model.unit.pettyCriminal.name={{plural:%number%|one=Petty Criminal|other=Petty Criminals|default=Petty Criminal}}
 model.unit.indianConvert.name={{plural:%number%|one=Indian Convert|other=Indian Converts|default=Indian Convert}}
 model.unit.brave.name={{plural:%number%|one=Brave|other=Braves|default=Brave}}
+model.unit.brave.soldier=Armed Brave
+model.unit.brave.dragoon=Indian Dragoon
 model.unit.colonialRegular.name={{plural:%number%|one=Colonial Regular|other=Colonial Regulars|default=Colonial Regular}}
 model.unit.colonialRegular.soldier=Continental Army
 model.unit.colonialRegular.dragoon=Continental Cavalry
@@ -1874,13 +1876,6 @@
 model.unit.dragoon.description=The Dragoon is a mounted military unit.
 model.unit.scout.description=The Scout is good at exploring the New World, particularly Indian settlements and Lost City Rumors, but not as good as the Experienced Scout.
 model.unit.missionary.description=The Missionary is able to establish a mission in an Indian settlement in order to convert the natives. He is less skilled than the Jesuit Missionary, however.
-model.unit.unarmed.description=Unarmed (TODO)
-model.unit.armed.description=Armed (TODO)
-model.unit.mounted.description=Mounted (TODO)
-model.unit.kingsCavalry.description=King's cavalry (TODO)
-model.unit.colonialCavalry.description=Colonial cavalry (TODO)
-model.unit.veteranDragoon.description=Veteran Dragoon (TODO)
-model.unit.indianDragoon.description=Indian Dragoon (TODO)
 
 # Goods
 model.goods.food.name={{plural:%amount%|one=Food|other=Food|default=Food}}

Modified: freecol/trunk/test/src/net/sf/freecol/client/gui/i18n/MessagesTest.java
===================================================================
--- freecol/trunk/test/src/net/sf/freecol/client/gui/i18n/MessagesTest.java	2012-01-22 04:13:24 UTC (rev 9571)
+++ freecol/trunk/test/src/net/sf/freecol/client/gui/i18n/MessagesTest.java	2012-01-22 09:21:27 UTC (rev 9572)
@@ -322,6 +322,17 @@
         unit.changeEquipment(muskets, 1);
         assertEquals("Veteran Dragoon", Messages.message(Messages.getLabel(unit)));
 
+        // Indian Braves
+        unit = new ServerUnit(game, null, dutch, spec().getUnitType("model.unit.brave"));
+        assertEquals(0, unit.getEquipment().getCount(muskets));
+        assertEquals("Brave", Messages.message(Messages.getLabel(unit)));
+
+        unit.changeEquipment(muskets, 1);
+        assertEquals("Armed Brave", Messages.message(Messages.getLabel(unit)));
+
+        unit.changeEquipment(horses, 1);
+        assertEquals("Indian Dragoon", Messages.message(Messages.getLabel(unit)));
+
         // Hardy Pioneers
         unit = new ServerUnit(game, null, dutch, spec().getUnitType("model.unit.hardyPioneer"));
         assertEquals(5, unit.getEquipment().getCount(tools));
@@ -330,6 +341,7 @@
         unit.changeEquipment(tools, -5);
         assertEquals("Hardy Pioneer (no tools)", Messages.message(Messages.getLabel(unit)));
 
+        // Jesuit Missionaries
         unit = new ServerUnit(game, null, dutch, spec().getUnitType("model.unit.jesuitMissionary"));
         assertEquals(1, unit.getEquipment().getCount(bible));
         assertEquals("Jesuit Missionary", Messages.message(Messages.getLabel(unit)));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.