summaryrefslogtreecommitdiff
path: root/indra/newview/llworldmapview.cpp
diff options
context:
space:
mode:
authorEugene Mutavchi <emutavchi@productengine.com>2010-04-21 20:05:45 +0300
committerEugene Mutavchi <emutavchi@productengine.com>2010-04-21 20:05:45 +0300
commitb36539f23f6eba4ac20f53bbb134e2562421dc9c (patch)
treeb3c6ab7b52ce245f343293aa44bfbd821e4150a9 /indra/newview/llworldmapview.cpp
parentd645d418b3d8de1c2d3665925056151a824de715 (diff)
Fixed normal EXT-6853 ([HARDCODE] Number of "Person"/ "People" in World Map - hard coded?) - added 2 UI strings: "world_map_person" and "world_map_people".
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/290/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
-rw-r--r--indra/newview/llworldmapview.cpp16
1 files changed, 4 insertions, 12 deletions
diff --git a/indra/newview/llworldmapview.cpp b/indra/newview/llworldmapview.cpp
index 151180aae7..081a3721b1 100644
--- a/indra/newview/llworldmapview.cpp
+++ b/indra/newview/llworldmapview.cpp
@@ -1072,18 +1072,10 @@ BOOL LLWorldMapView::handleToolTip( S32 x, S32 y, MASK mask )
// zoomed out, so don't display anything about the count. JC
if (agent_count > 0)
{
- // Merov: i18n horror!!! Even using gettext(), concatenating strings is not localizable.
- // The singular/plural switch form here under might make no sense in some languages. Don't do that.
- message += llformat("\n%d ", agent_count);
-
- if (agent_count == 1)
- {
- message += "person";
- }
- else
- {
- message += "people";
- }
+ LLStringUtil::format_map_t string_args;
+ string_args["[NUMBER]"] = llformat("%d", agent_count);
+ message += '\n';
+ message += getString((agent_count == 1 ? "world_map_person" : "world_map_people") , string_args);
}
}
tooltip_msg.assign( message );