TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-27 12:05:22 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@ -235,7 +235,7 @@
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".DeviceListActivity" <activity android:name=".DeviceListActivity"
android:label="@string/AndroidManifest_manage_paired_devices" android:label="@string/AndroidManifest_manage_linked_devices"
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/> android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>
<activity android:name=".LogSubmitActivity" <activity android:name=".LogSubmitActivity"

2
res/layout/device_list_fragment.xml
View File

@ -27,7 +27,7 @@
android:gravity="center|center_vertical" android:gravity="center|center_vertical"
android:textSize="20sp" android:textSize="20sp"
android:visibility="gone" android:visibility="gone"
android:text="@string/device_list_fragment__no_devices_paired"/> android:text="@string/device_list_fragment__no_devices_linked"/>
<ListView android:id="@id/android:list" <ListView android:id="@id/android:list"
android:layout_width="match_parent" android:layout_width="match_parent"

22
res/values/strings.xml
View File

@ -169,17 +169,17 @@
<string name="DateUtils_minutes_ago">%d min</string> <string name="DateUtils_minutes_ago">%d min</string>
<!-- DeviceListActivity --> <!-- DeviceListActivity -->
<string name="DeviceListActivity_disconnect_s">Disconnect \'%s\'?</string> <string name="DeviceListActivity_unlink_s">Unlink \'%s\'?</string>
<string name="DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive">By disconnecting this device, it will no longer be able to send or receive messages.</string> <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">By unlinking this device, it will no longer be able to send or receive messages.</string>
<string name="DeviceListActivity_network_connection_failed">Network connection failed...</string> <string name="DeviceListActivity_network_connection_failed">Network connection failed...</string>
<string name="DeviceListActivity_try_again">Try again</string> <string name="DeviceListActivity_try_again">Try again</string>
<string name="DeviceListActivity_disconnecting_device">Disconnecting device...</string> <string name="DeviceListActivity_unlinking_device">Unlinking device...</string>
<string name="DeviceListActivity_disconnecting_device_no_ellipse">Disconnecting device</string> <string name="DeviceListActivity_unlinking_device_no_ellipsis">Unlinking device</string>
<string name="DeviceListActivity_network_failed">Network failed!</string> <string name="DeviceListActivity_network_failed">Network failed!</string>
<!-- DeviceListItem --> <!-- DeviceListItem -->
<string name="DeviceListItem_unnamed_device">Unnamed device</string> <string name="DeviceListItem_unnamed_device">Unnamed device</string>
<string name="DeviceListItem_created_s">Created %s</string> <string name="DeviceListItem_linked_s">Linked %s</string>
<string name="DeviceListItem_last_active_s">Last active %s</string> <string name="DeviceListItem_last_active_s">Last active %s</string>
<!-- ShareActivity --> <!-- ShareActivity -->
@ -293,13 +293,13 @@
- Read all your messages - Read all your messages
\n- Send messages in your name \n- Send messages in your name
</string> </string>
<string name="DeviceProvisioningActivity_content_progress_title">Adding device</string> <string name="DeviceProvisioningActivity_content_progress_title">Linking device</string>
<string name="DeviceProvisioningActivity_content_progress_content">Adding new device...</string> <string name="DeviceProvisioningActivity_content_progress_content">Linking new device...</string>
<string name="DeviceProvisioningActivity_content_progress_success">Device added!</string> <string name="DeviceProvisioningActivity_content_progress_success">Device linked!</string>
<string name="DeviceProvisioningActivity_content_progress_no_device">No device found.</string> <string name="DeviceProvisioningActivity_content_progress_no_device">No device found.</string>
<string name="DeviceProvisioningActivity_content_progress_network_error">Network error.</string> <string name="DeviceProvisioningActivity_content_progress_network_error">Network error.</string>
<string name="DeviceProvisioningActivity_content_progress_key_error">Invalid QR code.</string> <string name="DeviceProvisioningActivity_content_progress_key_error">Invalid QR code.</string>
<string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_registered_already">Sorry, you have too many devices registered already, try removing some...</string> <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sorry, you have too many devices linked already, try removing some...</string>
<!-- PassphrasePromptActivity --> <!-- PassphrasePromptActivity -->
<string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string> <string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string>
@ -549,7 +549,7 @@
<string name="country_selection_fragment__search">Search</string> <string name="country_selection_fragment__search">Search</string>
<!-- device_list_fragment --> <!-- device_list_fragment -->
<string name="device_list_fragment__no_devices_paired">No devices paired...</string> <string name="device_list_fragment__no_devices_linked">No devices linked...</string>
<!-- log_submit_activity --> <!-- log_submit_activity -->
<string name="log_submit_activity__log_fetch_failed">Could not grab logs from your device. You can still use ADB to get debug logs instead.</string> <string name="log_submit_activity__log_fetch_failed">Could not grab logs from your device. You can still use ADB to get debug logs instead.</string>
@ -737,7 +737,7 @@
<string name="AndroidManifest__media_overview">All images</string> <string name="AndroidManifest__media_overview">All images</string>
<string name="AndroidManifest__media_overview_named">All images with %1$s</string> <string name="AndroidManifest__media_overview_named">All images with %1$s</string>
<string name="AndroidManifest__message_details">Message Details</string> <string name="AndroidManifest__message_details">Message Details</string>
<string name="AndroidManifest_manage_paired_devices">Manage paired devices</string> <string name="AndroidManifest_manage_linked_devices">Manage linked devices</string>
<!-- arrays.xml --> <!-- arrays.xml -->
<string name="arrays__import_export">Import / export</string> <string name="arrays__import_export">Import / export</string>

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

@ -137,8 +137,8 @@ public class DeviceListActivity extends PassphraseRequiredActionBarActivity {
final long deviceId = ((DeviceListItem)view).getDeviceId(); final long deviceId = ((DeviceListItem)view).getDeviceId();
AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity()); AlertDialogWrapper.Builder builder = new AlertDialogWrapper.Builder(getActivity());
builder.setTitle(getActivity().getString(R.string.DeviceListActivity_disconnect_s, deviceName)); builder.setTitle(getActivity().getString(R.string.DeviceListActivity_unlink_s, deviceName));
builder.setMessage(R.string.DeviceListActivity_by_disconnecting_this_device_it_will_no_longer_be_able_to_send_or_receive); 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.setNegativeButton(android.R.string.cancel, null);
builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override @Override
@ -164,8 +164,8 @@ public class DeviceListActivity extends PassphraseRequiredActionBarActivity {
private void handleDisconnectDevice(final long deviceId) { private void handleDisconnectDevice(final long deviceId) {
new ProgressDialogAsyncTask<Void, Void, Void>(getActivity(), new ProgressDialogAsyncTask<Void, Void, Void>(getActivity(),
R.string.DeviceListActivity_disconnecting_device_no_ellipse, R.string.DeviceListActivity_unlinking_device_no_ellipsis,
R.string.DeviceListActivity_disconnecting_device) R.string.DeviceListActivity_unlinking_device)
{ {
@Override @Override
protected Void doInBackground(Void... params) { 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); if (TextUtils.isEmpty(deviceInfo.getName())) this.name.setText(R.string.DeviceListItem_unnamed_device);
else this.name.setText(deviceInfo.getName()); 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(), DateUtils.getExtendedRelativeTimeSpanString(getContext(),
Locale.getDefault(), Locale.getDefault(),
deviceInfo.getCreated()))); 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(); Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_key_error, Toast.LENGTH_LONG).show();
break; break;
case LIMIT_EXCEEDED: 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; break;
} }
dialog.dismiss(); dialog.dismiss();