Proper I18N of the Details dialog, especially for RTL.

  Bug: 7141309

Change-Id: I27a2efd83b355cf2c7fa6cc6c9b386c1c0496c6b

1 files changed, 6 insertions, 3 deletions

diff --git a/src/com/android/camera/data/LocalMediaData.java b/src/com/android/camera/data/LocalMediaData.java
index 48db0df4c..1f87b5040 100644
--- a/src/com/android/camera/data/LocalMediaData.java
+++ b/src/com/android/camera/data/LocalMediaData.java
@@ -43,6 +43,7 @@ import com.android.camera2.R;
 import java.io.File;
 import java.text.DateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * A base class for all the local media files. The bitmap is loaded in
@@ -219,19 +220,21 @@ public abstract class LocalMediaData implements LocalData {
 
     @Override
     public MediaDetails getMediaDetails(Context context) {
-        DateFormat formater = DateFormat.getDateTimeInstance();
+        DateFormat dateFormatter = DateFormat.getDateTimeInstance();
         MediaDetails mediaDetails = new MediaDetails();
         mediaDetails.addDetail(MediaDetails.INDEX_TITLE, title);
         mediaDetails.addDetail(MediaDetails.INDEX_WIDTH, width);
         mediaDetails.addDetail(MediaDetails.INDEX_HEIGHT, height);
         mediaDetails.addDetail(MediaDetails.INDEX_PATH, path);
         mediaDetails.addDetail(MediaDetails.INDEX_DATETIME,
-                formater.format(new Date(dateModifiedInSeconds * 1000)));
+                dateFormatter.format(new Date(dateModifiedInSeconds * 1000)));
         if (sizeInBytes > 0) {
             mediaDetails.addDetail(MediaDetails.INDEX_SIZE, sizeInBytes);
         }
         if (latitude != 0 && longitude != 0) {
-            mediaDetails.addDetail(MediaDetails.INDEX_LOCATION, latitude + ", " + longitude);
+            String locationString = String.format(Locale.getDefault(), "%f, %f", latitude,
+                    longitude);
+            mediaDetails.addDetail(MediaDetails.INDEX_LOCATION, locationString);
         }
         return mediaDetails;
     }