Automated import from //branches/cupcake/...@142959,142959
diff --git a/res/values-ja/donottranslate.xml b/res/values-ja/donottranslate.xml
new file mode 100644
index 0000000..6988a55
--- /dev/null
+++ b/res/values-ja/donottranslate.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Order of weekday/day label in week view -->
+ <string name="weekday_day">%2$s %1$s</string>
+</resources>
diff --git a/res/values/donottranslate.xml b/res/values/donottranslate.xml
new file mode 100644
index 0000000..62953d3
--- /dev/null
+++ b/res/values/donottranslate.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Order of weekday/day label in week view -->
+ <string name="weekday_day">%1$s %2$s</string>
+</resources>
diff --git a/src/com/android/calendar/CalendarView.java b/src/com/android/calendar/CalendarView.java
index 8185006..3eb799a 100644
--- a/src/com/android/calendar/CalendarView.java
+++ b/src/com/android/calendar/CalendarView.java
@@ -1389,13 +1389,17 @@
dateNum -= mMonthLength;
}
+ String dateNumStr;
// Add a leading zero if the date is a single digit
if (dateNum < 10) {
- dateStr += " 0" + dateNum;
+ dateNumStr = "0" + dateNum;
} else {
- dateStr += " " + dateNum;
+ dateNumStr = String.valueOf(dateNum);
}
+ dateStr = getResources().getString(R.string.weekday_day,
+ dateStr, dateNumStr);
+
float y = mBannerPlusMargin - 7;
canvas.drawText(dateStr, xCenter, y, p);
}