diff options
| author | RoboErik <epastern@google.com> | 2011-09-09 10:29:16 -0700 |
|---|---|---|
| committer | RoboErik <epastern@google.com> | 2011-09-09 10:29:16 -0700 |
| commit | 937b49cfe0d0e715c06c60369e83ec6fec5e74fa (patch) | |
| tree | 9e5331d6201b9a11632690d345af8818585acaa0 | |
| parent | 8e62ac3a07b3389c0253331ad93981c8a74fb3f5 (diff) | |
| download | android_packages_apps_Calendar-937b49cfe0d0e715c06c60369e83ec6fec5e74fa.tar.gz android_packages_apps_Calendar-937b49cfe0d0e715c06c60369e83ec6fec5e74fa.tar.bz2 android_packages_apps_Calendar-937b49cfe0d0e715c06c60369e83ec6fec5e74fa.zip | |
b/5282047 Better localization for widget days
Change-Id: Ie0747e1564fed6789331623512d2e01a0fed6767
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/calendar/widget/CalendarAppWidgetModel.java | 12 |
2 files changed, 5 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c052ddf0..12d47851 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -182,6 +182,7 @@ <action android:name="android.intent.action.TIMEZONE_CHANGED"/> <action android:name="android.intent.action.DATE_CHANGED"/> <action android:name="android.intent.action.TIME_SET"/> + <action android:name="android.intent.action.LOCALE_CHANGED"/> </intent-filter> <intent-filter> <action android:name="android.intent.action.PROVIDER_CHANGED"/> diff --git a/src/com/android/calendar/widget/CalendarAppWidgetModel.java b/src/com/android/calendar/widget/CalendarAppWidgetModel.java index 8aa8eac4..a989e18b 100644 --- a/src/com/android/calendar/widget/CalendarAppWidgetModel.java +++ b/src/com/android/calendar/widget/CalendarAppWidgetModel.java @@ -406,20 +406,16 @@ class CalendarAppWidgetModel { private DayInfo populateDayInfo(int julianDay, Time recycle) { long millis = recycle.setJulianDay(julianDay); - int flags = DateUtils.FORMAT_ABBREV_ALL | DateUtils.FORMAT_SHOW_WEEKDAY; + int flags = DateUtils.FORMAT_ABBREV_ALL | DateUtils.FORMAT_SHOW_DATE; String label; if (julianDay == mTodayJulianDay + 1) { - label = mContext.getString(R.string.tomorrow); + label = mContext.getString(R.string.agenda_tomorrow, + Utils.formatDateRange(mContext, millis, millis, flags).toString()); } else { + flags |= DateUtils.FORMAT_SHOW_WEEKDAY; label = Utils.formatDateRange(mContext, millis, millis, flags); } - - flags = DateUtils.FORMAT_ABBREV_ALL | DateUtils.FORMAT_SHOW_DATE; - - label += ", "; - label += Utils.formatDateRange(mContext, millis, millis, flags); - return new DayInfo(julianDay, label); } |