Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd987727 authored by Danny Baumann's avatar Danny Baumann
Browse files

Allow pluralization of selection string. 

Change-Id: I5823488c80459a6d47ebc0e5f88c453951ebab9c
parent 322a33ab

res/values/plurals.xml

+4 −0
Original line number Diff line number Diff line
@@ -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>

res/values/strings.xml

+0 −2
Original line number Diff line number Diff line
@@ -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>

src/com/cyanogenmod/filemanager/ui/widgets/SelectionView.java

+9 −9
Original line number Diff line number Diff line
@@ -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);

        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 (files == 0) {

            return getContext().getString(R.string.selection_folders_or_files, nFoldersString);

        if (files == 0 || folders == 0) {

            String itemsString = files == 0 ? nFilesString : nFoldersString;

            return res.getQuantityString(R.plurals.selection_folders_or_files,

                    files + folders, itemsString);

        }



        if (folders == 0) {

            return getContext().getString(R.string.selection_folders_or_files, nFilesString);

        }



        return getContext().getString(R.string.selection_folders_and_files, nFoldersString, nFilesString);

        return res.getString(R.string.selection_folders_and_files, nFoldersString, nFilesString);

    }



    /**