From 0a0cfac1cbbbed7b36eaf18998903c398c3736a9 Mon Sep 17 00:00:00 2001
From: danapple <danapple@danapple.com>
Date: Tue, 22 Mar 2011 22:59:30 -0500
Subject: [PATCH] Better internationalization, using real Android pluralization
 API.

---
 res/values/strings.xml                 | 7 +++++--
 src/com/fsck/k9/activity/Accounts.java | 6 ++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0226756b1..9889c0bbb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1036,8 +1036,11 @@ Welcome to K-9 Mail setup.  K-9 is an open source mail client for Android origin
     <string name="settings_exporting">Exporting settings...</string>
     <string name="settings_importing">Importing settings...</string>
     <string name="settings_export_success">Exported settings to <xliff:g id="filename">%s</xliff:g></string>
-    <string name="settings_import_success_multiple">Imported <xliff:g id="numAccounts">%s</xliff:g> accounts from <xliff:g id="filename">%s</xliff:g></string>
-    <string name="settings_import_success_single">Imported 1 account from <xliff:g id="filename">%s</xliff:g></string>
+    <string name="settings_import_success">Imported <xliff:g id="accounts">%s</xliff:g> from <xliff:g id="filename">%s</xliff:g></string>
+    <plurals name="settings_import_success">
+        <item quantity="one">1 account</item>
+        <item quantity="other"><xliff:g id="numAccounts">%s</xliff:g> accounts</item>
+    </plurals>
     <string name="settings_export_failure">Failed to export settings: <xliff:g id="reason">%s</xliff:g></string>
     <string name="settings_import_failure">Failed to import settings from <xliff:g id="filename">%s</xliff:g>: <xliff:g id="reason">%s</xliff:g></string>
     <string name="settings_export_success_header">Export succeeded</string>
diff --git a/src/com/fsck/k9/activity/Accounts.java b/src/com/fsck/k9/activity/Accounts.java
index 0f46665c2..9d3542eb1 100644
--- a/src/com/fsck/k9/activity/Accounts.java
+++ b/src/com/fsck/k9/activity/Accounts.java
@@ -859,10 +859,8 @@ public class Accounts extends K9ListActivity implements OnItemClickListener, OnC
             @Override
             public void success(int numAccounts) {
                 mHandler.progress(false);
-                String messageText =
-                    numAccounts != 1
-                    ? Accounts.this.getString(R.string.settings_import_success_multiple, numAccounts, fileName)
-                    : Accounts.this.getString(R.string.settings_import_success_single, fileName);
+                String accountQtyText = getResources().getQuantityString(R.plurals.settings_import_success, numAccounts, numAccounts);
+                String messageText = getString(R.string.settings_import_success, accountQtyText, fileName);
                 showDialog(Accounts.this, R.string.settings_import_success_header, messageText);
                 runOnUiThread(new Runnable() {
                     @Override