From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Sun, 26 Jun 2016 20:04:02 +0000 (+0200)
Subject: Fix formatting of timestamps in the future and a few seconds ago
X-Git-Tag: 0.9.5^2~11
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=135f9f7972e551fb8001f078e5379e386764e947;p=Sone.git

Fix formatting of timestamps in the future and a few seconds ago
---

diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
index b52198b..02fd0c1 100644
--- a/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java
@@ -150,10 +150,10 @@ public class GetTimesAjaxPage extends JsonPage {
 		String text;
 		long refresh;
 		if (age < 0) {
-			text = webInterface.getL10n().getDefaultString("View.Time.InTheFuture");
+			text = webInterface.getL10n().getString("View.Time.InTheFuture");
 			refresh = TimeUnit.MINUTES.toMillis(5);
 		} else if (age < TimeUnit.SECONDS.toMillis(20)) {
-			text = webInterface.getL10n().getDefaultString("View.Time.AFewSecondsAgo");
+			text = webInterface.getL10n().getString("View.Time.AFewSecondsAgo");
 			refresh = TimeUnit.SECONDS.toMillis(10);
 		} else if (age < TimeUnit.SECONDS.toMillis(45)) {
 			text = webInterface.getL10n().getString("View.Time.HalfAMinuteAgo");
diff --git a/src/test/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPageTest.java b/src/test/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPageTest.java
new file mode 100644
index 0000000..e1ab857
--- /dev/null
+++ b/src/test/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPageTest.java
@@ -0,0 +1,39 @@
+package net.pterodactylus.sone.web.ajax;
+
+import static java.lang.System.currentTimeMillis;
+import static net.pterodactylus.sone.web.ajax.GetTimesAjaxPage.getTime;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.is;
+import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
+import static org.mockito.Mockito.when;
+
+import net.pterodactylus.sone.web.WebInterface;
+import net.pterodactylus.sone.web.ajax.GetTimesAjaxPage.Time;
+
+import org.junit.Test;
+import org.mockito.Mockito;
+
+/**
+ * Unit test for {@link GetTimesAjaxPage}.
+ *
+ * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
+ */
+public class GetTimesAjaxPageTest {
+
+	private final WebInterface webInterface = Mockito.mock(WebInterface.class, RETURNS_DEEP_STUBS);
+
+	@Test
+	public void timestampInTheFutureIsTranslatedCorrectly() {
+		when(webInterface.getL10n().getString("View.Time.InTheFuture")).thenReturn("in the future");
+		Time time = getTime(webInterface, currentTimeMillis() + 100);
+		assertThat(time.getText(), is("in the future"));
+	}
+
+	@Test
+	public void timestampAFewSecondsAgoIsTranslatedCorrectly() {
+		when(webInterface.getL10n().getString("View.Time.AFewSecondsAgo")).thenReturn("a few seconds ago");
+		Time time = getTime(webInterface, currentTimeMillis() - 1000);
+		assertThat(time.getText(), is("a few seconds ago"));
+	}
+
+}