diff options
author | McCabe Maxsted | 2010-04-26 20:06:23 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-04-26 20:06:23 -0700 |
commit | e563e2c2cc66fa9f3b47c4814d70f9800d957026 (patch) | |
tree | a2a9ca5bfeaf747b76b744f007da061ad15110c2 /linden/indra/newview/hippoGridManager.cpp | |
parent | Merge commit 'jacek/next' into next (diff) | |
download | meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.zip meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.gz meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.bz2 meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.xz |
Ported currency changes from Hippo (#237) and fixed some labels Hippo missed (also fixed #200 in the process)
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/hippoGridManager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp index 9acdd69..60c33e8 100644 --- a/linden/indra/newview/hippoGridManager.cpp +++ b/linden/indra/newview/hippoGridManager.cpp | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <llfile.h> | 13 | #include <llfile.h> |
14 | #include <llhttpclient.h> | 14 | #include <llhttpclient.h> |
15 | #include <llsdserialize.h> | 15 | #include <llsdserialize.h> |
16 | #include "lltrans.h" | ||
16 | #include "llviewercontrol.h" | 17 | #include "llviewercontrol.h" |
17 | #include "llweb.h" | 18 | #include "llweb.h" |
18 | 19 | ||
@@ -441,14 +442,14 @@ std::string HippoGridInfo::getDirectoryFee() const | |||
441 | { | 442 | { |
442 | std::string fee; | 443 | std::string fee; |
443 | formatFee(fee, mDirectoryFee, true); | 444 | formatFee(fee, mDirectoryFee, true); |
444 | if (fee != "free") fee += "/week"; | 445 | if (fee != LLTrans::getString("hippo_label_free")) fee += "/" + LLTrans::getString("hippo_label_week"); |
445 | return fee; | 446 | return fee; |
446 | } | 447 | } |
447 | 448 | ||
448 | void HippoGridInfo::formatFee(std::string &fee, int cost, bool showFree) const | 449 | void HippoGridInfo::formatFee(std::string &fee, int cost, bool showFree) const |
449 | { | 450 | { |
450 | if (showFree && (cost == 0)) { | 451 | if (showFree && (cost == 0)) { |
451 | fee = "free"; | 452 | fee = LLTrans::getString("hippo_label_free"); |
452 | } else { | 453 | } else { |
453 | fee = llformat("%s%d", getCurrencySymbol().c_str(), cost); | 454 | fee = llformat("%s%d", getCurrencySymbol().c_str(), cost); |
454 | } | 455 | } |