Merge lp:~hjd/widelands/bug682405 into lp:widelands

[Hans Joachim Desserud]

Note:this is more of a request for feedback/code review than an actual merge proposal.

-In the message a user receives when a quarry or fisher's hut run out of stone/fish, the resource name has been made translatable.
-When loading a map, the the tribe names are also translatable.

I have currently not uploaded the changes I have done to the po/widelands/widelands.pot file, as I am not quite sure how they should be handled. Currently I have manually edited the .pot-file and added the msgid/msgstr, to check that the variables are indeed translatable. However, I'm not sure exactly how the .pot-files are generated, and wonder if my manual changes would remain when they are regenerated. What is the best way to handle this?

[SirVer (sirver)]

The *.pot files are generated by utils/buildcat.py by grepping through the source code, lua files and conf files. Your manual changes will be lost.

the resources names should be taken from the worlds catalog and the tribe names should be taken from the tribes catalog, your fix will likely search for them in the widelands catalog.

Also the tribe name displayed to the user should likely be the descr_name() of the tribe, not it's internal name; maybe that's what get_all_tribenames() does. Maybe get_all_tribenames() is also a good place to do the i18n stuff, but it's usage must be checked; maybe it is used elsewhere.

review: Needs Fixing

[Nicolai Hähnle (nha)]

What's the status of this merge? It seems to have been idle for two months now.

[Hans Joachim Desserud (hjd)]

Hi Nicolai. You're right, this has not been touched for a while, and current status is best described as "no longer worked on". As I commented in the bug report (see bug 682405 for elaborate explanation), this turned out to be harder than I first imagined, and while I have tried a few approaches I haven't really gotten any further since last commit.

I changed the bug report from "In progress" in case others wish to work on this, but I should probably have cleaned up this branch as well. Sorry about that. I'll set the branch to abandoned at least, and see if that removes it from the list of active reviews. The review itself doesn't seem to have a status describing the same, so I hope that will be enough.

[Nicolai Hähnle (nha)]

Don't feel bad about it, given time I'm sure this can be resolved eventually. Most importantly, thank you for the update.

[Hans Joachim Desserud (hjd)]

Set status to Rejected to keep it from appearing in the list of active reviews.

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2010-11-01 22:30:23 +0000
+++ src/editor/editorinteractive.cc	2010-11-29 12:02:22 +0000
@@ -167,7 +167,7 @@
 		std::vector<std::string> tribenames;
 		Widelands::Tribe_Descr::get_all_tribenames(tribenames);
 		container_iterate_const(std::vector<std::string>, tribenames, i) {
-			loader_ui.stepf(_("Loading tribe: %s"), i.current->c_str());
+			loader_ui.stepf(_("Loading tribe: %s"), _(i.current->c_str()));
 			egbase().manually_load_tribe(*i.current);
 		}
 	}
@@ -572,7 +572,7 @@
 					Widelands::Tribe_Descr::get_all_tribenames(tribenames);
 					container_iterate_const(std::vector<std::string>, tribenames, i)
 					{
-						loader_ui.stepf(_("Loading tribe: %s"), i.current->c_str());
+						loader_ui.stepf(_("Loading tribe: %s"), _(i.current->c_str()));
 						editor.manually_load_tribe(*i.current);
 					}
 				}

=== modified file 'src/logic/editor_game_base.cc'
--- src/logic/editor_game_base.cc	2010-11-21 11:44:22 +0000
+++ src/logic/editor_game_base.cc	2010-11-29 12:02:22 +0000
@@ -331,7 +331,7 @@
 	m_map->load_graphics(); // especially loads world data
 
 	container_iterate_const(Tribe_Vector, m_tribes, i) {
-		loader_ui.stepf(_("Loading tribe: %s"), (*i.current)->name().c_str());
+		loader_ui.stepf(_("Loading tribe: %s"), _((*i.current)->name().c_str()));
 		(*i.current)->load_graphics();
 	}
 

=== modified file 'src/logic/worker.cc'
--- src/logic/worker.cc	2010-11-21 11:44:22 +0000
+++ src/logic/worker.cc	2010-11-29 12:02:22 +0000
@@ -589,13 +589,17 @@
 	building.send_message
 		(game,
 		 "mine",
-		 _("Out of ") + res_type,
+		 std::string
+			(_
+			 ("Out of "))
+		 +
+		 _(res_type),
 		 std::string
 		 	(_
 		 	 ("The worker of this building cannot find any more resources "
 		 	 "of the following type: "))
 		 +
-		 res_type,
+		 _(res_type),
 		 1800000, 0);
 }