Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorExMix <rahuba.youri@mapswithme.com>2014-08-07 15:51:50 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:23:52 +0300
commita8bc35a29fef4be34aca9540249ef2908e07b542 (patch)
treecaf4672952276036277e59e45684a4095438e9f2 /map/country_status_display.cpp
parent3d9b69fcb6544bb06a3e15deab96c8dc241098a0 (diff)
move formating into resource file
Diffstat (limited to 'map/country_status_display.cpp')
-rw-r--r--map/country_status_display.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/map/country_status_display.cpp b/map/country_status_display.cpp
index 06254d4845..5f08e7b5d1 100644
--- a/map/country_status_display.cpp
+++ b/map/country_status_display.cpp
@@ -76,16 +76,14 @@ void CountryStatusDisplay::cache()
{
case storage::EInQueue:
{
- string const s = dn + "\n";
- SetStatusMessage<string, int>("country_status_added_to_queue", &s);
+ SetStatusMessage<string, int>("country_status_added_to_queue", &dn);
break;
}
case storage::EDownloading:
{
int const percent = m_countryProgress.first * 100 / m_countryProgress.second;
- string const s = "\n" + dn + "\n";
- SetStatusMessage<string, int>("country_status_downloading", &s, &percent);
+ SetStatusMessage<string, int>("country_status_downloading", &dn, &percent);
break;
}
@@ -96,7 +94,7 @@ void CountryStatusDisplay::cache()
{
m_downloadButton->setIsVisible(true);
string const msg = m_controller->GetStringsBundle()->GetString("country_status_download");
- m_downloadButton->setText(strings::Format(msg, "\n" + dn));
+ m_downloadButton->setText(strings::Format(msg, dn));
}
break;
@@ -104,9 +102,7 @@ void CountryStatusDisplay::cache()
{
m_downloadButton->setIsVisible(true);
m_downloadButton->setText(m_controller->GetStringsBundle()->GetString("try_again"));
-
- string const s = "\n" + dn + "\n";
- SetStatusMessage<string, int>("country_status_download_failed", &s);
+ SetStatusMessage<string, int>("country_status_download_failed", &dn);
setPivot(pivot());
break;