Got rid of date format strings in localized strings.xml, now we rely on preferences and some hard coded strings for date formatting. Fix OEM request

pull/14/head
Tim Su 14 years ago
parent f8a907487f
commit 6b0b376639

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">HH:mm dd/M</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\ni\ne\ns</string>
<string name="hoursVertical">H\no\nr\ne\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d. MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">dd.M HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\na\ny\ns</string>
<string name="hoursVertical">H\no\nu\nr\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d. MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">dd/M HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">T
a

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">HH:mm dd/M</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\ní\na\ns</string>
<string name="hoursVertical">H\no\nr\na\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">dd MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">dd/MM HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">j\no\nu\nr\ns</string>
<string name="hoursVertical">h\ne\nu\nr\ne\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">MMM d</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">M/dd HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\na\ny\ns</string>
<string name="hoursVertical">H\no\nu\nr\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">dd/M HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\na\ny\ns</string>
<string name="hoursVertical">H\no\nu\nr\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">MMM d</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">M/dd HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical"></string>
<string name="hoursVertical">時\n間</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">MMM d</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">M/dd HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical"></string>
<string name="hoursVertical"></string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">dd/M HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">d\na\ng\ne\nr</string>
<string name="hoursVertical">t\ni\nm\ne\nr</string>
@ -493,4 +489,4 @@ Hvis du ikke ønsker å se den nye oppgaven rett etter at du fullfører den gaml
<string name="read_tasks_permission">Les Astrid-gjøremål</string>
</resources>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">dd-M HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\na\ng\ne\nn</string>
<string name="hoursVertical">U\nr\ne\nn</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d MMMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">M/dd HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\na\ny\ns</string>
<string name="hoursVertical">H\no\nu\nr\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">MMM d</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">M/dd HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\ni\na\ns</string>
<string name="hoursVertical">H\no\nr\na\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">dd/M HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\ny\na\ns</string>
<string name="hoursVertical">H\no\nu\nr\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">M/dd HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\na\ng\na\nr</string>
<string name="hoursVertical">H\no\nu\nr\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">d MMM</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">dd-MM HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\na\ny\ns</string>
<string name="hoursVertical">H\no\nu\nr\ns</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">MMM d</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">M/dd HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical"></string>
<string name="hoursVertical">小\n时</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">MMM d</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">M/dd HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical"></string>
<string name="hoursVertical">小\n時</string>

@ -62,10 +62,6 @@
<!-- Time Constants -->
<!-- used for long due dates. c.f. Java's SimpleDateFormat -->
<string name="dateFormatter">MMM d</string>
<!-- used for alarms -->
<string name="alarmDateFormatter">M/dd HH:mm</string>
<!-- vertical labels are used in dialog boxes -->
<string name="daysVertical">D\na\ny\ns</string>
<string name="hoursVertical">H\no\nu\nr\ns</string>

@ -18,7 +18,6 @@
package com.timsu.astrid.activities;
import java.text.Format;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
@ -333,7 +332,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
DateUtilities.getDurationString(r,
Math.abs(secondsLeft), 1));
else
finishedTime = DateUtilities.getFormattedDate(r,
finishedTime = DateUtilities.getFormattedDate(activity,
task.getCompletionDate());
label.append(r.getString(R.string.taskList_completedPrefix,
finishedTime));
@ -358,7 +357,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
label.append(DateUtilities.getDurationString(r,
(int)Math.abs(timeLeft), 1, true));
else
label.append(DateUtilities.getFormattedDate(r,
label.append(DateUtilities.getFormattedDate(activity,
task.getDefiniteDueDate()));
}
if(!taskOverdue && task.getPreferredDueDate() != null) {
@ -381,7 +380,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
label.append(DateUtilities.getDurationString(r,
(int)Math.abs(timeLeft), 1, true));
else
label.append(DateUtilities.getFormattedDate(r,
label.append(DateUtilities.getFormattedDate(activity,
task.getPreferredDueDate()));
}
}
@ -458,8 +457,7 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
if(label.length() > 0)
label.append(". ");
if(alarmFormat == null)
alarmFormat = new SimpleDateFormat(
r.getString(R.string.alarmDateFormatter));
alarmFormat = Preferences.getDateWithTimeFormat(activity);
String alarmString = alarmFormat.format(nextAlarm);
label.append(r.getString(R.string.taskList_alarmPrefix) +
" " + alarmString);

@ -73,7 +73,7 @@ public class BackupService extends Service {
exporter.exportTasks(backupDirectorySetting.getBackupDirectory());
Preferences.setBackupSummary(ctx,
ctx.getString(R.string.prefs_backup_desc_success,
DateUtilities.getFormattedDate(ctx.getResources(), new Date())));
DateUtilities.getFormattedDate(ctx, new Date())));
} catch (Exception e) {
// unable to backup.
if (e == null || e.getMessage() == null) {

@ -19,25 +19,27 @@
*/
package com.timsu.astrid.utilities;
import android.content.res.Resources;
import android.util.Log;
import com.timsu.astrid.R;
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import android.content.Context;
import android.content.res.Resources;
import android.util.Log;
import com.timsu.astrid.R;
public class DateUtilities {
private static SimpleDateFormat format = null;
private static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ssz";
/** Format a time into a medium length absolute format */
public static String getFormattedDate(Resources r, Date date) {
public static String getFormattedDate(Context context, Date date) {
if(format == null)
format = new SimpleDateFormat(r.getString(R.string.dateFormatter));
format = Preferences.getDateFormat(context);
return format.format(date);
}

@ -148,33 +148,84 @@ public class Preferences {
editor.commit();
}
// --- date time strings and formatters
@SuppressWarnings("nls")
public static boolean is24HourFormat(Context context) {
String value = android.provider.Settings.System.getString(context.getContentResolver(),
android.provider.Settings.System.TIME_12_24);
android.provider.Settings.System.TIME_12_24);
boolean b24 = !(value == null || value.equals("12"));
return b24;
}
/**
* @return time format (hours and minutes)
*/
public static SimpleDateFormat getTimeFormat(Context context) {
String value = getTimeFormatString(context);
return new SimpleDateFormat(value);
}
/**
* @return string used for time formatting
*/
@SuppressWarnings("nls")
private static String getTimeFormatString(Context context) {
String value;
if (is24HourFormat(context)) {
value = "H:mm";
} else {
value = "h:mm a";
}
return value;
}
return new SimpleDateFormat(value);
/**
* @return string used for date formatting
*/
@SuppressWarnings("nls")
private static String getDateFormatString(Context context) {
String value = android.provider.Settings.System.getString(context.getContentResolver(),
android.provider.Settings.System.DATE_FORMAT);
if (value == null) {
// united states, you are special
if (Locale.US.equals(Locale.getDefault())
|| Locale.CANADA.equals(Locale.getDefault()))
value = "MMM d yyyy";
else
value = "d MMM yyyy";
}
return value;
}
/**
* @return date format (month, day, year)
*/
public static SimpleDateFormat getDateFormat(Context context) {
// united states, you are special
if(Locale.US.equals(Locale.getDefault()) ||
Locale.CANADA.equals(Locale.getDefault()))
return new SimpleDateFormat("EEE, MMM d yyyy");
else
return new SimpleDateFormat("EEE, d MMM yyyy");
return new SimpleDateFormat(getDateFormatString(context));
}
/**
* @return date format as getDateFormat with weekday
*/
@SuppressWarnings("nls")
public static SimpleDateFormat getDateFormatWithWeekday(Context context) {
return new SimpleDateFormat("EEE, " + getDateFormatString(context));
}
/**
* @return date with time at the end
*/
@SuppressWarnings("nls")
public static SimpleDateFormat getDateWithTimeFormat(Context context) {
return new SimpleDateFormat(getDateFormatString(context) + " " +
getTimeFormatString(context));
}
// --- notification settings
/** returns hour at which quiet hours start, or null if not set */

@ -47,7 +47,7 @@ public class DateControlSet implements OnTimeSetListener,
protected DateControlSet(Activity activity) {
this.activity = activity;
this.dateFormatter = Preferences.getDateFormat(this.activity);
this.dateFormatter = Preferences.getDateFormatWithWeekday(this.activity);
this.timeFormatter = Preferences.getTimeFormat(this.activity);
}

@ -20,8 +20,7 @@ public class AstridTranslationTests extends TranslationTests {
@Override
public int[] getDateFormatStrings() {
return new int[] {
R.string.dateFormatter,
R.string.alarmDateFormatter,
//
};
}

Loading…
Cancel
Save