diff options
Diffstat (limited to 'org.fox.ttrss/src/main/java')
3 files changed, 5 insertions, 5 deletions
diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java index b3491972..e12b35d3 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DashClock.java @@ -56,7 +56,7 @@ public class DashClock extends DashClockExtension { updatedData.icon(R.drawable.dashclock); updatedData.status(String.valueOf(unread)); - updatedData.expandedTitle(getString(R.string.n_unread_articles, unread)); + updatedData.expandedTitle(getResources().getQuantityString(R.plurals.n_unread_articles, unread, unread)); //updatedData.expandedBody(getString(R.string.app_name)); updatedData.clickIntent(new Intent().setClassName("org.fox.ttrss", diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index c1adef52..e5e35ebf 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -526,10 +526,10 @@ public class OnlineActivity extends CommonActivity { dialog.show(); } else { - long daysLeft = Math.round((firstStart + (TRIAL_DAYS * 24 * 60 * 60 * 1000) - System.currentTimeMillis()) / (24 * 60 * 60 * 1000)); + int daysLeft = Math.round((firstStart + (TRIAL_DAYS * 24 * 60 * 60 * 1000) - System.currentTimeMillis()) / (24 * 60 * 60 * 1000)); if (notify) { - toast(getString(R.string.trial_mode_prompt, Long.valueOf(daysLeft))); + toast(getResources().getQuantityString(R.plurals.trial_mode_prompt, daysLeft, daysLeft)); } } } else if (notify) { @@ -797,7 +797,7 @@ public class OnlineActivity extends CommonActivity { if (confirm) { AlertDialog.Builder builder = new AlertDialog.Builder( OnlineActivity.this) - .setMessage(getString(R.string.mark_num_headlines_as_read, count)) + .setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count)) .setPositiveButton(R.string.catchup, new Dialog.OnClickListener() { public void onClick(DialogInterface dialog, diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java index fd05b596..ebf1bb07 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java @@ -422,7 +422,7 @@ public class OfflineActivity extends CommonActivity { if (confirm) { AlertDialog.Builder builder = new AlertDialog.Builder( OfflineActivity.this) - .setMessage(getString(R.string.mark_num_headlines_as_read, count)) + .setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count)) .setPositiveButton(R.string.catchup, new Dialog.OnClickListener() { public void onClick(DialogInterface dialog, |