Skip to content

Commit

Permalink
Merge pull request #134 from vvidovic/master
Browse files Browse the repository at this point in the history 
Fix - updated Croatian translation
  • Loading branch information
@lincolnthree
lincolnthree committed Feb 9, 2017
2 parents 9344030 + 7c2132d commit 11857bf
Show file tree
Hide file tree
Showing 2 changed files with 213 additions and 1 deletion.
180 changes: 179 additions & 1 deletion core/src/main/java/org/ocpsoft/prettytime/i18n/Resources_hr.java
View file
Expand Up @@ -15,9 +15,27 @@
*/
package org.ocpsoft.prettytime.i18n;

import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.ListResourceBundle;
import java.util.ResourceBundle;

public class Resources_hr extends ListResourceBundle
import org.ocpsoft.prettytime.Duration;
import org.ocpsoft.prettytime.TimeFormat;
import org.ocpsoft.prettytime.TimeUnit;
import org.ocpsoft.prettytime.format.SimpleTimeFormat;
import org.ocpsoft.prettytime.impl.TimeFormatProvider;
import org.ocpsoft.prettytime.units.Day;
import org.ocpsoft.prettytime.units.Hour;
import org.ocpsoft.prettytime.units.Millennium;
import org.ocpsoft.prettytime.units.Minute;
import org.ocpsoft.prettytime.units.Month;
import org.ocpsoft.prettytime.units.Week;
import org.ocpsoft.prettytime.units.Year;

public class Resources_hr extends ListResourceBundle implements TimeFormatProvider
{
private static final Object[][] OBJECTS = new Object[][] {
{ "CenturyPattern", "%n %u" },
Expand Down Expand Up @@ -118,4 +136,164 @@ public Object[][] getContents()
return OBJECTS;
}

@Override
public TimeFormat getFormatFor(final TimeUnit t) {
if (t instanceof Minute) {
return new HrTimeFormatBuilder("Minute").addNames("minutu", 1)
.addNames("minute", 4).addNames("minuta", Long.MAX_VALUE)
.build(this);
} else if (t instanceof Hour) {
return new HrTimeFormatBuilder("Hour").addNames("sat", 1)
.addNames("sata", 4).addNames("sati", Long.MAX_VALUE)
.build(this);
} else if (t instanceof Day) {
return new HrTimeFormatBuilder("Day").addNames("dan", 1)
.addNames("dana", 4).addNames("dana", Long.MAX_VALUE)
.build(this);
} else if (t instanceof Week) {
return new HrTimeFormatBuilder("Week").addNames("tjedan", 1)
.addNames("tjedna", 4).addNames("tjedana", Long.MAX_VALUE)
.build(this);
} else if (t instanceof Month) {
return new HrTimeFormatBuilder("Month").addNames("mjesec", 1)
.addNames("mjeseca", 4).addNames("mjeseci", Long.MAX_VALUE)
.build(this);
} else if (t instanceof Year) {
return new HrTimeFormatBuilder("Year").addNames("godinu", 1)
.addNames("godine", 4).addNames("godina", Long.MAX_VALUE)
.build(this);
} else if (t instanceof Millennium) {
return new HrTimeFormatBuilder("Millennium")
.addNames("tisućljeće", 1).addNames("tisućljeća", Long.MAX_VALUE)
.build(this);
}
// Don't override format for other time units
return null;
}

private static class HrName implements Comparable<HrName> {

private final boolean isFuture;

private final Long threshold;

private final String value;

public HrName(final boolean isFuture, final String value, final Long threshold) {
this.isFuture = isFuture;
this.value = value;
this.threshold = threshold;
}

@Override
public int compareTo(final HrName o) {
return threshold.compareTo(o.getThreshold());
}

public String get() {
return value;
}

public long getThreshold() {
return threshold;
}

public boolean isFuture() {
return isFuture;
}
}

private static class HrTimeFormat extends SimpleTimeFormat implements TimeFormat {

private final List<HrName> futureNames = new ArrayList<Resources_hr.HrName>();

private final List<HrName> pastNames = new ArrayList<Resources_hr.HrName>();

public HrTimeFormat(final String resourceKeyPrefix, final ResourceBundle bundle, final Collection<HrName> names) {
setPattern(bundle.getString(resourceKeyPrefix + "Pattern"));
setFuturePrefix(bundle.getString(resourceKeyPrefix + "FuturePrefix"));
setFutureSuffix(bundle.getString(resourceKeyPrefix + "FutureSuffix"));
setPastPrefix(bundle.getString(resourceKeyPrefix + "PastPrefix"));
setPastSuffix(bundle.getString(resourceKeyPrefix + "PastSuffix"));
setSingularName(bundle.getString(resourceKeyPrefix + "SingularName"));
setPluralName(bundle.getString(resourceKeyPrefix + "PluralName"));

try {
setFuturePluralName(bundle.getString(resourceKeyPrefix + "FuturePluralName"));
} catch (final Exception e) {
}
try {
setFutureSingularName(bundle.getString(resourceKeyPrefix + "FutureSingularName"));
} catch (final Exception e) {
}
try {
setPastPluralName(bundle.getString(resourceKeyPrefix + "PastPluralName"));
} catch (final Exception e) {
}
try {
setPastSingularName(bundle.getString(resourceKeyPrefix + "PastSingularName"));
} catch (final Exception e) {
}

for (final HrName name : names) {
if (name.isFuture()) {
futureNames.add(name);
}
else {
pastNames.add(name);
}
}
Collections.sort(futureNames);
Collections.sort(pastNames);
}

private String getGramaticallyCorrectName(final long quantity, final List<HrName> names) {
for (final HrName name : names) {
if (name.getThreshold() >= quantity) {
return name.get();
}
}
throw new IllegalStateException("Invalid resource bundle configuration");
}

@Override
protected String getGramaticallyCorrectName(final Duration d, final boolean round) {
final long quantity = Math.abs(getQuantity(d, round));
if (d.isInFuture()) {
return getGramaticallyCorrectName(quantity, futureNames);
}
return getGramaticallyCorrectName(quantity, pastNames);
}

}

private static class HrTimeFormatBuilder {

private final List<HrName> names = new ArrayList<Resources_hr.HrName>();

private final String resourceKeyPrefix;

HrTimeFormatBuilder(final String resourceKeyPrefix) {
this.resourceKeyPrefix = resourceKeyPrefix;
}

private HrTimeFormatBuilder addName(final boolean isFuture, final String name, final long limit) {
if (name == null) {
throw new IllegalArgumentException();
}
names.add(new HrName(isFuture, name, limit));
return this;
}

HrTimeFormatBuilder addNames(final String name, final long limit) {
return addName(true, name, limit).addName(false, name, limit);
}

HrTimeFormat build(final ResourceBundle bundle) {
return new HrTimeFormat(resourceKeyPrefix, bundle, names);
}

}


}
34 changes: 34 additions & 0 deletions core/src/test/java/org/ocpsoft/prettytime/i18n/Resources_hrTest.java
View file
@@ -0,0 +1,34 @@
package org.ocpsoft.prettytime.i18n;

import java.util.Date;
import java.util.Locale;

import org.junit.Assert;
import org.junit.Test;
import org.ocpsoft.prettytime.PrettyTime;

public class Resources_hrTest {

private static final int MINUTES = 1000 * 60;

@Test
public void testFormatMinute() throws Exception
{
PrettyTime prettyTime = new PrettyTime(new Locale("hr"));

Assert.assertEquals("za 1 minutu", prettyTime.format(new Date(System.currentTimeMillis() + 1*MINUTES)));
Assert.assertEquals("za 2 minute", prettyTime.format(new Date(System.currentTimeMillis() + 2*MINUTES)));
Assert.assertEquals("za 3 minute", prettyTime.format(new Date(System.currentTimeMillis() + 3*MINUTES)));
Assert.assertEquals("za 4 minute", prettyTime.format(new Date(System.currentTimeMillis() + 4*MINUTES)));
Assert.assertEquals("za 5 minuta", prettyTime.format(new Date(System.currentTimeMillis() + 5*MINUTES)));
Assert.assertEquals("za 6 minuta", prettyTime.format(new Date(System.currentTimeMillis() + 6*MINUTES)));

Assert.assertEquals("prije 1 minutu", prettyTime.format(new Date(System.currentTimeMillis() - 1*MINUTES)));
Assert.assertEquals("prije 2 minute", prettyTime.format(new Date(System.currentTimeMillis() - 2*MINUTES)));
Assert.assertEquals("prije 3 minute", prettyTime.format(new Date(System.currentTimeMillis() - 3*MINUTES)));
Assert.assertEquals("prije 4 minute", prettyTime.format(new Date(System.currentTimeMillis() - 4*MINUTES)));
Assert.assertEquals("prije 5 minuta", prettyTime.format(new Date(System.currentTimeMillis() - 5*MINUTES)));
Assert.assertEquals("prije 6 minuta", prettyTime.format(new Date(System.currentTimeMillis() - 6*MINUTES)));
}

}

0 comments on commit 11857bf

Please sign in to comment.