From 27fe9f06d8b3accadbc5772a6bb154a719bc5cf9 Mon Sep 17 00:00:00 2001 From: str4d Date: Tue, 8 Jul 2014 00:05:40 +0000 Subject: [PATCH] Extracted remaining strings --- .../main/java/i2p/bote/android/EmailListFragment.java | 4 ++-- .../java/i2p/bote/android/NetworkInfoFragment.java | 2 +- .../main/java/i2p/bote/android/ViewEmailFragment.java | 2 +- .../bote/android/addressbook/EditContactFragment.java | 9 +++++---- .../i2p/bote/android/config/IdentityShipFragment.java | 2 +- .../java/i2p/bote/android/config/SettingsActivity.java | 4 ++-- .../java/i2p/bote/android/intro/IntroActivity.java | 1 - .../i2p/bote/android/util/EditPictureFragment.java | 8 +++++--- app/src/main/res/values/strings.xml | 10 ++++++++++ 9 files changed, 27 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/i2p/bote/android/EmailListFragment.java b/app/src/main/java/i2p/bote/android/EmailListFragment.java index 6277203..b9069c5 100644 --- a/app/src/main/java/i2p/bote/android/EmailListFragment.java +++ b/app/src/main/java/i2p/bote/android/EmailListFragment.java @@ -196,7 +196,7 @@ public class EmailListFragment extends ListFragment implements mPasswordInput = (EditText) promptView.findViewById(R.id.passwordInput); mPasswordError = (TextView) promptView.findViewById(R.id.passwordError); - builder.setPositiveButton("OK", new DialogInterface.OnClickListener() { + builder.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { InputMethodManager imm = (InputMethodManager) EmailListFragment.this @@ -205,7 +205,7 @@ public class EmailListFragment extends ListFragment implements dialog.dismiss(); new PasswordWaiter().execute(); } - }).setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + }).setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int id) { setEmptyText(getResources().getString( diff --git a/app/src/main/java/i2p/bote/android/NetworkInfoFragment.java b/app/src/main/java/i2p/bote/android/NetworkInfoFragment.java index 4b88d6a..45df37e 100644 --- a/app/src/main/java/i2p/bote/android/NetworkInfoFragment.java +++ b/app/src/main/java/i2p/bote/android/NetworkInfoFragment.java @@ -47,6 +47,6 @@ public class NetworkInfoFragment extends Fragment { Exception e = I2PBote.getInstance().getConnectError(); if (e != null) - ((TextView) view.findViewById(R.id.error)).setText(e.toString()); + ((TextView) view.findViewById(R.id.error)).setText(e.getLocalizedMessage()); } } diff --git a/app/src/main/java/i2p/bote/android/ViewEmailFragment.java b/app/src/main/java/i2p/bote/android/ViewEmailFragment.java index b89e8b8..a2a77ec 100644 --- a/app/src/main/java/i2p/bote/android/ViewEmailFragment.java +++ b/app/src/main/java/i2p/bote/android/ViewEmailFragment.java @@ -62,7 +62,7 @@ public class ViewEmailFragment extends Fragment { displayEmail(e, v); } else { TextView subject = (TextView) v.findViewById(R.id.email_subject); - subject.setText("Email not found"); + subject.setText(R.string.email_not_found); } } catch (PasswordException e) { // TODO: Handle diff --git a/app/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java b/app/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java index 34898ac..73daefe 100644 --- a/app/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java +++ b/app/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java @@ -121,10 +121,11 @@ public class EditContactFragment extends EditPictureFragment { i.addCategory(Intent.CATEGORY_OPENABLE); try { startActivityForResult( - Intent.createChooser(i, "Select file containing Email Destination"), + Intent.createChooser(i, + getResources().getString(R.string.select_email_destination_file)), REQUEST_DESTINATION_FILE); } catch (android.content.ActivityNotFoundException ex) { - Toast.makeText(getActivity(), "Please install a File Manager.", + Toast.makeText(getActivity(), R.string.please_install_a_file_manager, Toast.LENGTH_SHORT).show(); } } @@ -268,11 +269,11 @@ public class EditContactFragment extends EditPictureFragment { try { mDestinationField.setText(br.readLine()); } catch (IOException ioe) { - Toast.makeText(getActivity(), "Failed to read Email Destination file.", + Toast.makeText(getActivity(), R.string.failed_to_read_email_destination_file, Toast.LENGTH_SHORT).show(); } } catch (FileNotFoundException fnfe) { - Toast.makeText(getActivity(), "Could not find Email Destination file.", + Toast.makeText(getActivity(), R.string.could_not_find_email_destination_file, Toast.LENGTH_SHORT).show(); } } diff --git a/app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java b/app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java index 057989e..c844674 100644 --- a/app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java +++ b/app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java @@ -308,7 +308,7 @@ public abstract class IdentityShipFragment extends Fragment { try { startActivityForResult(i, SELECT_IMPORT_FILE); } catch (android.content.ActivityNotFoundException ex) { - Toast.makeText(getActivity(), "Please install a File Manager.", + Toast.makeText(getActivity(), R.string.please_install_a_file_manager, Toast.LENGTH_SHORT).show(); } } diff --git a/app/src/main/java/i2p/bote/android/config/SettingsActivity.java b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java index e892008..7965ee2 100644 --- a/app/src/main/java/i2p/bote/android/config/SettingsActivity.java +++ b/app/src/main/java/i2p/bote/android/config/SettingsActivity.java @@ -285,9 +285,9 @@ public class SettingsActivity extends PreferenceActivity { routerChoice.setKey("i2pbote.router.use"); routerChoice.setEntries(R.array.routerOptionNames); routerChoice.setEntryValues(R.array.routerOptions); - routerChoice.setTitle("Router"); + routerChoice.setTitle(R.string.pref_title_router); routerChoice.setSummary("%s"); - routerChoice.setDialogTitle("Router to use"); + routerChoice.setDialogTitle(R.string.pref_dialog_title_router); routerChoice.setDefaultValue("internal"); return routerChoice; } diff --git a/app/src/main/java/i2p/bote/android/intro/IntroActivity.java b/app/src/main/java/i2p/bote/android/intro/IntroActivity.java index e6debe2..bb6d8e8 100644 --- a/app/src/main/java/i2p/bote/android/intro/IntroActivity.java +++ b/app/src/main/java/i2p/bote/android/intro/IntroActivity.java @@ -127,7 +127,6 @@ public class IntroActivity extends ActionBarActivity { b.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View view) { - // TODO start setup wizard getActivity().setResult(Activity.RESULT_OK); getActivity().finish(); } diff --git a/app/src/main/java/i2p/bote/android/util/EditPictureFragment.java b/app/src/main/java/i2p/bote/android/util/EditPictureFragment.java index 37de9eb..8482d4e 100644 --- a/app/src/main/java/i2p/bote/android/util/EditPictureFragment.java +++ b/app/src/main/java/i2p/bote/android/util/EditPictureFragment.java @@ -33,7 +33,7 @@ public class EditPictureFragment extends Fragment { Intent i = new Intent(Intent.ACTION_GET_CONTENT); i.setType("image/*"); startActivityForResult( - Intent.createChooser(i, "Select a picture"), + Intent.createChooser(i, getResources().getString(R.string.select_a_picture)), REQUEST_PICTURE_FILE); } }); @@ -88,7 +88,8 @@ public class EditPictureFragment extends Fragment { List list = getActivity().getPackageManager().queryIntentActivities(intent, 0); if (list.size() == 0) { - Toast.makeText(getActivity(), "No image cropping app found", Toast.LENGTH_SHORT).show(); + Toast.makeText(getActivity(), R.string.no_image_cropping_app_found, Toast.LENGTH_SHORT) + .show(); } else { intent.setData(mPictureCaptureUri); intent.putExtra("outputX", 72); @@ -99,7 +100,8 @@ public class EditPictureFragment extends Fragment { intent.putExtra("return-data", true); startActivityForResult( - Intent.createChooser(intent, "Select a cropping app"), + Intent.createChooser(intent, + getResources().getString(R.string.select_a_cropping_app)), CROP_PICTURE); } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d78e8da..9c28a21 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -86,6 +86,7 @@ Error creating email packets: %s Error while sending email: %s Error saving email metadata: %s + Email not found From: To: Sent: @@ -104,9 +105,16 @@ Address book is empty Share New contact + Select a picture + No image cropping app found + Select a cropping app Contact name Email destination Browse + Select file containing Email Destination + Please install a File Manager. + Failed to read Email Destination file. + Could not find Email Destination file. Save contact Delete contact? Network information is not available because Bote hasn\'t started connecting to the network yet. @@ -135,6 +143,8 @@ %s minutes Maximum delay per hop %s minutes + Router + Router to use I2CP host I2CP port Change password