summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2014-08-27 09:53:53 +0200
committerDanny Baumann <dannybaumann@web.de>2014-08-27 09:53:53 +0200
commitb6ec99649ccd9a4c92a1e9b9d4e38db92e09e040 (patch)
tree8b2133c02deb8fff15e8b54b441e6d64ee065074
parentdc80122af73fc908118395b2a75837d503e445d3 (diff)
downloadandroid_packages_apps_Calendar-b6ec99649ccd9a4c92a1e9b9d4e38db92e09e040.tar.gz
android_packages_apps_Calendar-b6ec99649ccd9a4c92a1e9b9d4e38db92e09e040.tar.bz2
android_packages_apps_Calendar-b6ec99649ccd9a4c92a1e9b9d4e38db92e09e040.zip
Improve delete handling strings.
Change-Id: I5e9d6ab5a805b9968fcb8ed2453061de51cd9a69
-rw-r--r--res/values/cm_plurals.xml21
-rw-r--r--res/values/cm_strings.xml3
-rw-r--r--src/com/android/calendar/DeleteEventsActivity.java3
3 files changed, 24 insertions, 3 deletions
diff --git a/res/values/cm_plurals.xml b/res/values/cm_plurals.xml
new file mode 100644
index 00000000..d7caea6f
--- /dev/null
+++ b/res/values/cm_plurals.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2014 The CyanogenMod 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">
+ <plurals name="events_selected">
+ <item quantity="other">%1$d selected</item>
+ </plurals>
+</resources>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 0f6437cf..f9bef662 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -40,8 +40,7 @@
<string name="action_delete">Done</string>
<string name="all_events">All events</string>
<string name="no_events">No events available</string>
- <string name="selected">selected</string>
- <string name="evt_del_dlg_title">Delete Events?</string>
+ <string name="evt_del_dlg_title">Delete events?</string>
<string name="evt_del_dlg_msg_selected">Selected events will be deleted</string>
<string name="evt_del_dlg_msg_all">All events will be deleted</string>
<string name="no_events_selected">No events selected</string>
diff --git a/src/com/android/calendar/DeleteEventsActivity.java b/src/com/android/calendar/DeleteEventsActivity.java
index ddfc1da9..abeb4718 100644
--- a/src/com/android/calendar/DeleteEventsActivity.java
+++ b/src/com/android/calendar/DeleteEventsActivity.java
@@ -376,7 +376,8 @@ public class DeleteEventsActivity extends ListActivity
private void updateTitle() {
if (mActionMode != null) {
mActionMode.setTitle(getString(R.string.events_delete));
- mActionMode.setSubtitle(" " + mSelectedMap.size() + " " + getString(R.string.selected));
+ mActionMode.setSubtitle(getResources().getQuantityString(R.plurals.events_selected,
+ mSelectedMap.size(), mSelectedMap.size()));
}
}