--- android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java 2009/10/06 09:42:10 398 +++ android/TrainInfo/src/dk/thoerup/traininfo/TimetableList.java 2010/02/02 08:44:35 578 @@ -17,6 +17,7 @@ import dk.thoerup.traininfo.provider.ProviderFactory; import dk.thoerup.traininfo.provider.TimetableProvider; import dk.thoerup.traininfo.util.MessageBox; +import static dk.thoerup.traininfo.R.string.*; public class TimetableList extends Activity { @@ -49,7 +50,7 @@ ((TextView)findViewById(R.id.Status)).setText(departure.getStatus()); ((TextView)findViewById(R.id.Location)).setText(departure.getLocation()); ((TextView)findViewById(R.id.Note)).setText(departure.getNote()); - ((TextView)findViewById(R.id.Updated)).setText(departure.getLastUpdateString()); + ((TextView)findViewById(R.id.Updated)).setText(departure.getLastUpdateString(this)); if (savedInstanceState == null) { @@ -67,20 +68,6 @@ outState.putSerializable("timetables", (ArrayList) timetables); } -/* case DLG_DETAILS: - DepartureBean currentDeparture = departures.get(selectedItemId); - ((TextView)dialog.findViewById(R.id.Time)).setText(currentDeparture.getTime()); - ((TextView)dialog.findViewById(R.id.Train)).setText(currentDeparture.getTrainNumber()); - ((TextView)dialog.findViewById(R.id.Destination)).setText( currentDeparture.getDestination()); - ((TextView)dialog.findViewById(R.id.Origin)).setText(currentDeparture.getOrigin()); - ((TextView)dialog.findViewById(R.id.Location)).setText(currentDeparture.getLocation()); - ((TextView)dialog.findViewById(R.id.Updated)).setText(currentDeparture.getLastUpdateString()); - ((TextView)dialog.findViewById(R.id.Status)).setText(currentDeparture.getStatus()); - ((TextView)dialog.findViewById(R.id.Note)).setText(currentDeparture.getNote()); - detailsDialog = dialog; - break; - - */ @Override protected void onPrepareDialog(int id, Dialog dialog) { @@ -97,8 +84,8 @@ protected Dialog onCreateDialog(int id) { switch (id) { case DLG_PROGRESS: - ProgressDialog dlg = new ProgressDialog(this); - dlg.setMessage("Fetch timetable data"); + ProgressDialog dlg = new ProgressDialog(this); + dlg.setMessage( getString(timetablelist_fetchdata) ); dlg.setCancelable(true); return dlg; default: @@ -125,20 +112,20 @@ if (success) { adapter.setTimetable(timetables); if (timetables.size() == 0) { - MessageBox.showMessage(TimetableList.this, "No timetable found"); + MessageBox.showMessage(TimetableList.this, getString(timetablelist_nodata)); } } else { // communication or parse error AlertDialog.Builder builder = new AlertDialog.Builder(TimetableList.this); - builder.setMessage("Error finding departures"); + builder.setMessage(getString(timetablelist_fetcherror)); builder.setCancelable(true); - builder.setPositiveButton("Retry", new DialogInterface.OnClickListener() { + builder.setPositiveButton(getString(generic_retry), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); startTimetableFetcher(); } }); - builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() { + builder.setNegativeButton(getString(generic_cancel), new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.dismiss(); }