diff options
| author | Danny Baumann <dannybaumann@web.de> | 2013-07-22 17:43:33 +0200 |
|---|---|---|
| committer | Danny Baumann <dannybaumann@web.de> | 2013-07-22 17:43:33 +0200 |
| commit | cd987727c9ac17eaf3e1cb234f32e30a9bde4110 (patch) | |
| tree | 45f01ed3a0badd34a09eed8f9277539df4516288 | |
| parent | 322a33abfcbcc4d0318c0532d17982088618ef31 (diff) | |
| download | android_packages_apps_CMFileManager-cd987727c9ac17eaf3e1cb234f32e30a9bde4110.tar.gz android_packages_apps_CMFileManager-cd987727c9ac17eaf3e1cb234f32e30a9bde4110.tar.bz2 android_packages_apps_CMFileManager-cd987727c9ac17eaf3e1cb234f32e30a9bde4110.zip | |
Allow pluralization of selection string.
Change-Id: I5823488c80459a6d47ebc0e5f88c453951ebab9c
| -rw-r--r-- | res/values/plurals.xml | 4 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java | 18 |
3 files changed, 13 insertions, 11 deletions
diff --git a/res/values/plurals.xml b/res/values/plurals.xml index 27f67bf7..78d0db44 100644 --- a/res/values/plurals.xml +++ b/res/values/plurals.xml @@ -27,4 +27,8 @@ <item quantity="one">1 item found</item> <item quantity="other"><xliff:g id="count">%d</xliff:g> items found</item> </plurals> + <!-- Selection --> + <plurals name="selection_folders_or_files"> + <item quantity="other"><xliff:g id="items">%1$s</xliff:g> selected.</item> + </plurals> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 5c647229..91044659 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -593,8 +593,6 @@ <string name="filetime_format_mode_yyyyMMdd_HHmmss">yyyy-mm-dd hh:mm:ss</string> <!-- Selection. --> - <!-- For example "2 files selected." or "2 folders selected." --> - <string name="selection_folders_or_files"><xliff:g id="items">%1$s</xliff:g> selected.</string> <!-- For example "2 folders and 1 file selected." --> <string name="selection_folders_and_files"><xliff:g id="folders">%1$s</xliff:g> and <xliff:g id="files">%2$s</xliff:g> selected.</string> diff --git a/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java b/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java index 630b6b04..cd53e82f 100644 --- a/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java +++ b/src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java @@ -17,6 +17,7 @@ package com.cyanogenmod.filemanager.ui.widgets; import android.content.Context; +import android.content.res.Resources; import android.util.AttributeSet; import android.view.View; import android.view.ViewGroup; @@ -124,18 +125,17 @@ public class SelectionView extends LinearLayout { } // Get the string - String nFoldersString = getContext().getResources().getQuantityString(R.plurals.n_folders, folders, folders); - String nFilesString = getContext().getResources().getQuantityString(R.plurals.n_files, files, files); - - if (files == 0) { - return getContext().getString(R.string.selection_folders_or_files, nFoldersString); - } + final Resources res = getContext().getResources(); + String nFoldersString = res.getQuantityString(R.plurals.n_folders, folders, folders); + String nFilesString = res.getQuantityString(R.plurals.n_files, files, files); - if (folders == 0) { - return getContext().getString(R.string.selection_folders_or_files, nFilesString); + if (files == 0 || folders == 0) { + String itemsString = files == 0 ? nFilesString : nFoldersString; + return res.getQuantityString(R.plurals.selection_folders_or_files, + files + folders, itemsString); } - return getContext().getString(R.string.selection_folders_and_files, nFoldersString, nFilesString); + return res.getString(R.string.selection_folders_and_files, nFoldersString, nFilesString); } /** |