summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Fischer <enf@google.com>2009-05-12 12:00:49 -0700
committerEric Fischer <enf@google.com>2009-05-12 12:00:49 -0700
commit0a9c47474e4b08aa5cd7f61da0b7135efb0ea624 (patch)
tree4dc301906d432626b3213038f34fceb128f13f1c
parentd81f88aef664f4788c74638d7d2747cb8d280a68 (diff)
downloadMms-0a9c47474e4b08aa5cd7f61da0b7135efb0ea624.tar.gz
Let translators reformat the "Name: " prefix of MMS messages.
Move it to a resource string so that there can be a space before the colon in French.
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/com/android/mms/ui/MessageListItem.java9
2 files changed, 7 insertions, 4 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 23a5352f..81a8e26f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -95,6 +95,8 @@
<!-- Message displayed in place of the "download message" button once it has been pressed,
indicating that the download is in progress -->
<string name="downloading">Downloading</string>
+ <!-- Formatting for prepending MMS message text with sender's name. -->
+ <string name="name_colon"><b><xliff:g id="name" example="Me">%s</xliff:g></b>": "</string>
<!-- Formatting for subject displayed inline, prepended to MMS message text -->
<string name="inline_subject">"&lt;Subject: <xliff:g id="subject">%s</xliff:g>&gt;"</string>
<!-- Text to display when the actual text is inaccessible due to DRM protection -->
diff --git a/src/com/android/mms/ui/MessageListItem.java b/src/com/android/mms/ui/MessageListItem.java
index a52d0cdb..bc45ae65 100644
--- a/src/com/android/mms/ui/MessageListItem.java
+++ b/src/com/android/mms/ui/MessageListItem.java
@@ -276,10 +276,11 @@ public class MessageListItem extends LinearLayout implements
private CharSequence formatMessage(String contact, String body, String subject,
String timestamp) {
- SpannableStringBuilder buf = new SpannableStringBuilder(contact);
- buf.append(": ");
- buf.setSpan(STYLE_BOLD, 0, buf.length(),
- Spannable.SPAN_INCLUSIVE_EXCLUSIVE);
+ CharSequence template = mContext.getResources().getText(R.string.name_colon);
+ SpannableStringBuilder buf =
+ new SpannableStringBuilder(TextUtils.replace(template,
+ new String[] { "%s" },
+ new CharSequence[] { contact }));
boolean hasSubject = !TextUtils.isEmpty(subject);
if (hasSubject) {