From e8ae6d67b169044bd1710615458ae6aa435d2962 Mon Sep 17 00:00:00 2001 From: RiseT Date: Sat, 26 Nov 2016 21:40:25 +0100 Subject: [PATCH] Change safety number strings to be singular // FREEBIE Closes #5894 --- res/menu/verify_identity.xml | 2 +- res/values/strings.xml | 36 ++++++++----------- res/xml/recipient_preferences.xml | 2 +- .../securesms/ConfirmIdentityDialog.java | 4 +-- .../securesms/MessageRecipientListItem.java | 2 +- .../securesms/VerifyIdentityActivity.java | 14 ++++---- .../database/model/MessageRecord.java | 2 +- .../database/model/SmsMessageRecord.java | 2 +- .../database/model/ThreadRecord.java | 2 +- 9 files changed, 30 insertions(+), 36 deletions(-) diff --git a/res/menu/verify_identity.xml b/res/menu/verify_identity.xml index a09af25053..6163830bf4 100644 --- a/res/menu/verify_identity.xml +++ b/res/menu/verify_identity.xml @@ -2,7 +2,7 @@ diff --git a/res/values/strings.xml b/res/values/strings.xml index 896f52b17d..7a8bfb8be3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -74,13 +74,8 @@ Incoming call - The - safety numbers for %1$s have changed. This could either mean that someone is trying to - intercept your communication, or that %2$s simply re-installed Signal. - - You may wish to verify - safety numbers for this contact. - + Your safety number with %1$s has changed. This could either mean that someone is trying to intercept your communication, or that %2$s simply reinstalled Signal. + You may wish to verify your safety number with this contact. Accept @@ -362,7 +357,7 @@ Failed to send - New safety numbers + New safety number Error storing MMS! @@ -393,7 +388,7 @@ %s is on Signal, say hey! You set disappearing message time to %1$s. %1$s set disappearing message time to %2$s. - Your safety numbers with %s have changed + Your safety number with %s has changed. @@ -544,7 +539,7 @@ Received key exchange message for invalid protocol version. - Received message with new safety numbers. Tap to process and display. + Received message with new safety number. Tap to process and display. You reset the secure session. %s reset the secure session. Duplicate message. @@ -559,17 +554,16 @@ Media message %s is on Signal, say hey! Disappearing message time set to %s - Your safety numbers with %s have changed + Your safety number with %s has changed. - Your contact is running an old version of Signal, please ask them to update before verifying safety numbers. + Your contact is running an old version of Signal, please ask them to update before verifying your safety number. Your contact is running a newer version of Signal with an incompatible QR code format. Please update to compare. - You\'re attempting to verify safety numbers with %1$s, but scanned %2$s instead. - The scanned QR code is not a correctly formatted safety number verification code. Please try scanning again. - Share safety numbers via... - Our Signal safety numbers: + The scanned QR code is not a correctly formatted safety number verification code. Please try scanning again. + Share safety number via... + Our Signal safety number: It looks like you don\'t have any apps to share to. - No safety numbers to compare were found in the clipboard + No safety number to compare was found in the clipboard Initiate despite existing request? @@ -843,7 +837,7 @@ Block Color Color for this contact - Verify safety numbers + Verify safety number Signal Call @@ -940,11 +934,11 @@ Add members - Learn more about verifying safety numbers.]]> + Learn more about verifying safety numbers]]> Tap to scan - Share safety numbers + Share safety number Some issues need your attention. @@ -962,7 +956,7 @@ Select contacts Signal detected Change passphrase - Verify safety numbers + Verify safety number Submit debug log Media preview All images diff --git a/res/xml/recipient_preferences.xml b/res/xml/recipient_preferences.xml index 0744845c2f..3c5beb89cf 100644 --- a/res/xml/recipient_preferences.xml +++ b/res/xml/recipient_preferences.xml @@ -37,7 +37,7 @@ app:numColumns="5" /> diff --git a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java b/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java index 2761c594f9..cbc113a39f 100644 --- a/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java +++ b/src/org/thoughtcrime/securesms/ConfirmIdentityDialog.java @@ -50,9 +50,9 @@ public class ConfirmIdentityDialog extends AlertDialog { super(context); Recipient recipient = RecipientFactory.getRecipientForId(context, mismatch.getRecipientId(), false); String name = recipient.toShortString(); - String introduction = String.format(context.getString(R.string.ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different), name, name); + String introduction = String.format(context.getString(R.string.ConfirmIdentityDialog_your_safety_number_with_s_has_changed), name, name); SpannableString spannableString = new SpannableString(introduction + " " + - context.getString(R.string.ConfirmIdentityDialog_you_may_wish_to_verify_this_contact)); + context.getString(R.string.ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact)); spannableString.setSpan(new VerifySpan(context, mismatch), introduction.length()+1, spannableString.length(), diff --git a/src/org/thoughtcrime/securesms/MessageRecipientListItem.java b/src/org/thoughtcrime/securesms/MessageRecipientListItem.java index 49353a4f63..842d7b0c54 100644 --- a/src/org/thoughtcrime/securesms/MessageRecipientListItem.java +++ b/src/org/thoughtcrime/securesms/MessageRecipientListItem.java @@ -99,7 +99,7 @@ public class MessageRecipientListItem extends RelativeLayout resendButton.setVisibility(View.GONE); conflictButton.setVisibility(View.VISIBLE); - errorText = getContext().getString(R.string.MessageDetailsRecipient_new_safety_numbers); + errorText = getContext().getString(R.string.MessageDetailsRecipient_new_safety_number); conflictButton.setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java index a3d5548f50..1bac441d71 100644 --- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java +++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java @@ -108,7 +108,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity protected void onCreate(Bundle state, @NonNull MasterSecret masterSecret) { try { getSupportActionBar().setDisplayHomeAsUpEnabled(true); - getSupportActionBar().setTitle(R.string.AndroidManifest__verify_safety_numbers); + getSupportActionBar().setTitle(R.string.AndroidManifest__verify_safety_number); Recipient recipient = RecipientFactory.getRecipientForId(this, getIntent().getLongExtra(RECIPIENT_ID, -1), true); recipient.addListener(this); @@ -196,17 +196,17 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity private void handleShare() { String shareString = - getString(R.string.VerifyIdentityActivity_our_signal_safety_numbers) + "\n" + + getString(R.string.VerifyIdentityActivity_our_signal_safety_number) + "\n" + displayFragment.getFormattedSafetyNumbers() + "\n"; Intent intent = new Intent(); intent.setAction(Intent.ACTION_SEND); - intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.VerifyIdentityActivity_our_signal_safety_numbers)); + intent.putExtra(Intent.EXTRA_SUBJECT, getString(R.string.VerifyIdentityActivity_our_signal_safety_number)); intent.putExtra(Intent.EXTRA_TEXT, shareString); intent.setType("text/plain"); try { - startActivity(Intent.createChooser(intent, getString(R.string.VerifyIdentityActivity_share_safety_numbers_via))); + startActivity(Intent.createChooser(intent, getString(R.string.VerifyIdentityActivity_share_safety_number_via))); } catch (ActivityNotFoundException e) { Toast.makeText(VerifyIdentityActivity.this, R.string.VerifyIdentityActivity_no_app_to_share_to, Toast.LENGTH_LONG).show(); } @@ -381,14 +381,14 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity String clipboardData = Util.readTextFromClipboard(getActivity()); if (clipboardData == null) { - Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_no_safety_numbers_to_compare_were_found_in_the_clipboard, Toast.LENGTH_LONG).show(); + Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard, Toast.LENGTH_LONG).show(); return; } String numericClipboardData = clipboardData.replaceAll("\\D", ""); if (TextUtils.isEmpty(numericClipboardData) || numericClipboardData.length() != 60) { - Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_no_safety_numbers_to_compare_were_found_in_the_clipboard, Toast.LENGTH_LONG).show(); + Toast.makeText(getActivity(), R.string.VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard, Toast.LENGTH_LONG).show(); return; } @@ -412,7 +412,7 @@ public class VerifyIdentityActivity extends PassphraseRequiredActionBarActivity Bitmap qrCodeBitmap = QrCode.create(qrCodeString); qrCode.setImageBitmap(qrCodeBitmap); - description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__scan_the_code_on_your_contact_s_phone_or_ask_them_to_scan_your_code_to_verify_that_your_messages_are_end_to_end_encrypted_you_can_alternately_compare_the_number_above), recipient.toShortString()))); + description.setText(Html.fromHtml(String.format(getActivity().getString(R.string.verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s), recipient.toShortString()))); description.setMovementMethod(LinkMovementMethod.getInstance()); } diff --git a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java index 4569279fad..68685ad2bd 100644 --- a/src/org/thoughtcrime/securesms/database/model/MessageRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/MessageRecord.java @@ -113,7 +113,7 @@ public abstract class MessageRecord extends DisplayRecord { return isOutgoing() ? emphasisAdded(context.getString(R.string.MessageRecord_you_set_disappearing_message_time_to_s, time)) : emphasisAdded(context.getString(R.string.MessageRecord_s_set_disappearing_message_time_to_s, getIndividualRecipient().toShortString(), time)); } else if (isIdentityUpdate()) { - return emphasisAdded(context.getString(R.string.MessageRecord_your_safety_numbers_with_s_have_changed, getIndividualRecipient().toShortString())); + return emphasisAdded(context.getString(R.string.MessageRecord_your_safety_number_with_s_has_changed, getIndividualRecipient().toShortString())); } else if (getBody().getBody().length() > MAX_DISPLAY_LENGTH) { return new SpannableString(getBody().getBody().substring(0, MAX_DISPLAY_LENGTH)); } diff --git a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java index a8ca75b129..796d08d48b 100644 --- a/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java @@ -75,7 +75,7 @@ public class SmsMessageRecord extends MessageRecord { } else if (MmsSmsColumns.Types.isLegacyType(type)) { return emphasisAdded(context.getString(R.string.MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported)); } else if (isBundleKeyExchange()) { - return emphasisAdded(context.getString(R.string.SmsMessageRecord_received_message_with_new_safety_numbers_tap_to_process)); + return emphasisAdded(context.getString(R.string.SmsMessageRecord_received_message_with_new_safety_number_tap_to_process)); } else if (isKeyExchange() && isOutgoing()) { return new SpannableString(""); } else if (isKeyExchange() && !isOutgoing()) { diff --git a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java index fe0fd2947a..21dfb0004a 100644 --- a/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java +++ b/src/org/thoughtcrime/securesms/database/model/ThreadRecord.java @@ -103,7 +103,7 @@ public class ThreadRecord extends DisplayRecord { String time = ExpirationUtil.getExpirationDisplayValue(context, (int) (getExpiresIn() / 1000)); return emphasisAdded(context.getString(R.string.ThreadRecord_disappearing_message_time_updated_to_s, time)); } else if (SmsDatabase.Types.isIdentityUpdate(type)) { - return emphasisAdded(context.getString(R.string.ThreadRecord_your_safety_numbers_with_s_have_changed, getRecipients().getPrimaryRecipient().toShortString())); + return emphasisAdded(context.getString(R.string.ThreadRecord_your_safety_number_with_s_has_changed, getRecipients().getPrimaryRecipient().toShortString())); } else { if (TextUtils.isEmpty(getBody().getBody())) { return new SpannableString(emphasisAdded(context.getString(R.string.ThreadRecord_media_message)));