From 9260116fac641e448879cbc1b50da9838fb35799 Mon Sep 17 00:00:00 2001 From: Frederic Jacobs Date: Sat, 19 Jul 2014 13:00:52 -1000 Subject: [PATCH] New wording for support features --- Signal/src/environment/LocalizableText.h | 2 +- Signal/src/view controllers/SettingsViewController.m | 5 +++-- Signal/translations/en.lproj/Localizable.strings | 9 ++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Signal/src/environment/LocalizableText.h b/Signal/src/environment/LocalizableText.h index 33b6d9321..a5a9b9df0 100644 --- a/Signal/src/environment/LocalizableText.h +++ b/Signal/src/environment/LocalizableText.h @@ -105,7 +105,7 @@ #define SETTINGS_SENDLOG NSLocalizedString(@"SETTINGS_SENDLOG", @"") #define SETTINGS_SENDLOG_WAITING NSLocalizedString(@"SETTINGS_SENDLOGS_WAITING", @"") -#define SETTINGS_SENDLOG_ALERT_TITLE NSLocalizedString(@"SETTINGS_SENDLOG_ALERT_TITLE", @"") +#define SETTINGS_SENDLOG_ALERT_TITLE NSLocalizedString(@"SETTINGS_SENDLOG", @"") #define SETTINGS_SENDLOG_ALERT_BODY NSLocalizedString(@"SETTINGS_SENDLOG_ALERT_BODY",@"") #define SETTINGS_SENDLOG_ALERT_PASTE NSLocalizedString(@"SETTINGS_SENDLOG_ALERT_PASTE", @"") #define SETTINGS_SENDLOG_ALERT_EMAIL NSLocalizedString(@"SETTINGS_SENDLOG_ALERT_EMAIL", @"") diff --git a/Signal/src/view controllers/SettingsViewController.m b/Signal/src/view controllers/SettingsViewController.m index 2da4acb91..45d1f2197 100644 --- a/Signal/src/view controllers/SettingsViewController.m +++ b/Signal/src/view controllers/SettingsViewController.m @@ -324,9 +324,9 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; - (void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)buttonIndex{ if (buttonIndex == 0) { - [self pasteBoardCopy:gistURL]; - } else{ [self submitEmail:gistURL]; + } else{ + [self pasteBoardCopy:gistURL]; } } @@ -338,6 +338,7 @@ static NSString *const CHECKBOX_EMPTY_IMAGE_NAME = @"checkbox_empty"; - (void)pasteBoardCopy:(NSString*)url{ UIPasteboard *pb = [UIPasteboard generalPasteboard]; [pb setString:url]; + [[UIApplication sharedApplication] openURL:[NSURL URLWithString:@"https://github.com/WhisperSystems/Signal-iOS/issues"]]; } - (void)findAndLocalizeLabelsForView:(UIView *)view { diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings index 861087025..f5af3b814 100644 --- a/Signal/translations/en.lproj/Localizable.strings +++ b/Signal/translations/en.lproj/Localizable.strings @@ -79,7 +79,7 @@ "MAIN_MENU_OPTION_DIALER" = "Dialer"; "MAIN_MENU_OPTION_FAVOURITES" = "Favorites"; "MAIN_MENU_OPTION_RECENT_CALLS" = "Recents"; -"MAIN_MENU_OPTION_REPORT_BUG" = "Report Bug"; +"MAIN_MENU_OPTION_REPORT_BUG" = "Support"; "MAIN_MENU_OPTION_SETTINGS" = "Settings"; "MUTE_BUTTON_TITLE" = "Mute"; "NOTIFICATION_TEXT" = "Some of your contacts have recently registered numbers with Signal!"; @@ -126,10 +126,9 @@ "SETTINGS_RINGTONE" = "Ringtone"; "SETTINGS_SENDLOG" = "Submit Debug Log"; "SETTINGS_SENDLOGS_WAITING" = "Sending anonymized log file\n Please wait..."; -"SETTINGS_SENDLOG_ALERT_TITLE" = "Submit debug log"; -"SETTINGS_SENDLOG_ALERT_BODY" = "Do you want to copy the log URL to the pasteboard or submit it by email?"; -"SETTINGS_SENDLOG_ALERT_PASTE" = "Pasteboard"; -"SETTINGS_SENDLOG_ALERT_EMAIL" = "Email"; +"SETTINGS_SENDLOG_ALERT_BODY" = "Bugs can be reported by email or by copying the log in a GitHub Issue (advanced)."; +"SETTINGS_SENDLOG_ALERT_PASTE" = "Email"; +"SETTINGS_SENDLOG_ALERT_EMAIL" = "GitHub Issue"; "SETTINGS_SENDLOG_FAILED_TITLE" = "Failed to submit debug log"; "SETTINGS_SENDLOG_FAILED_BODY" = "The debug log could not be submitted. Please try again."; "SETTINGS_VIBRATE_ON_RING" = "Vibrate on Ring";