TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 09:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve multi-device strings consistency

Browse Source 
Fixes #3830
Closes #3840
// FREEBIE
This commit is contained in:
Geonu Kang
2015-07-28 18:29:57 +09:00
committed by Moxie Marlinspike
parent 109a6ed599
commit 278214ef86
6 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/org/thoughtcrime/securesms/DeviceListActivity.java
View File

@@ -137,8 +137,8 @@ public class DeviceListActivity extends PassphraseRequiredActionBarActivity {
final long deviceId = ((DeviceListItem)view).getDeviceId();
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
builder.setTitle(getActivity().getString(R.string.DeviceListActivity_disconnect_s, deviceName));
builder.setMessage(R.string.DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive);
builder.setTitle(getActivity().getString(R.string.DeviceListActivity_unlink_s, deviceName));
builder.setMessage(R.string.DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive);
builder.setNegativeButton(android.R.string.cancel, null);
builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
@@ -164,8 +164,8 @@ public class DeviceListActivity extends PassphraseRequiredActionBarActivity {
private void handleDisconnectDevice(final long deviceId) {
new ProgressDialogAsyncTask<Void, Void, Void>(getActivity(),
R.string.DeviceListActivity_disconnecting_device_no_ellipse,
R.string.DeviceListActivity_disconnecting_device)
R.string.DeviceListActivity_unlinking_device_no_ellipsis,
R.string.DeviceListActivity_unlinking_device)
{
@Override
protected Void doInBackground(Void... params) {

2
src/org/thoughtcrime/securesms/DeviceListItem.java
View File

@@ -38,7 +38,7 @@ public class DeviceListItem extends LinearLayout {
if (TextUtils.isEmpty(deviceInfo.getName())) this.name.setText(R.string.DeviceListItem_unnamed_device);
else this.name.setText(deviceInfo.getName());
this.created.setText(getContext().getString(R.string.DeviceListItem_created_s,
this.created.setText(getContext().getString(R.string.DeviceListItem_linked_s,
DateUtils.getExtendedRelativeTimeSpanString(getContext(),
Locale.getDefault(),
deviceInfo.getCreated())));

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

@@ -149,7 +149,7 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_key_error, Toast.LENGTH_LONG).show();
break;
case LIMIT_EXCEEDED:
Toast.makeText(context, R.string.DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already, Toast.LENGTH_LONG).show();
Toast.makeText(context, R.string.DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already, Toast.LENGTH_LONG).show();
break;
}
dialog.dismiss();