blallo
/
Signal-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Clear up warnings in string resource file.

master
Cody Henthorne 2020-06-24 15:18:33 -04:00 committed by Greyson Parrelli
parent ce7ad76447
commit b262efc24c
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/lint.xml
View File

@ -6,10 +6,13 @@
<issue id="StringFormatMatches" severity="error" />
<!-- L10N warnings -->
<issue id="MissingTranslation" severity="warning" />
<issue id="MissingTranslation" severity="ignore" />
<issue id="MissingQuantity" severity="warning" />
<issue id="ExtraTranslation" severity="warning" />
<issue id="ImpliedQuantity" severity="warning" />
<issue id="TypographyDashes" severity="error" >
<ignore path="*/res/values-*" /> <!-- Ignore for non-English -->
</issue>
<issue id="CanvasSize" severity="error" />
<issue id="HardcodedText" severity="error" />

2
app/src/main/java/org/thoughtcrime/securesms/DeviceProvisioningActivity.java
View File

@ -26,7 +26,7 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActivity {
startActivity(intent);
finish();
})
.setNegativeButton(R.string.DeviceProvisioningActivity_cancel, (dialog12, which) -> {
.setNegativeButton(android.R.string.cancel, (dialog12, which) -> {
dialog12.dismiss();
finish();
})

2
app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java
View File

@ -225,7 +225,7 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL
AlertDialog.Builder builder = new AlertDialog.Builder(this)
.setTitle(R.string.SubmitDebugLogActivity_success)
.setCancelable(false)
.setNeutralButton(R.string.SubmitDebugLogActivity_ok, (d, w) -> finish())
.setNeutralButton(android.R.string.ok, (d, w) -> finish())
.setPositiveButton(R.string.SubmitDebugLogActivity_share, (d, w) -> {
ShareCompat.IntentBuilder.from(this)
.setText(url)

4
app/src/main/res/values/strings.xml
View File

@ -862,7 +862,6 @@
<!-- DeviceProvisioningActivity -->
<string name="DeviceProvisioningActivity_link_this_device">Link this device?</string>
<string name="DeviceProvisioningActivity_cancel">CANCEL</string>
<string name="DeviceProvisioningActivity_continue">CONTINUE</string>
<string name="DeviceProvisioningActivity_content_intro">It will be able to</string>
@ -1114,7 +1113,6 @@
<string name="SubmitDebugLogActivity_success">Success!</string>
<string name="SubmitDebugLogActivity_copy_this_url_and_add_it_to_your_issue">Copy this URL and add it to your issue report or support email:\n\n<b>%1$s</b></string>
<string name="SubmitDebugLogActivity_copied_to_clipboard">Copied to clipboard</string>
<string name="SubmitDebugLogActivity_ok">Ok</string>
<string name="SubmitDebugLogActivity_share">Share</string>
<!-- SupportEmailUtil -->
@ -1189,7 +1187,7 @@
<string name="UsernameEditFragment_encountered_a_network_error">Encountered a network error.</string>
<string name="UsernameEditFragment_this_username_is_taken">This username is taken.</string>
<string name="UsernameEditFragment_this_username_is_available">This username is available.</string>
<string name="UsernameEditFragment_usernames_can_only_include">Usernames can only include a-Z, 0-9, and underscores.</string>
<string name="UsernameEditFragment_usernames_can_only_include">Usernames can only include a–Z, 0–9, and underscores.</string>
<string name="UsernameEditFragment_usernames_cannot_begin_with_a_number">Usernames cannot begin with a number.</string>
<string name="UsernameEditFragment_username_is_invalid">Username is invalid.</string>
<string name="UsernameEditFragment_usernames_must_be_between_a_and_b_characters">Usernames must be between %1$d and %2$d characters.</string>