From f01a5140ff1ea6c0b977a5ce847277a3822f2fd1 Mon Sep 17 00:00:00 2001 From: "r.kuznetsov" Date: Thu, 28 Jan 2016 14:21:01 +0300 Subject: [PATCH] [old-map-downloader] Changed "cancel" string id for country status --- drape_frontend/gui/country_status_helper.cpp | 2 +- iphone/Maps/Classes/MapsAppDelegate.mm | 2 +- map/framework.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drape_frontend/gui/country_status_helper.cpp b/drape_frontend/gui/country_status_helper.cpp index 6dcc7aa4d4..2979af5250 100644 --- a/drape_frontend/gui/country_status_helper.cpp +++ b/drape_frontend/gui/country_status_helper.cpp @@ -57,7 +57,7 @@ void FormatMapSize(uint64_t sizeInBytes, string & units, size_t & sizeToDownload char const * DownloadMapButtonID = "country_status_download"; char const * DownloadMapWithoutSizeButtonID = "country_status_download_without_size"; char const * TryAgainButtonID = "try_again"; -char const * DownloadCancelButtonID = "country_download_cancel"; +char const * DownloadCancelButtonID = "cancel"; char const * DownloadingLabelID = "country_status_downloading"; char const * DownloadingFailedID = "country_status_download_failed"; char const * InQueueID = "country_status_added_to_queue"; diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 31ce1da732..43c93eb1ef 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -69,7 +69,7 @@ void InitLocalizedStrings() f.AddString("country_status_download", [L(@"country_status_download") UTF8String]); f.AddString("country_status_download_without_routing", [L(@"country_status_download_without_routing") UTF8String]); f.AddString("country_status_download_failed", [L(@"country_status_download_failed") UTF8String]); - f.AddString("country_download_cancel", [L(@"cancel") UTF8String]); + f.AddString("cancel", [L(@"cancel") UTF8String]); f.AddString("try_again", [L(@"try_again") UTF8String]); // Default texts for bookmarks added in C++ code (by URL Scheme API) f.AddString("dropped_pin", [L(@"dropped_pin") UTF8String]); diff --git a/map/framework.cpp b/map/framework.cpp index 56d5166886..f35a91fa77 100644 --- a/map/framework.cpp +++ b/map/framework.cpp @@ -278,7 +278,7 @@ Framework::Framework() m_stringsBundle.SetDefaultString("country_status_download_without_size", "Download map"); m_stringsBundle.SetDefaultString("country_status_download_failed", "Downloading\n^\nhas failed"); m_stringsBundle.SetDefaultString("country_status_download_without_routing", "Download map\nwithout routing (^ ^)"); - m_stringsBundle.SetDefaultString("country_download_cancel", "Cancel"); + m_stringsBundle.SetDefaultString("cancel", "Cancel"); m_stringsBundle.SetDefaultString("try_again", "Try Again"); m_stringsBundle.SetDefaultString("not_enough_free_space_on_sdcard", "Not enough space for downloading");