Skip to content

android plurals #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkmcnk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

android plurals #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions res/values-hr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<resources>

<string name="time_ago_prefix">prije</string>
<string name="time_ago_suffix"></string>

<string name="time_ago_seconds">manje od minute</string>
<string name="time_ago_minute">jedne minute</string>
<string name="time_ago_hour">jednog sata</string>
<string name="time_ago_day">jednog dana</string>
<string name="time_ago_month">jednog mjeseca</string>
<string name="time_ago_year">jedne godine</string>

<plurals name="time_ago_minutes">
<item quantity="one">%d minute</item>
<item quantity="few">%d minute</item>
<item quantity="other">%d minuta</item>
</plurals>
<plurals name="time_ago_hours">
<item quantity="one">%d sata</item>
<item quantity="few">%d sata</item>
<item quantity="other">%d sati</item>
</plurals>
<plurals name="time_ago_days">
<item quantity="one">%d dana</item>
<item quantity="few">%d dana</item>
<item quantity="other">%d dana</item>
</plurals>
<plurals name="time_ago_months">
<item quantity="one">%d mjeseca</item>
<item quantity="few">%d mjeseca</item>
<item quantity="other">%d mjeseca</item>
</plurals>
<plurals name="time_ago_years">
<item quantity="one">%d godine</item>
<item quantity="few">%d godine</item>
<item quantity="other">%d godina</item>
</plurals>

</resources>
34 changes: 34 additions & 0 deletions res/values-ro/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<resources>

<string name="time_ago_prefix"></string>
<string name="time_ago_suffix">ago</string>

<string name="time_ago_seconds">less than a minute</string>
<string name="time_ago_minute">about a minute</string>
<string name="time_ago_hour">about an hour</string>
<string name="time_ago_day">a day</string>
<string name="time_ago_month">about a month</string>
<string name="time_ago_year">about a year</string>

<plurals name="time_ago_minutes">
<item quantity="one">%d minute</item>
<item quantity="other">%d minutes</item>
</plurals>
<plurals name="time_ago_hours">
<item quantity="one">%d hour</item>
<item quantity="other">about %d hours</item>
</plurals>
<plurals name="time_ago_days">
<item quantity="one">%d day</item>
<item quantity="other">%d days</item>
</plurals>
<plurals name="time_ago_months">
<item quantity="one">%d month</item>
<item quantity="other">%d months</item>
</plurals>
<plurals name="time_ago_years">
<item quantity="one">%d year</item>
<item quantity="other">%d years</item>
</plurals>

</resources>
44 changes: 44 additions & 0 deletions res/values-sl/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
<resources>

<string name="time_ago_prefix">pred</string>
<string name="time_ago_suffix"></string>

<string name="time_ago_seconds">manj kot minuto</string>
<string name="time_ago_minute">približno minuto</string>
<string name="time_ago_hour">približno uro</string>
<string name="time_ago_day">približno dnevom</string>
<string name="time_ago_month">približno mesecem</string>
<string name="time_ago_year">približno letom</string>

<plurals name="time_ago_minutes">
<item quantity="one">%d minuto</item>
<item quantity="two">%d minutama</item>
<item quantity="few">%d minutami</item>
<item quantity="other">%d minutami</item>
</plurals>
<plurals name="time_ago_hours">
<item quantity="one">%d uro</item>
<item quantity="two">približno %d urama</item>
<item quantity="few">približno %d urami</item>
<item quantity="other">približno %d urami</item>
</plurals>
<plurals name="time_ago_days">
<item quantity="one">%d dnevom</item>
<item quantity="two">%d dnevoma</item>
<item quantity="few">%d dnevi</item>
<item quantity="other">%d dnevi</item>
</plurals>
<plurals name="time_ago_months">
<item quantity="one">%d mesecem</item>
<item quantity="two">%d mesecema</item>
<item quantity="few">%d meseci</item>
<item quantity="other">%d meseci</item>
</plurals>
<plurals name="time_ago_years">
<item quantity="one">%d letom</item>
<item quantity="two">%d letoma</item>
<item quantity="few">%d leti</item>
<item quantity="other">%d leti</item>
</plurals>

</resources>
39 changes: 39 additions & 0 deletions res/values-sr/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<resources>

<string name="time_ago_prefix">pre</string>
<string name="time_ago_suffix"></string>

<string name="time_ago_seconds">manje od minuta</string>
<string name="time_ago_minute">jednog minuta</string>
<string name="time_ago_hour">jednog sata</string>
<string name="time_ago_day">jednog dana</string>
<string name="time_ago_month">jednog meseca</string>
<string name="time_ago_year">godinu dana</string>

<plurals name="time_ago_minutes">
<item quantity="one">%d minute</item>
<item quantity="few">%d minuta</item>
<item quantity="other">%d minuta</item>
</plurals>
<plurals name="time_ago_hours">
<item quantity="one">%d sata</item>
<item quantity="few">%d sata</item>
<item quantity="other">%d sati</item>
</plurals>
<plurals name="time_ago_days">
<item quantity="one">%d dana</item>
<item quantity="few">%d dana</item>
<item quantity="other">%d dana</item>
</plurals>
<plurals name="time_ago_months">
<item quantity="one">%d meseca</item>
<item quantity="few">%d meseca</item>
<item quantity="other">%d meseca</item>
</plurals>
<plurals name="time_ago_years">
<item quantity="one">%d godine</item>
<item quantity="few">%d godine</item>
<item quantity="other">%d godina</item>
</plurals>

</resources>
29 changes: 23 additions & 6 deletions res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,33 @@

<string name="time_ago_prefix"></string>
<string name="time_ago_suffix">ago</string>

<string name="time_ago_seconds">less than a minute</string>
<string name="time_ago_minute">about a minute</string>
<string name="time_ago_minutes">%d minutes</string>
<string name="time_ago_hour">about an hour</string>
<string name="time_ago_hours">about %d hours</string>
<string name="time_ago_day">a day</string>
<string name="time_ago_days">%d days</string>
<string name="time_ago_month">about a month</string>
<string name="time_ago_months">%d months</string>
<string name="time_ago_year">about a year</string>
<string name="time_ago_years">%d years</string>

<plurals name="time_ago_minutes">
<item quantity="one">%d minute</item>
<item quantity="other">%d minutes</item>
</plurals>
<plurals name="time_ago_hours">
<item quantity="one">%d hour</item>
<item quantity="other">about %d hours</item>
</plurals>
<plurals name="time_ago_days">
<item quantity="one">%d day</item>
<item quantity="other">%d days</item>
</plurals>
<plurals name="time_ago_months">
<item quantity="one">%d month</item>
<item quantity="other">%d months</item>
</plurals>
<plurals name="time_ago_years">
<item quantity="one">%d year</item>
<item quantity="other">%d years</item>
</plurals>

</resources>
</resources>
17 changes: 11 additions & 6 deletions src/com/lukazakrajsek/timeago/TimeAgo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,27 +34,32 @@ public String timeAgo(long millis) {
String words;

if (seconds < 45) {
words = r.getString(R.string.time_ago_seconds, Math.round(seconds));
words = r.getString(R.string.time_ago_seconds, (int)Math.round(seconds));
} else if (seconds < 90) {
words = r.getString(R.string.time_ago_minute, 1);
} else if (minutes < 45) {
words = r.getString(R.string.time_ago_minutes, Math.round(minutes));
words = r.getQuantityString(R.plurals.time_ago_minutes,
(int)Math.round(minutes), (int)Math.round(minutes));
} else if (minutes < 90) {
words = r.getString(R.string.time_ago_hour, 1);
} else if (hours < 24) {
words = r.getString(R.string.time_ago_hours, Math.round(hours));
words = r.getQuantityString(R.plurals.time_ago_hours,
(int)Math.round(hours), (int)Math.round(hours));
} else if (hours < 42) {
words = r.getString(R.string.time_ago_day, 1);
} else if (days < 30) {
words = r.getString(R.string.time_ago_days, Math.round(days));
words = r.getQuantityString(R.plurals.time_ago_days,
(int)Math.round(days), (int)Math.round(days));
} else if (days < 45) {
words = r.getString(R.string.time_ago_month, 1);
} else if (days < 365) {
words = r.getString(R.string.time_ago_months, Math.round(days / 30));
words = r.getQuantityString(R.plurals.time_ago_months,
(int)Math.round(days / 30), (int)Math.round(days / 30));
} else if (years < 1.5) {
words = r.getString(R.string.time_ago_year, 1);
} else {
words = r.getString(R.string.time_ago_years, Math.round(years));
words = r.getQuantityString(R.plurals.time_ago_years,
(int)Math.round(years), (int)Math.round(years));
}

StringBuilder sb = new StringBuilder();
Expand Down