Author: shadowmaster
Date: Wed Mar 21 16:59:42 2012
New Revision: 53599
URL: http://svn.gna.org/viewcvs/wesnoth?rev=53599&view=rev
Log:
addon/mg: Simplify add-on publish/delete entry labels both code-wise and
i18n-wise
* Use variable interpolation to ease localization efforts instead of
arbitrarily concatenating strings following English rules
* Use the vgettext() wrapper instead of
utils::interpolate_variables_into_string(), which takes up too much space in my
text editor for nothing
* Use "Publish: foo" and "Delete foo:" instead of "Publish add-on: foo" and
"Delete add-on: foo"; this UI dialog is all about add-ons, so we don't really
need to keep telling people we are working with add-ons in it like parrots
Modified:
trunk/src/addon/manager_ui.cpp
Modified: trunk/src/addon/manager_ui.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/addon/manager_ui.cpp?rev=53599&r1=53598&r2=53599&view=diff
==============================================================================
--- trunk/src/addon/manager_ui.cpp (original)
+++ trunk/src/addon/manager_ui.cpp Wed Mar 21 16:59:42 2012
@@ -516,16 +516,24 @@
}
if(show_publish_delete) {
+ utils::string_map i18n_syms;
+
// Enter publish and remote deletion options
foreach(const std::string& pub_id, can_publish_ids) {
+ i18n_syms["addon_title"] = make_addon_title(pub_id);
+
static const std::string publish_icon =
"icons/icon-addon-publish.png";
- const std::string text = _("Publish add-on: ") +
make_addon_title(pub_id);
+ const std::string& text = vgettext("Publish:
$addon_title", i18n_syms);
+
options.push_back(IMAGE_PREFIX + publish_icon +
COLUMN_SEPARATOR + font::GOOD_TEXT + text);
filter_options.push_back(text);
}
foreach(const std::string& del_id, can_delete_ids) {
+ i18n_syms["addon_title"] = make_addon_title(del_id);
+
static const std::string delete_icon =
"icons/icon-addon-delete.png";
- const std::string text = _("Delete add-on: ") +
make_addon_title(del_id);
+ const std::string& text = vgettext("Delete:
$addon_title", i18n_syms);
+
options.push_back(IMAGE_PREFIX + delete_icon +
COLUMN_SEPARATOR + font::BAD_TEXT + text);
filter_options.push_back(text);
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
