Author: mordante
Date: Mon Jul 14 17:10:28 2008
New Revision: 28025
URL: http://svn.gna.org/viewcvs/wesnoth?rev=28025&view=rev
Log:
Fixed a broken translation which gave all females the prefix female^ on
alignment description.
Modified:
trunk/changelog
trunk/src/unit_types.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=28025&r1=28024&r2=28025&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Mon Jul 14 17:10:28 2008
@@ -4,6 +4,8 @@
* user interface:
* Make the load and recruit hotkey use the ctrl instead of cmd key on non
Mac systems
+ * Fixed a broken translation which gave all females the prefix female^ on
+ alignment description
Version 1.5.2:
* campaigns:
Modified: trunk/src/unit_types.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_types.cpp?rev=28025&r1=28024&r2=28025&view=diff
==============================================================================
--- trunk/src/unit_types.cpp (original)
+++ trunk/src/unit_types.cpp Mon Jul 14 17:10:28 2008
@@ -873,15 +873,16 @@
return experience_needed_;
}
-
-
const char* unit_type::alignment_description(unit_type::ALIGNMENT align,
unit_race::GENDER gender)
{
- static const char* aligns[] = { N_("lawful"), N_("neutral"),
N_("chaotic") };
- static const char* aligns_female[] = { N_("female^lawful"),
N_("female^neutral"), N_("female^chaotic") };
- const char** tlist = (gender == unit_race::MALE ? aligns :
aligns_female);
-
- return (gettext(tlist[align]));
+ static const t_string aligns[] =
+ { _("lawful"), _("neutral"), _("chaotic") };
+ static const t_string aligns_female[] =
+ { _("female^lawful"), _("female^neutral"), _("female^chaotic")
};
+
+ return gender == unit_race::MALE
+ ? aligns[align].c_str()
+ : aligns_female[align].c_str();
}
const char* unit_type::alignment_id(unit_type::ALIGNMENT align)
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
