From bb94fe4dd7a984af78ca05db4608022ed72d569d Mon Sep 17 00:00:00 2001
From: PhotonQyv <shenstone.porter@gmail.com>
Date: Tue, 8 Aug 2017 22:01:59 +0100
Subject: [PATCH] Localised the units used in the cache dialog and toast.

---
 .../java/fr/gouv/etalab/mastodon/activities/MainActivity.java | 4 ++--
 app/src/main/res/values-fr/strings.xml                        | 1 +
 app/src/main/res/values/strings.xml                           | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
index 76708810a..1d2f7628a 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
@@ -533,7 +533,7 @@ public class MainActivity extends AppCompatActivity
                 }
             }
             final float finalCacheSize = cacheSize;
-            builder.setMessage(getString(R.string.cache_message, String.format("%s Mo", String.format(Locale.getDefault(), "%.2f", cacheSize))))
+            builder.setMessage(getString(R.string.cache_message, String.format("%s %s", String.format(Locale.getDefault(), "%.2f", cacheSize), getString(R.string.cache_units))))
                     .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
                             // continue with delete
@@ -544,7 +544,7 @@ public class MainActivity extends AppCompatActivity
                                     Helper.deleteDir(dir);
                                 }
                             } catch (Exception ignored) {}
-                            Toast.makeText(MainActivity.this, getString(R.string.toast_cache_clear,String.format("%s Mo", String.format(Locale.getDefault(), "%.2f", finalCacheSize))), Toast.LENGTH_LONG).show();
+                            Toast.makeText(MainActivity.this, getString(R.string.toast_cache_clear,String.format("%s %s", String.format(Locale.getDefault(), "%.2f", finalCacheSize), getString(R.string.cache_units))), Toast.LENGTH_LONG).show();
                             dialog.dismiss();
                         }
                     })
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 6d6e09830..a8e7e9803 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -328,6 +328,7 @@
     <!-- CACHE -->
     <string name="cache_title">Nettoyage du cache</string>
     <string name="cache_message">Il y a %1$s de données en cache.\n\nSouhaitez-vous les supprimer ?</string>
+    <string name="cache_units">Mo</string>
     <string name="toast_cache_clear">Le cache a été nettoyé ! %1$s ont été libérés</string>
 
     <!-- PRIVACY -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4bfe30937..c9cb01da1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -331,7 +331,8 @@
     <string name="settings_popup_notification">For unread notifications?</string>
     <!-- CACHE -->
     <string name="cache_title">Clear cache</string>
-    <string name="cache_message">There are %1$s data in cache.\n\nWould you like to delete them?</string>
+    <string name="cache_message">There are %1$s of data in cache.\n\nWould you like to delete them?</string>
+    <string name="cache_units">Mb</string>
     <string name="toast_cache_clear">Cache was cleared! %1$s were released</string>
 
     <!-- PRIVACY -->