Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  RelativeDateFormatter: Simplify rounding of years and months

Change-Id: I892c18b9d1c75678586ecf757187eae64ce01cd2

gerrit-gwtui-common/src/main/java/com/google/gerrit/client/RelativeDateFormatter.java

diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/RelativeDateFormatter.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/RelativeDateFormatter.java
index fdd6454..e0cc9ca 100644
--- a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/RelativeDateFormatter.java
+++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/RelativeDateFormatter.java
@@ -114,20 +114,13 @@
 
     // up to 5 years use "year, months" rounded to months
     if (ageMillis < 5 * YEAR_IN_MILLIS) {
-      long years = ageMillis / YEAR_IN_MILLIS;
+      long years = round(ageMillis, MONTH_IN_MILLIS) / 12;
       String yearLabel = (years > 1) ? c().years() : c().year();
-      long months = round(ageMillis % YEAR_IN_MILLIS, MONTH_IN_MILLIS);
+      long months = round(ageMillis - years * YEAR_IN_MILLIS, MONTH_IN_MILLIS);
       String monthLabel = (months > 1) ? c().months() : (months == 1 ? c().month() : "");
       if (months == 0) {
         return m().years0MonthsAgo(years, yearLabel);
       }
-      if (months == 12) {
-        years++;
-        if (years > 1) {
-          yearLabel = c().years();
-        }
-        return m().years0MonthsAgo(years, yearLabel);
-      }
       return m().yearsMonthsAgo(years, yearLabel, months, monthLabel);
     }