I2P_Developers/i2p.i2p-bote.android
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extracted remaining strings

Browse Source
This commit is contained in:
str4d
2014-07-08 00:05:40 +00:00
parent db21839748
commit 27fe9f06d8
9 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/i2p/bote/android/EmailListFragment.java
View File

@@ -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(

2
app/src/main/java/i2p/bote/android/NetworkInfoFragment.java
View File

@@ -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());
}
}

2
app/src/main/java/i2p/bote/android/ViewEmailFragment.java
View File

@@ -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

9
app/src/main/java/i2p/bote/android/addressbook/EditContactFragment.java
View File

@@ -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();
}
}

2
app/src/main/java/i2p/bote/android/config/IdentityShipFragment.java
View File

@@ -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();
}
}

4
app/src/main/java/i2p/bote/android/config/SettingsActivity.java
View File

@@ -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;
}

1
app/src/main/java/i2p/bote/android/intro/IntroActivity.java
View File

@@ -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();
}

8
app/src/main/java/i2p/bote/android/util/EditPictureFragment.java
View File

@@ -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<ResolveInfo> 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);
}
}

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

@@ -86,6 +86,7 @@
<string name="error_creating_packets">Error creating email packets: %s</string>
<string name="error_sending">Error while sending email: %s</string>
<string name="error_saving_metadata">Error saving email metadata: %s</string>
<string name="email_not_found">Email not found</string>
<string name="email_from">From:</string>
<string name="email_to">To:</string>
<string name="label_sent">Sent:</string>
@@ -104,9 +105,16 @@
<string name="address_book_empty">Address book is empty</string>
<string name="share">Share</string>
<string name="action_new_contact">New contact</string>
<string name="select_a_picture">Select a picture</string>
<string name="no_image_cropping_app_found">No image cropping app found</string>
<string name="select_a_cropping_app">Select a cropping app</string>
<string name="contact_name">Contact name</string>
<string name="email_destination">Email destination</string>
<string name="label_browse">Browse</string>
<string name="select_email_destination_file">Select file containing Email Destination</string>
<string name="please_install_a_file_manager">Please install a File Manager.</string>
<string name="failed_to_read_email_destination_file">Failed to read Email Destination file.</string>
<string name="could_not_find_email_destination_file">Could not find Email Destination file.</string>
<string name="save_contact">Save contact</string>
<string name="delete_contact">Delete contact?</string>
<string name="network_info_unavailable">Network information is not available because Bote hasn\'t started connecting to the network yet.</string>
@@ -135,6 +143,8 @@
<string name="pref_summ_minDelay">%s minutes</string>
<string name="pref_title_maxDelay">Maximum delay per hop</string>
<string name="pref_summ_maxDelay">%s minutes</string>
<string name="pref_title_router">Router</string>
<string name="pref_dialog_title_router">Router to use</string>
<string name="pref_title_i2cp_host">I2CP host</string>
<string name="pref_title_i2cp_port">I2CP port</string>
<string name="pref_title_change_password">Change password</string>