diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-04-23 13:24:09 -0700 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-04-23 13:24:09 -0700 |
| commit | a42dcc3f5e8dbddbc83500371bcb3d0ca8d91a3b (patch) | |
| tree | 3eafe790e4b51122d6d56c025856a8eb3ca36880 /indra/newview/llworldmapview.cpp | |
| parent | e1b3919a4fec68f57be6d6de2839dc31b654609f (diff) | |
| parent | e82ed4e8761be902cf3a4d80c337e0cd44d41b17 (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llworldmapview.cpp')
| -rw-r--r-- | indra/newview/llworldmapview.cpp | 16 |
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 ); |