[ios] Updated string resources, removed unnecessary functionality from iOS UI

This commit is contained in:
Alex Zolotarev 2012-07-17 23:09:29 -07:00 committed by Alex Zolotarev
parent 0811f6a45b
commit c0a3924b4b
17 changed files with 467 additions and 44 deletions

View file

@ -150,4 +150,30 @@
<string name="update_mb_or_kb">Обновить %s</string>
<string name="search_update_maps">Для функции поиска необходимо обновить устаревшие карты</string>
<string name="advise_update_maps">Доступно обновление для следующих карт</string>
<!-- Add New Bookmark Set dialog title -->
<string name="add_new_set">Добавить группу</string>
<!-- Place Page - Add To Bookmarks button -->
<string name="add_to_bookmarks">Добавить в закладки</string>
<!-- Bookmark Color dialog title -->
<string name="bookmark_color">Цвет закладки</string>
<!-- Add Bookmark Set dialog - hint when set name is empty -->
<string name="bookmark_set_name">Название группы</string>
<!-- Bookmark Sets dialog title -->
<string name="bookmark_sets">Группы закладок</string>
<!-- Boormarks - dialog title -->
<string name="bookmarks">Закладки</string>
<!-- Add bookmark dialog - bookmark color -->
<string name="color">Цвет</string>
<!-- Unknown Dropped Pin title, when name can't be determined -->
<string name="dropped_pin">Перемещенная булавка</string>
<!-- Default bookmarks set name -->
<string name="my_places">Мои Закладки</string>
<!-- Add bookmark dialog - bookmark name -->
<string name="name">Имя</string>
<!-- Add bookmark dialog - bookmark address -->
<string name="address">Адрес</string>
<!-- Place Page - Remove Pin button -->
<string name="remove_pin">Удалить булавку</string>
<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
<string name="set">Группа</string>
</resources>

View file

@ -154,4 +154,30 @@
<string name="update_mb_or_kb">Update %s</string>
<string name="search_update_maps">You need updated maps for search function</string>
<string name="advise_update_maps">Update available for this maps</string>
<!-- Add New Bookmark Set dialog title -->
<string name="add_new_set">Add New Set</string>
<!-- Place Page - Add To Bookmarks button -->
<string name="add_to_bookmarks">Add To Bookmarks</string>
<!-- Bookmark Color dialog title -->
<string name="bookmark_color">Bookmark Color</string>
<!-- Add Bookmark Set dialog - hint when set name is empty -->
<string name="bookmark_set_name">Bookmark Set Name</string>
<!-- Bookmark Sets dialog title -->
<string name="bookmark_sets">Bookmark Sets</string>
<!-- Boormarks - dialog title -->
<string name="bookmarks">Bookmarks</string>
<!-- Add bookmark dialog - bookmark color -->
<string name="color">Color</string>
<!-- Unknown Dropped Pin title, when name can't be determined -->
<string name="dropped_pin">Dropped Pin</string>
<!-- Default bookmarks set name -->
<string name="my_places">My Places</string>
<!-- Add bookmark dialog - bookmark name -->
<string name="name">Name</string>
<!-- Add bookmark dialog - bookmark address -->
<string name="address">Address</string>
<!-- Place Page - Remove Pin button -->
<string name="remove_pin">Remove Pin</string>
<!-- Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell -->
<string name="set">Set</string>
</resources>

View file

@ -12,7 +12,7 @@
m_balloon = view;
self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(onSaveClicked)];
self.title = NSLocalizedString(@"Add New Set", @"Add New Bookmark Set dialog title");
self.title = NSLocalizedString(@"add_new_set", @"Add New Bookmark Set dialog title");
}
return self;
}
@ -67,7 +67,7 @@
f.clearButtonMode = UITextFieldViewModeWhileEditing;
f.autocorrectionType = UITextAutocorrectionTypeNo;
f.delegate = self;
f.placeholder = NSLocalizedString(@"Bookmark Set Name", @"Add Bookmark Set dialog - hint when set name is empty");
f.placeholder = NSLocalizedString(@"bookmark_set_name", @"Add Bookmark Set dialog - hint when set name is empty");
cell.accessoryView = f;
cell.selectionStyle = UITableViewCellSelectionStyleNone;
return cell;

View file

@ -19,7 +19,7 @@
{
// Default bookmark pin color
color = [[NSString alloc] initWithString:@"placemark-purple"];
setName = [[NSString alloc] initWithString:NSLocalizedString(@"My Places", @"Default bookmarks set name")];
setName = [[NSString alloc] initWithString:NSLocalizedString(@"my_places", @"Default bookmarks set name")];
pinImage = [[UIImageView alloc] initWithImage:[UIImage imageNamed:self.color]];
m_titleView = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"BookmarkTitle"];
isDisplayed = NO;
@ -119,7 +119,7 @@
globalPosition = pos;
GetFramework().GetAddressInfo(m2::PointD(pos.x, pos.y), m_addressInfo);
if (m_addressInfo.m_name.empty())
self.title = NSLocalizedString(@"Dropped Pin", @"Unknown Dropped Pin title, when name can't be determined");
self.title = NSLocalizedString(@"dropped_pin", @"Unknown Dropped Pin title, when name can't be determined");
else
self.title = [NSString stringWithUTF8String:m_addressInfo.m_name.c_str()];
self.description = [NSString stringWithUTF8String:m_addressInfo.FormatAddress().c_str()];

View file

@ -16,7 +16,7 @@
if (self)
{
m_balloon = view;
self.title = NSLocalizedString(@"Bookmarks", @"Boormarks - dialog title");
self.title = NSLocalizedString(@"bookmarks", @"Boormarks - dialog title");
self.navigationItem.leftBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"maps", @"Bookmarks - Close bookmarks button") style: UIBarButtonItemStyleDone
target:self action:@selector(onCloseButton:)] autorelease];
@ -64,33 +64,14 @@
{
if (indexPath.section == 0)
{
UITableViewCell * cell;
if (indexPath.row == 0)
UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:@"BookmarkSetCell"];
if (!cell)
{
cell = [tableView dequeueReusableCellWithIdentifier:@"BookmarkSetCell"];
if (!cell)
{
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"BookmarkSetCell"] autorelease];
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
cell.textLabel.text = NSLocalizedString(@"Set", @"Bookmarks dialog - Bookmark set cell");
}
cell.detailTextLabel.text = m_balloon.setName;
}
else
{
cell = [tableView dequeueReusableCellWithIdentifier:@"BookmarkSetVisibilityCell"];
if (!cell)
{
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"BookmarkSetVisibilityCell"] autorelease];
UISwitch * onOffSwitch = [[[UISwitch alloc] init] autorelease];
[onOffSwitch addTarget:self action:@selector(onVisibilitySwitched:) forControlEvents:UIControlEventValueChanged];
cell.accessoryView = onOffSwitch;
cell.textLabel.text = NSLocalizedString(@"Show on the map", @"Bookmarks dialog - Show on the map on/off switch");
cell.selectionStyle = UITableViewCellSelectionStyleNone;
}
BookmarkCategory const * cat = GetFramework().GetBmCategory([m_balloon.setName UTF8String]);
((UISwitch *)cell.accessoryView).on = cat ? cat->IsVisible() : YES;
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleValue1 reuseIdentifier:@"BookmarkSetCell"] autorelease];
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
cell.textLabel.text = NSLocalizedString(@"set", @"Bookmarks dialog - Bookmark set cell");
}
cell.detailTextLabel.text = m_balloon.setName;
return cell;
}
else
@ -121,12 +102,9 @@
{
if (indexPath.section == 0)
{
if (indexPath.row == 0)
{
SelectSetVC * ssVC = [[SelectSetVC alloc] initWithBalloonView:m_balloon andEditMode:NO];
[self.navigationController pushViewController:ssVC animated:YES];
[ssVC release];
}
SelectSetVC * ssVC = [[SelectSetVC alloc] initWithBalloonView:m_balloon andEditMode:NO];
[self.navigationController pushViewController:ssVC animated:YES];
[ssVC release];
}
else
{

View file

@ -103,10 +103,10 @@
f.clearButtonMode = UITextFieldViewModeWhileEditing;
f.autocorrectionType = UITextAutocorrectionTypeNo;
f.delegate = self;
f.placeholder = NSLocalizedString(@"Name", @"Add bookmark dialog - bookmark name");
f.placeholder = NSLocalizedString(@"name", @"Add bookmark dialog - bookmark name");
f.textColor = cell.detailTextLabel.textColor;
cell.accessoryView = f;
cell.textLabel.text = NSLocalizedString(@"Name", @"Add bookmark dialog - bookmark name");
cell.textLabel.text = NSLocalizedString(@"name", @"Add bookmark dialog - bookmark name");
cell.selectionStyle = UITableViewCellSelectionStyleNone;
}
break;
@ -116,7 +116,7 @@
break;
case 2:
cell.textLabel.text = NSLocalizedString(@"Color", @"Add bookmark dialog - bookmark color");
cell.textLabel.text = NSLocalizedString(@"color", @"Add bookmark dialog - bookmark color");
break;
}
}
@ -143,9 +143,9 @@
cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:@"cell"] autorelease];
cell.textLabel.textAlignment = UITextAlignmentCenter;
if (indexPath.row == 0)
cell.textLabel.text = NSLocalizedString(@"Add To Bookmarks", @"Place Page - Add To Bookmarks button");
cell.textLabel.text = NSLocalizedString(@"add_to_bookmarks", @"Place Page - Add To Bookmarks button");
else
cell.textLabel.text = NSLocalizedString(@"Remove Pin", @"Place Page - Remove Pin button");
cell.textLabel.text = NSLocalizedString(@"remove_pin", @"Place Page - Remove Pin button");
}
return cell;
}

View file

@ -21,7 +21,7 @@ static NSString * g_colors [] = {
{
m_balloon = view;
self.title = NSLocalizedString(@"Bookmark Color", @"Bookmark Color dialog title");
self.title = NSLocalizedString(@"bookmark_color", @"Bookmark Color dialog title");
}
return self;
}

View file

@ -13,7 +13,7 @@
m_balloon = view;
m_editModeEnabled = enabled;
self.title = NSLocalizedString(@"Bookmark Sets", @"Bookmark Sets dialog title");
self.title = NSLocalizedString(@"bookmark_sets", @"Bookmark Sets dialog title");
}
return self;
}
@ -62,7 +62,7 @@
// Customize cell
if (indexPath.section == 0 && m_editModeEnabled)
{
cell.textLabel.text = NSLocalizedString(@"Add New Set...", @"Bookmark Sets dialog - Add New Set button");
cell.textLabel.text = NSLocalizedString(@"add_new_set", @"Bookmark Sets dialog - Add New Set button");
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
}
else

View file

@ -241,3 +241,44 @@
"update_mb_or_kb" = "Update %@";
"search_update_maps" = "You need updated maps for search function";
"advise_update_maps" = "Update available for this maps";
/* Add New Bookmark Set dialog title */
"add_new_set" = "Add New Set";
/* Place Page - Add To Bookmarks button */
"add_to_bookmarks" = "Add To Bookmarks";
/* Bookmark Color dialog title */
"bookmark_color" = "Bookmark Color";
/* Add Bookmark Set dialog - hint when set name is empty */
"bookmark_set_name" = "Bookmark Set Name";
/* Bookmark Sets dialog title */
"bookmark_sets" = "Bookmark Sets";
/* Boormarks - dialog title */
"bookmarks" = "Bookmarks";
/* Add bookmark dialog - bookmark color */
"color" = "Color";
/* Unknown Dropped Pin title, when name can't be determined */
"dropped_pin" = "Dropped Pin";
/* Default bookmarks set name */
"my_places" = "My Places";
/* Add bookmark dialog - bookmark name */
"name" = "Name";
/* Add bookmark dialog - bookmark address */
"address" = "Address";
/* Place Page - Remove Pin button */
"remove_pin" = "Remove Pin";
/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
"set" = "Set";

View file

@ -241,3 +241,44 @@
"update_mb_or_kb" = "Update %@";
"search_update_maps" = "You need updated maps for search function";
"advise_update_maps" = "Update available for this maps";
/* Add New Bookmark Set dialog title */
"add_new_set" = "Add New Set";
/* Place Page - Add To Bookmarks button */
"add_to_bookmarks" = "Add To Bookmarks";
/* Bookmark Color dialog title */
"bookmark_color" = "Bookmark Color";
/* Add Bookmark Set dialog - hint when set name is empty */
"bookmark_set_name" = "Bookmark Set Name";
/* Bookmark Sets dialog title */
"bookmark_sets" = "Bookmark Sets";
/* Boormarks - dialog title */
"bookmarks" = "Bookmarks";
/* Add bookmark dialog - bookmark color */
"color" = "Color";
/* Unknown Dropped Pin title, when name can't be determined */
"dropped_pin" = "Dropped Pin";
/* Default bookmarks set name */
"my_places" = "My Places";
/* Add bookmark dialog - bookmark name */
"name" = "Name";
/* Add bookmark dialog - bookmark address */
"address" = "Address";
/* Place Page - Remove Pin button */
"remove_pin" = "Remove Pin";
/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
"set" = "Set";

View file

@ -241,3 +241,44 @@
"update_mb_or_kb" = "Update %@";
"search_update_maps" = "You need updated maps for search function";
"advise_update_maps" = "Update available for this maps";
/* Add New Bookmark Set dialog title */
"add_new_set" = "Add New Set";
/* Place Page - Add To Bookmarks button */
"add_to_bookmarks" = "Add To Bookmarks";
/* Bookmark Color dialog title */
"bookmark_color" = "Bookmark Color";
/* Add Bookmark Set dialog - hint when set name is empty */
"bookmark_set_name" = "Bookmark Set Name";
/* Bookmark Sets dialog title */
"bookmark_sets" = "Bookmark Sets";
/* Boormarks - dialog title */
"bookmarks" = "Bookmarks";
/* Add bookmark dialog - bookmark color */
"color" = "Color";
/* Unknown Dropped Pin title, when name can't be determined */
"dropped_pin" = "Dropped Pin";
/* Default bookmarks set name */
"my_places" = "My Places";
/* Add bookmark dialog - bookmark name */
"name" = "Name";
/* Add bookmark dialog - bookmark address */
"address" = "Address";
/* Place Page - Remove Pin button */
"remove_pin" = "Remove Pin";
/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
"set" = "Set";

View file

@ -241,3 +241,44 @@
"update_mb_or_kb" = "Update %@";
"search_update_maps" = "You need updated maps for search function";
"advise_update_maps" = "Update available for this maps";
/* Add New Bookmark Set dialog title */
"add_new_set" = "Add New Set";
/* Place Page - Add To Bookmarks button */
"add_to_bookmarks" = "Add To Bookmarks";
/* Bookmark Color dialog title */
"bookmark_color" = "Bookmark Color";
/* Add Bookmark Set dialog - hint when set name is empty */
"bookmark_set_name" = "Bookmark Set Name";
/* Bookmark Sets dialog title */
"bookmark_sets" = "Bookmark Sets";
/* Boormarks - dialog title */
"bookmarks" = "Bookmarks";
/* Add bookmark dialog - bookmark color */
"color" = "Color";
/* Unknown Dropped Pin title, when name can't be determined */
"dropped_pin" = "Dropped Pin";
/* Default bookmarks set name */
"my_places" = "My Places";
/* Add bookmark dialog - bookmark name */
"name" = "Name";
/* Add bookmark dialog - bookmark address */
"address" = "Address";
/* Place Page - Remove Pin button */
"remove_pin" = "Remove Pin";
/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
"set" = "Set";

View file

@ -241,3 +241,44 @@
"update_mb_or_kb" = "Update %@";
"search_update_maps" = "You need updated maps for search function";
"advise_update_maps" = "Update available for this maps";
/* Add New Bookmark Set dialog title */
"add_new_set" = "Add New Set";
/* Place Page - Add To Bookmarks button */
"add_to_bookmarks" = "Add To Bookmarks";
/* Bookmark Color dialog title */
"bookmark_color" = "Bookmark Color";
/* Add Bookmark Set dialog - hint when set name is empty */
"bookmark_set_name" = "Bookmark Set Name";
/* Bookmark Sets dialog title */
"bookmark_sets" = "Bookmark Sets";
/* Boormarks - dialog title */
"bookmarks" = "Bookmarks";
/* Add bookmark dialog - bookmark color */
"color" = "Color";
/* Unknown Dropped Pin title, when name can't be determined */
"dropped_pin" = "Dropped Pin";
/* Default bookmarks set name */
"my_places" = "My Places";
/* Add bookmark dialog - bookmark name */
"name" = "Name";
/* Add bookmark dialog - bookmark address */
"address" = "Address";
/* Place Page - Remove Pin button */
"remove_pin" = "Remove Pin";
/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
"set" = "Set";

View file

@ -241,3 +241,44 @@
"update_mb_or_kb" = "Update %@";
"search_update_maps" = "You need updated maps for search function";
"advise_update_maps" = "Update available for this maps";
/* Add New Bookmark Set dialog title */
"add_new_set" = "Add New Set";
/* Place Page - Add To Bookmarks button */
"add_to_bookmarks" = "Add To Bookmarks";
/* Bookmark Color dialog title */
"bookmark_color" = "Bookmark Color";
/* Add Bookmark Set dialog - hint when set name is empty */
"bookmark_set_name" = "Bookmark Set Name";
/* Bookmark Sets dialog title */
"bookmark_sets" = "Bookmark Sets";
/* Boormarks - dialog title */
"bookmarks" = "Bookmarks";
/* Add bookmark dialog - bookmark color */
"color" = "Color";
/* Unknown Dropped Pin title, when name can't be determined */
"dropped_pin" = "Dropped Pin";
/* Default bookmarks set name */
"my_places" = "My Places";
/* Add bookmark dialog - bookmark name */
"name" = "Name";
/* Add bookmark dialog - bookmark address */
"address" = "Address";
/* Place Page - Remove Pin button */
"remove_pin" = "Remove Pin";
/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
"set" = "Set";

View file

@ -241,3 +241,44 @@
"update_mb_or_kb" = "Update %@";
"search_update_maps" = "You need updated maps for search function";
"advise_update_maps" = "Update available for this maps";
/* Add New Bookmark Set dialog title */
"add_new_set" = "Add New Set";
/* Place Page - Add To Bookmarks button */
"add_to_bookmarks" = "Add To Bookmarks";
/* Bookmark Color dialog title */
"bookmark_color" = "Bookmark Color";
/* Add Bookmark Set dialog - hint when set name is empty */
"bookmark_set_name" = "Bookmark Set Name";
/* Bookmark Sets dialog title */
"bookmark_sets" = "Bookmark Sets";
/* Boormarks - dialog title */
"bookmarks" = "Bookmarks";
/* Add bookmark dialog - bookmark color */
"color" = "Color";
/* Unknown Dropped Pin title, when name can't be determined */
"dropped_pin" = "Dropped Pin";
/* Default bookmarks set name */
"my_places" = "My Places";
/* Add bookmark dialog - bookmark name */
"name" = "Name";
/* Add bookmark dialog - bookmark address */
"address" = "Address";
/* Place Page - Remove Pin button */
"remove_pin" = "Remove Pin";
/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
"set" = "Set";

View file

@ -241,3 +241,44 @@
"update_mb_or_kb" = "Обновить %@";
"search_update_maps" = "Для функции поиска необходимо обновить устаревшие карты";
"advise_update_maps" = "Доступно обновление для следующих карт";
/* Add New Bookmark Set dialog title */
"add_new_set" = "Добавить группу";
/* Place Page - Add To Bookmarks button */
"add_to_bookmarks" = "Добавить в закладки";
/* Bookmark Color dialog title */
"bookmark_color" = "Цвет закладки";
/* Add Bookmark Set dialog - hint when set name is empty */
"bookmark_set_name" = "Название группы";
/* Bookmark Sets dialog title */
"bookmark_sets" = "Группы закладок";
/* Boormarks - dialog title */
"bookmarks" = "Закладки";
/* Add bookmark dialog - bookmark color */
"color" = "Цвет";
/* Unknown Dropped Pin title, when name can't be determined */
"dropped_pin" = "Перемещенная булавка";
/* Default bookmarks set name */
"my_places" = "Мои Закладки";
/* Add bookmark dialog - bookmark name */
"name" = "Имя";
/* Add bookmark dialog - bookmark address */
"address" = "Адрес";
/* Place Page - Remove Pin button */
"remove_pin" = "Удалить булавку";
/* Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell */
"set" = "Группа";

View file

@ -675,3 +675,68 @@
[advise_update_maps]
en = Update available for this maps
ru = Доступно обновление для следующих карт
[add_new_set]
en = Add New Set
tags = ios
comment = Add New Bookmark Set dialog title
ru = Добавить группу
[add_to_bookmarks]
en = Add To Bookmarks
tags = ios
comment = Place Page - Add To Bookmarks button
ru = Добавить в закладки
[bookmark_color]
en = Bookmark Color
tags = ios
comment = Bookmark Color dialog title
ru = Цвет закладки
[bookmark_set_name]
en = Bookmark Set Name
tags = ios
comment = Add Bookmark Set dialog - hint when set name is empty
ru = Название группы
[bookmark_sets]
en = Bookmark Sets
tags = ios
comment = Bookmark Sets dialog title
ru = Группы закладок
[bookmarks]
en = Bookmarks
tags = ios
comment = Boormarks - dialog title
ru = Закладки
[color]
en = Color
tags = ios
comment = Add bookmark dialog - bookmark color
ru = Цвет
[dropped_pin]
en = Dropped Pin
tags = ios
comment = Unknown Dropped Pin title, when name can't be determined
ru = Перемещенная булавка
[my_places]
en = My Places
tags = ios
comment = Default bookmarks set name
ru = Мои Закладки
[name]
en = Name
tags = ios
comment = Add bookmark dialog - bookmark name
ru = Имя
[address]
en = Address
tags = ios
comment = Add bookmark dialog - bookmark address
ru = Адрес
[remove_pin]
en = Remove Pin
tags = ios
comment = Place Page - Remove Pin button
ru = Удалить булавку
[set]
en = Set
tags = ios
comment = Add bookmark dialog - bookmark set, Bookmarks dialog - Bookmark set cell
ru = Группа