diff --git a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java index a98089ca..a39f1799 100644 --- a/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java +++ b/QKSMS/src/main/java/com/moez/QKSMS/common/utils/DateFormatter.java @@ -4,6 +4,8 @@ import android.content.Context; import android.content.SharedPreferences; import android.text.format.DateUtils; +import com.moez.QKSMS.QKSMSApp; +import com.moez.QKSMS.R; import com.moez.QKSMS.ui.MainActivity; import com.moez.QKSMS.ui.settings.SettingsFragment; @@ -47,7 +49,7 @@ public abstract class DateFormatter { // Yesterday formatter = new SimpleDateFormat("yD"); if (Integer.parseInt(formatter.format(date)) + 1 == Integer.parseInt(formatter.format(System.currentTimeMillis()))) { - return "Yesterday " + new SimpleDateFormat(isUsing24HourTime ? "H:mm" : "h:mm a").format(date); + return context.getString(R.string.date_yesterday) +" "+ new SimpleDateFormat(isUsing24HourTime ? "H:mm" : "h:mm a").format(date); } // In the same week @@ -74,7 +76,7 @@ public abstract class DateFormatter { public static String getRelativeTimestamp(long date) { String relativeTimestamp = (String) DateUtils.getRelativeTimeSpanString(date); if (relativeTimestamp.equals("in 0 minutes") || relativeTimestamp.equals("0 minutes ago")) - return "Just now"; + return QKSMSApp.getApplication().getString(com.moez.QKSMS.R.string.date_just_now); return relativeTimestamp; } diff --git a/QKSMS/src/main/res/values-de/strings.xml b/QKSMS/src/main/res/values-de/strings.xml index 0fcf96ca..433d97e7 100755 --- a/QKSMS/src/main/res/values-de/strings.xml +++ b/QKSMS/src/main/res/values-de/strings.xml @@ -396,6 +396,9 @@ Textformatierung Benutze Markdown-Syntax um fett, unterstrichen und kursiv in deinen Nachrichten zu verwenden Want read indicators? + Gestern + Gerade eben + Bonus theme colors Delayed messaging diff --git a/QKSMS/src/main/res/values/strings.xml b/QKSMS/src/main/res/values/strings.xml index a317ee0b..331257bc 100644 --- a/QKSMS/src/main/res/values/strings.xml +++ b/QKSMS/src/main/res/values/strings.xml @@ -710,6 +710,8 @@ Automatic configuration failed Try searching for your carrier\'s APN settings (MMSC, Port, and Proxy) and entering them in Settings > Advanced. + Yesterday + Just now Bonus theme colors