jenkins-bot has submitted this change and it was merged.
Change subject: Update Feed date format to "MMM DD, YYYY"
......................................................................
Update Feed date format to "MMM DD, YYYY"
Bug: T139382
Change-Id: I668137e5647868ea7bd3f8bb030b025cfb97cc5d
---
M app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
M app/src/main/java/org/wikipedia/util/DateUtil.java
2 files changed, 17 insertions(+), 12 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
b/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
index 90e7357..5d2df2f 100644
--- a/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
+++ b/app/src/main/java/org/wikipedia/feed/mostread/MostReadListCard.java
@@ -10,8 +10,8 @@
import org.wikipedia.Site;
import org.wikipedia.WikipediaApp;
import org.wikipedia.feed.model.ListCard;
+import org.wikipedia.util.DateUtil;
-import java.text.DateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -31,12 +31,7 @@
}
@Nullable @Override public String subtitle() {
- // todo: consider allowing TWN date formats. It would be useful to
have but might be
- // difficult for translators to write correct format specifiers
without being able to
- // test them. We should investigate localization support in date
libraries such as
- // Joda-Time and how TWN solves this classic problem.
- DateFormat dateFormat =
android.text.format.DateFormat.getMediumDateFormat(context());
- return dateFormat.format(articles.date());
+ return DateUtil.getFeedCardDateString(articles.date());
}
@Nullable @Override public String footer() {
@@ -63,4 +58,4 @@
@NonNull private Context context() {
return WikipediaApp.getInstance();
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/wikipedia/util/DateUtil.java
b/app/src/main/java/org/wikipedia/util/DateUtil.java
index b1cb0f7..71ba503 100644
--- a/app/src/main/java/org/wikipedia/util/DateUtil.java
+++ b/app/src/main/java/org/wikipedia/util/DateUtil.java
@@ -1,12 +1,14 @@
package org.wikipedia.util;
-import android.text.format.DateUtils;
+import android.support.annotation.NonNull;
import org.wikipedia.WikipediaApp;
import org.wikipedia.feed.UtcDate;
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.Date;
import java.util.Locale;
import java.util.TimeZone;
@@ -18,9 +20,17 @@
return simpleDateFormat;
}
- public static String getFeedCardDateString(Calendar cal) {
- int flags = DateUtils.FORMAT_SHOW_WEEKDAY | DateUtils.FORMAT_SHOW_DATE
| DateUtils.FORMAT_SHOW_YEAR;
- return DateUtils.formatDateTime(WikipediaApp.getInstance(),
cal.getTimeInMillis(), flags);
+ public static String getFeedCardDateString(@NonNull Calendar date) {
+ return getFeedCardDateString(date.getTime());
+ }
+
+ public static String getFeedCardDateString(@NonNull Date date) {
+ // todo: consider allowing TWN date formats. It would be useful to
have but might be
+ // difficult for translators to write correct format specifiers
without being able to
+ // test them. We should investigate localization support in date
libraries such as
+ // Joda-Time and how TWN solves this classic problem.
+ DateFormat dateFormat =
android.text.format.DateFormat.getMediumDateFormat(WikipediaApp.getInstance());
+ return dateFormat.format(date);
}
public static UtcDate getUtcRequestDateFor(int age) {
--
To view, visit https://gerrit.wikimedia.org/r/297539
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I668137e5647868ea7bd3f8bb030b025cfb97cc5d
Gerrit-PatchSet: 2
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
