Merge lp:~alocritani/widelands/resource_info_in_editor into lp:widelands

[Angelo Locritani]

"resource amount" line only visible if there's a resource
sorry for asking 2 merges so close

[Angelo Locritani (alocritani)]

do you think it can be inserted before Feature Freeze or should we wait for build18? Only a single translatable string has been changed.

[Angelo Locritani (alocritani)]

please ignore my previous comment
sorry, it seems it is in rev 6327 but no mail nor status change for the branch. no idea about reason.

[SirVer (sirver)]

The reason is the following: I merged it and forgot to push, then someone else commited stuff to trunk. So I rebase and somehow some metadata of the merge got lost.

It is completly in trunk though. Also: thanks for including the help.lua into catalogues - I somehow missed this.

=== modified file 'src/editor/tools/editor_info_tool.cc'
--- src/editor/tools/editor_info_tool.cc	2012-03-18 20:21:02 +0000
+++ src/editor/tools/editor_info_tool.cc	2012-03-19 06:07:23 +0000
@@ -92,23 +92,24 @@
 	buf += _("3) Resources Info\n");
 	{
 		Widelands::Resource_Index ridx = f.get_resources();
-		int ramount = f.get_resources_amount();		
-
-		if (ramount > 0){
-			snprintf
-			(buf1, sizeof(buf1), _("Resource name: %s\n"), world.get_resource(ridx)->name().c_str());
+		int ramount = f.get_resources_amount();
+
+		if (ramount > 0) {
+			snprintf
+			(buf1, sizeof(buf1), _(" Resource name: %s\n"), world.get_resource(ridx)->name().c_str());
+			buf += buf1;
+
+			snprintf
+			(buf1, sizeof(buf1), _(" Resource amount: %i\n"), ramount);
+			buf += buf1;
 		}
 		else
 		{
 			snprintf
-			(buf1, sizeof(buf1), _("Resource name: %s\n"), _("<none>"));
+			(buf1, sizeof(buf1), _(" Resource name: %s\n"), _("none"));
+			buf += buf1;
 		}
 
-		buf += buf1;
-
-		snprintf
-		(buf1, sizeof(buf1), _("Resource amount: %i\n"), ramount);
-		buf += buf1;
 	}
 
 	buf += _("4) Map Info\n Name: ");