From 3f8bc6e7c55889e85abace6882b6189f5880cdd8 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Thu, 17 Nov 2011 20:19:35 +0300 Subject: [PATCH] [downloader][ios] Closed #406 - Done on the right, about on the left --- .../Maps/Settings/CountriesViewController.mm | 15 +++++++-------- iphone/Maps/en.lproj/Localizable.strings | Bin 16232 -> 16082 bytes 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/iphone/Maps/Settings/CountriesViewController.mm b/iphone/Maps/Settings/CountriesViewController.mm index ae733f36a7..69d79f8834 100644 --- a/iphone/Maps/Settings/CountriesViewController.mm +++ b/iphone/Maps/Settings/CountriesViewController.mm @@ -81,17 +81,16 @@ static bool IsOurIndex(TIndex const & theirs, TIndex const & ours) if ((self = [super initWithNibName:nil bundle:nil])) { self.navigationItem.title = header; - - UIBarButtonItem * aboutButton = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"About", @"Settings/Downloader - About the program button") style: UIBarButtonItemStylePlain - target:self action:@selector(onAboutButton:)] autorelease]; - self.navigationItem.rightBarButtonItem = aboutButton; - // Show Close button only on the first page + // Show About button only on the first page if ([header compare:NSLocalizedString(@"Download", @"Settings/Downloader - Main downloader window title")] == NSOrderedSame) { - UIBarButtonItem * closeButton = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Close", @"Settings/Downloader - Close downloader button") style: UIBarButtonItemStylePlain - target:self action:@selector(onCloseButton:)] autorelease]; - self.navigationItem.leftBarButtonItem = closeButton; + UIBarButtonItem * aboutButton = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"About", @"Settings/Downloader - About the program button") style: UIBarButtonItemStylePlain + target:self action:@selector(onAboutButton:)] autorelease]; + self.navigationItem.leftBarButtonItem = aboutButton; } + UIBarButtonItem * closeButton = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Done", @"Settings/Downloader - Close downloader button") style: UIBarButtonItemStyleDone + target:self action:@selector(onCloseButton:)] autorelease]; + self.navigationItem.rightBarButtonItem = closeButton; } return self; } diff --git a/iphone/Maps/en.lproj/Localizable.strings b/iphone/Maps/en.lproj/Localizable.strings index 499e716f66d4e80e2a352d8c51f7dab90582f610..00abf5b236dc263e25a5b9b4e8c20bca8f745d1c 100644 GIT binary patch delta 56 zcmaD+cd2$m0>|bL9E;c{_i$KDp1{i@n#YjJpv0iSU<<@b3@!}$3_y{|fgIMGC-JAL KZSFF=#{mEv?-4@) delta 122 zcmcaq`=V|`0>|VB5;~Ka_$_3e8FCo%8HyQF8I%|l7;J%9i2*LQIgn!`+vYz0G_}bN zylT9;Kvl&+n8=XMkUH5=UYs|Sp#aD(0*a&nMdG