Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 4119 into donut

Browse Source 
* changes:
  Use locale-appropriate formatting to display application sizes like "252KB".
This commit is contained in:
Android (Google) Code Review
2009-06-15 10:09:21 -07:00
parent d83d6606d6 7351dd113f
commit 6c84343f07
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/text/format/Formatter.java
View File

@@ -59,9 +59,15 @@ public final class Formatter {
result = result / 1024; result = result / 1024;
} }
if (result < 100) { if (result < 100) {
return String.format("%.2f%s", result, context.getText(suffix).toString()); String value = String.format("%.2f", result);
return context.getResources().
getString(com.android.internal.R.string.fileSizeSuffix,
value, context.getString(suffix));
} }
return String.format("%.0f%s", result, context.getText(suffix).toString()); String value = String.format("%.0f", result);
return context.getResources().
getString(com.android.internal.R.string.fileSizeSuffix,
value, context.getString(suffix));
} }
/** /**

1
core/res/res/values-fr/strings.xml
View File

@@ -21,6 +21,7 @@
<string name="gigabyteShort">"Go"</string> <string name="gigabyteShort">"Go"</string>
<string name="terabyteShort">"To"</string> <string name="terabyteShort">"To"</string>
<string name="petabyteShort">"Po"</string> <string name="petabyteShort">"Po"</string>
<string name="fileSizeSuffix"><xliff:g id="number" example="123">%1$s</xliff:g> <xliff:g id="unit" example="KB">%2$s</xliff:g></string>
<string name="untitled">"&lt;sans titre&gt;"</string> <string name="untitled">"&lt;sans titre&gt;"</string>
<string name="ellipsis">"…"</string> <string name="ellipsis">"…"</string>
<string name="emptyPhoneNumber">"(Aucun numéro de téléphone)"</string> <string name="emptyPhoneNumber">"(Aucun numéro de téléphone)"</string>

5
core/res/res/values/strings.xml
View File

@@ -30,6 +30,11 @@
<string name="terabyteShort">TB</string> <string name="terabyteShort">TB</string>
<!-- Suffix added to a number to signify size in petabytes. --> <!-- Suffix added to a number to signify size in petabytes. -->
<string name="petabyteShort">PB</string> <string name="petabyteShort">PB</string>
<!-- Format string used to add a suffix like "KB" or "MB" to a number
to display a size in kilobytes, megabytes, or other size units.
Some languages (like French) will want to add a space between
the placeholders. -->
<string name="fileSizeSuffix"><xliff:g id="number" example="123">%1$s</xliff:g><xliff:g id="unit" example="KB">%2$s</xliff:g></string>
<!-- Used in Contacts for a field that has no label and in Note Pad <!-- Used in Contacts for a field that has no label and in Note Pad
for a note with no name. --> for a note with no name. -->