commit c2bd7b69ac93720ca053a16c2925558148e86b44
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Sep 30 10:45:00 2013 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Mon Sep 30 10:45:00 2013 -0400
tree daad57ab30848404bca8697d7f7edd2cf807f327
parent d60b929e79c887d3468cf9056f1dcec4047b9875

* #30787: adjustements in history

src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java

diff --git a/src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java b/src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java
index bc8506a..a446a3a 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java
@@ -125,7 +125,7 @@
 
                 String to = textField.getText().toString();
                 if (to.contentEquals("")) {
-                    textField.setError(getString(R.string.error_no_number_dialed));
+                    textField.setError(getString(R.string.dial_error_no_number_dialed));
                 } else {
                     mCallbacks.onCallDialed(to);
                 }

src/com/savoirfairelinux/sflphone/fragments/HistoryFragment.java

diff --git a/src/com/savoirfairelinux/sflphone/fragments/HistoryFragment.java b/src/com/savoirfairelinux/sflphone/fragments/HistoryFragment.java
index 480b122..1b8b04a 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/HistoryFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/HistoryFragment.java
@@ -218,9 +218,10 @@
 
             infos_fetcher.execute(new ContactPictureTask(mContext.getActivity(), entryView.photo, dataset.get(pos).getContact().getId()));
 
-            entryView.missed.setText("Missed:" + dataset.get(pos).getMissed_sum());
-            entryView.incoming.setText("In:" + dataset.get(pos).getIncoming_sum());
-            entryView.outgoing.setText("Out:" + dataset.get(pos).getOutgoing_sum());
+
+            entryView.missed.setText(getString(R.string.hist_missed_calls, dataset.get(pos).getMissed_sum()));
+            entryView.incoming.setText(getString(R.string.hist_in_calls, dataset.get(pos).getIncoming_sum()));
+            entryView.outgoing.setText(getString(R.string.hist_out_calls, dataset.get(pos).getOutgoing_sum()));
 
             if (dataset.get(pos).getCalls().lastEntry().getValue().getRecordPath().length() > 0) {
                 entryView.replay.setVisibility(View.VISIBLE);
@@ -233,11 +234,11 @@
                             if ((Boolean) v.getTag(R.id.replay)) {
                                 mCallbacks.getService().startRecordedFilePlayback(dataset.get(pos).getCalls().lastEntry().getValue().getRecordPath());
                                 v.setTag(R.id.replay, false);
-                                ((Button)v).setText("Stop");
+                                ((Button)v).setText(getString(R.string.hist_replay_button_stop));
                             } else {
                                 mCallbacks.getService().stopRecordedFilePlayback(dataset.get(pos).getCalls().lastEntry().getValue().getRecordPath());
                                 v.setTag(R.id.replay, true);
-                                ((Button)v).setText("Replay");
+                                ((Button)v).setText(getString(R.string.hist_replay_button));
                             }
                         } catch (RemoteException e) {
                             // TODO Auto-generated catch block
@@ -247,7 +248,7 @@
                 });
             }
 
-            entryView.date.setText(dataset.get(pos).getCalls().lastEntry().getValue().getDate("yyyy-MM-dd"));
+            entryView.date.setText(dataset.get(pos).getCalls().lastEntry().getValue().getDate("hh:mm dd/MM/yyyy"));
             entryView.duration.setText(dataset.get(pos).getTotalDuration());
 
             return rowView;