widelands-dev team mailing list archive

[GunChleoc <fios@xxxxxxxxxxxxxxxxxxx>]

GunChleoc has proposed merging lp:~widelands-dev/widelands/bug-1298309 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #1298309 in widelands: "Message "We lost a %s to the ocean!" cannot easily be translated"
  https://bugs.launchpad.net/widelands/+bug/1298309

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug-1298309/+merge/215707

2 string fixes for Atlantean campaign + constructionsite/dismantlesite menu images for consistency
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug-1298309/+merge/215707
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug-1298309 into lp:widelands.

=== modified file 'campaigns/atl01.wmf/scripting/init.lua'
--- campaigns/atl01.wmf/scripting/init.lua	2014-03-25 06:18:48 +0000
+++ campaigns/atl01.wmf/scripting/init.lua	2014-04-14 17:24:36 +0000
@@ -73,9 +73,9 @@
 
 function send_building_lost_message(f)
    p1:send_message(_"Building lost!",
-      rt(p(
-         (_"We lost a %s to the ocean!"):format(f.immovable.descname)
-      )), { field = f, popup = true }
+      rt("image=tribes/atlanteans/".. f.immovable.name .."/menu.png",
+         p(_"We lost a building to the ocean!")
+      ), { field = f, popup = true }
    )
 end
 
@@ -93,7 +93,6 @@
    local hq = wl.Game().map.player_slots[1].starting_field.immovable
    hq:set_workers{shipwright=1}
 
-
    -- Place some buildings
    prefilled_buildings(p1,
       {"high_tower", first_tower_field.x, first_tower_field.y,

=== modified file 'campaigns/atl01.wmf/scripting/texts.lua'
--- campaigns/atl01.wmf/scripting/texts.lua	2014-04-03 12:16:03 +0000
+++ campaigns/atl01.wmf/scripting/texts.lua	2014-04-14 17:24:36 +0000
@@ -419,7 +419,7 @@
 [[I received an invitation from Sidolus. The first day of training in the newly finished labyrinth will be tomorrow. ]] ..
 [[The dungeon is done as well and will start its work soon. I am looking forward to tomorrow; ]] ..
 [[I am very interested in how our soldiers are trained, and I wonder if the additional workload ]] ..
-[[will keep them from bullying the civil population.]]
+[[will keep them from bullying the civilian population.]]
       ))
    }
 }

=== added file 'tribes/atlanteans/constructionsite/menu.png'
Binary files tribes/atlanteans/constructionsite/menu.png	1970-01-01 00:00:00 +0000 and tribes/atlanteans/constructionsite/menu.png	2014-04-14 17:24:36 +0000 differ
=== added file 'tribes/atlanteans/dismantlesite/menu.png'
Binary files tribes/atlanteans/dismantlesite/menu.png	1970-01-01 00:00:00 +0000 and tribes/atlanteans/dismantlesite/menu.png	2014-04-14 17:24:36 +0000 differ
=== added file 'tribes/barbarians/dismantlesite/menu.png'
Binary files tribes/barbarians/dismantlesite/menu.png	1970-01-01 00:00:00 +0000 and tribes/barbarians/dismantlesite/menu.png	2014-04-14 17:24:36 +0000 differ
=== added file 'tribes/empire/constructionsite/menu.png'
Binary files tribes/empire/constructionsite/menu.png	1970-01-01 00:00:00 +0000 and tribes/empire/constructionsite/menu.png	2014-04-14 17:24:36 +0000 differ
=== added file 'tribes/empire/dismantlesite/menu.png'
Binary files tribes/empire/dismantlesite/menu.png	1970-01-01 00:00:00 +0000 and tribes/empire/dismantlesite/menu.png	2014-04-14 17:24:36 +0000 differ