commit db5c275f3df89ed4b7b352194ef2fead6c871e7c
author Michael Osipov <michaelo@apache.org> Thu Jun 28 19:55:02 2018 +0000
committer Michael Osipov <michaelo@apache.org> Thu Jun 28 19:55:02 2018 +0000
tree 74c206f7f47cd8e14514cf63366318513777850b
parent b67c7f159b841273794d79637f6b2b6ebcb29de2

Use wellknown abbreviations allowed by BIPM

git-svn-id: https://svn.apache.org/repos/asf/velocity/tools/trunk@1834638 13f79535-47bb-0310-9956-ffa450edef68

velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/times.properties

diff --git a/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/times.properties b/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/times.properties
index 95a9432..1ec93e7 100644
--- a/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/times.properties
+++ b/velocity-tools-generic/src/main/resources/org/apache/velocity/tools/generic/times.properties
@@ -58,13 +58,13 @@
 seconds.abbr=s
 minute.abbr=min
 minutes.abbr=min
-hour.abbr=hr
-hours.abbr=hrs
-day.abbr=day
-days.abbr=days
-week.abbr=wk
-weeks.abbr=wks
-month.abbr=mo
-months.abbr=mos
-year.abbr=yr
-years.abbr=yrs
+hour.abbr=h
+hours.abbr=h
+day.abbr=d
+days.abbr=d
+week.abbr=w
+weeks.abbr=w
+month.abbr=m
+months.abbr=m
+year.abbr=y
+years.abbr=y