Fixed an edge case where a format is missing

In the case where the zone's format (zone abbreviation) is simply "%s" and the zone has changed from having DST in the past but not now, then there is no current rule with which to replace the "%s". The work-around is to find the last rule that is available and use its format letters as the format.
iLib-js · Mar 19, 2020 · b0bc19a · b0bc19a
1 parent 867ef0b
commit b0bc19a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 16 deletions.
diff --git a/java/src/com/ilib/tools/zic/Offset.java b/java/src/com/ilib/tools/zic/Offset.java
@@ -245,7 +245,7 @@ public JSONObject getJson(boolean currentOnly)
         	Calendar cal = Calendar.getInstance();
         	int year = cal.get(Calendar.YEAR);
         	rulesList = rules.getRules();
-            Rule startRule = null, endRule = null;
+            Rule startRule = null, endRule = null, lastRule = rulesList.get(rulesList.size()-1);;
             for ( i = 0; i < rulesList.size(); i++ ) {
             	rule = rulesList.get(i);
             	// check year-1 against the end year to take care of the 
@@ -278,13 +278,16 @@ public JSONObject getJson(boolean currentOnly)
                 }
                 json.put("e", wallTime.getJson(currentOnly));
             }
-
-            if ( startRule == null && endRule == null ) {
+
+            if (format.trim().equals("%s")) {
+                json.put("f", lastRule.getCharacter());
+            } else if ( startRule == null && endRule == null ) {
                 // no DST in this time zone, so fix up bogus abbreviations that include the %s when it shouldn't
+                // replace the %s with S for "Standard time"
                 json.put("f", format.replace("%s", "S"));
             }
         }
-        
+
         return json;
     }
 }
diff --git a/js/data/locale/zoneinfo/Africa/Windhoek.json b/js/data/locale/zoneinfo/Africa/Windhoek.json
@@ -1,5 +1,5 @@
 {
-    "f": "S",
+    "f": "WAT",
     "o": "2:0",
     "c": "NA",
     "n": "Namibia {c} Time"

diff --git a/js/data/locale/zoneinfo/America/Belize.json b/js/data/locale/zoneinfo/America/Belize.json
@@ -1,5 +1,5 @@
 {
-    "f": "S",
+    "f": "CST",
     "o": "-6:0",
     "c": "BZ",
     "n": "Central America {c} Time"

diff --git a/js/data/locale/zoneinfo/Antarctica/Troll.json b/js/data/locale/zoneinfo/Antarctica/Troll.json
@@ -5,7 +5,7 @@
         "r": "l0",
         "t": "3:0"
     },
-    "f": "{c}",
+    "f": "+00",
     "o": "0:0",
     "s": {
         "c": "+02",

diff --git a/js/test/date/testdatefmt_af_NA.js b/js/test/date/testdatefmt_af_NA.js
@@ -1225,7 +1225,7 @@ module.exports.testdatefmt_af_NA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 CAT");
+        test.equal(fmt.format(date), "13:45 WAT");
         test.done();
     },
 
@@ -1249,7 +1249,7 @@ module.exports.testdatefmt_af_NA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 CAT");
+        test.equal(fmt.format(date), "13:45 WAT");
         test.done();
     },
 
@@ -1292,7 +1292,7 @@ module.exports.testdatefmt_af_NA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 CAT");
+        test.equal(fmt.format(date), "13:45:37 WAT");
         test.done();
     },
 
@@ -1316,7 +1316,7 @@ module.exports.testdatefmt_af_NA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 CAT");
+        test.equal(fmt.format(date), "13:45:37 WAT");
         test.done();
     },
 
@@ -1474,7 +1474,7 @@ module.exports.testdatefmt_af_NA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 CAT");
+        test.equal(fmt.format(date), "13:45 WAT");
         test.done();
     },
 
@@ -1498,7 +1498,7 @@ module.exports.testdatefmt_af_NA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45 CAT");
+        test.equal(fmt.format(date), "13:45 WAT");
         test.done();
     },
 
@@ -1542,7 +1542,7 @@ module.exports.testdatefmt_af_NA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 CAT");
+        test.equal(fmt.format(date), "13:45:37 WAT");
         test.done();
     },
 
@@ -1566,7 +1566,7 @@ module.exports.testdatefmt_af_NA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 CAT");
+        test.equal(fmt.format(date), "13:45:37 WAT");
         test.done();
     },
 
@@ -1590,7 +1590,7 @@ module.exports.testdatefmt_af_NA = {
             second: 37,
             millisecond: 0
         });
-        test.equal(fmt.format(date), "13:45:37 CAT");
+        test.equal(fmt.format(date), "13:45:37 WAT");
         test.done();
     },