forked from upstream-mirrors/quik
Removed two hard coded strings
This commit is contained in:
@@ -4,6 +4,8 @@ import android.content.Context;
|
|||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.text.format.DateUtils;
|
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.MainActivity;
|
||||||
import com.moez.QKSMS.ui.settings.SettingsFragment;
|
import com.moez.QKSMS.ui.settings.SettingsFragment;
|
||||||
|
|
||||||
@@ -47,7 +49,7 @@ public abstract class DateFormatter {
|
|||||||
// Yesterday
|
// Yesterday
|
||||||
formatter = new SimpleDateFormat("yD");
|
formatter = new SimpleDateFormat("yD");
|
||||||
if (Integer.parseInt(formatter.format(date)) + 1 == Integer.parseInt(formatter.format(System.currentTimeMillis()))) {
|
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
|
// In the same week
|
||||||
@@ -74,7 +76,7 @@ public abstract class DateFormatter {
|
|||||||
public static String getRelativeTimestamp(long date) {
|
public static String getRelativeTimestamp(long date) {
|
||||||
String relativeTimestamp = (String) DateUtils.getRelativeTimeSpanString(date);
|
String relativeTimestamp = (String) DateUtils.getRelativeTimeSpanString(date);
|
||||||
if (relativeTimestamp.equals("in 0 minutes") || relativeTimestamp.equals("0 minutes ago"))
|
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;
|
return relativeTimestamp;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -396,6 +396,9 @@
|
|||||||
<string name="pref_markdown_enabled">Textformatierung</string>
|
<string name="pref_markdown_enabled">Textformatierung</string>
|
||||||
<string name="pref_markdown_enabled_summary">Benutze Markdown-Syntax um fett, unterstrichen und kursiv in deinen Nachrichten zu verwenden</string>
|
<string name="pref_markdown_enabled_summary">Benutze Markdown-Syntax um fett, unterstrichen und kursiv in deinen Nachrichten zu verwenden</string>
|
||||||
<string name="want_read_indicators">Want read indicators?</string>
|
<string name="want_read_indicators">Want read indicators?</string>
|
||||||
|
<string name="date_yesterday">Gestern</string>
|
||||||
|
<string name="date_just_now">Gerade eben</string>
|
||||||
|
|
||||||
<string-array name="qksms_plus_about_feature_titles">
|
<string-array name="qksms_plus_about_feature_titles">
|
||||||
<item>Bonus theme colors</item>
|
<item>Bonus theme colors</item>
|
||||||
<item>Delayed messaging</item>
|
<item>Delayed messaging</item>
|
||||||
|
|||||||
@@ -710,6 +710,8 @@
|
|||||||
|
|
||||||
<string name="auto_select_failed_title">Automatic configuration failed</string>
|
<string name="auto_select_failed_title">Automatic configuration failed</string>
|
||||||
<string name="auto_select_failed">Try searching for your carrier\'s APN settings (MMSC, Port, and Proxy) and entering them in Settings > Advanced.</string>
|
<string name="auto_select_failed">Try searching for your carrier\'s APN settings (MMSC, Port, and Proxy) and entering them in Settings > Advanced.</string>
|
||||||
|
<string name="date_yesterday">Yesterday</string>
|
||||||
|
<string name="date_just_now">Just now</string>
|
||||||
|
|
||||||
<string-array name="qksms_plus_about_feature_titles">
|
<string-array name="qksms_plus_about_feature_titles">
|
||||||
<item>Bonus theme colors</item>
|
<item>Bonus theme colors</item>
|
||||||
|
|||||||
Reference in New Issue
Block a user