From 111f1749f5fdf827de5eeecce64b8aa6309bda74 Mon Sep 17 00:00:00 2001 From: Pierre HUBERT Date: Wed, 29 Aug 2018 10:19:24 +0200 Subject: [PATCH] Fixed translation --- .../android/comunic/client/ui/views/CountDownView.java | 4 +++- app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/communiquons/android/comunic/client/ui/views/CountDownView.java b/app/src/main/java/org/communiquons/android/comunic/client/ui/views/CountDownView.java index 8a1d932..7e36861 100644 --- a/app/src/main/java/org/communiquons/android/comunic/client/ui/views/CountDownView.java +++ b/app/src/main/java/org/communiquons/android/comunic/client/ui/views/CountDownView.java @@ -12,6 +12,7 @@ import android.widget.TextView; import org.communiquons.android.comunic.client.R; import org.communiquons.android.comunic.client.data.utils.StringsUtils; import org.communiquons.android.comunic.client.data.utils.Utilities; +import org.communiquons.android.comunic.client.ui.utils.UiUtils; /** * CountDown view @@ -96,7 +97,8 @@ public class CountDownView extends BaseFrameLayoutView { int seconds = remaining_time % 60; Log.v(TAG, days + "d " + hours + ":" + minutes + ":" + seconds); - return StringsUtils.EnsureZerosInNumberString(days, 2) + "d " + return StringsUtils.EnsureZerosInNumberString(days, 2) + + UiUtils.getString(getContext(), R.string.date_days_short) + " " + StringsUtils.EnsureZerosInNumberString(hours, 2) + ":" + StringsUtils.EnsureZerosInNumberString(minutes, 2) + ":" + StringsUtils.EnsureZerosInNumberString(seconds, 2); diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index cc1784f..14724a8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -248,4 +248,5 @@ A propos Licences Open Source Licences Open Source + j \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7980458..35e976b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -252,4 +252,5 @@ Cancel Delete Could not delete conversation message! + d