@reykjavik/webtools 0.1.16 → 0.1.17

package/CHANGELOG.md

@@ -4,6 +4,13 @@
 
 - ... <!-- Add new lines here. -->
 
+## 0.1.17
+
+_2024-03-09_
+
+- `@reykjavik/webtools/fixIcelandicLocale`:
+  - feat: Add support for `DateTimeFormat`'s `dayPeriod` option
+
 ## 0.1.16
 
 _2024-03-09_

package/README.md

@@ -479,7 +479,8 @@ detection test.)
 - For `timeZoneName` the values `"long"`, `"shortGeneric"` and `"longGeneric"`
   will appear in Danish.
 - The `timeStyle: 'full'` option prints the timezone names in Danish
-- The `dayPeriod` option is not supported and prints the day-period in Danish.
+- The `dayPeriod` option has a couple of slight mismatches, at 5 am and 12
+  noon.
 
 ---
 

package/esm/fixIcelandicLocale.privates.js

@@ -128,11 +128,22 @@ const weekdays = {
     lør: 'laugardagur',
     søn: 'sunnudagur',
 };
+const dayPeriods = {
+    AM: ['f.h.'],
+    PM: ['e.h.'],
+    'om natten': ['að nóttu', 'n.'],
+    // Mismatch at 05:00 — da: 'om morgenen', is: 'að nóttu'
+    'om morgenen': ['að morgni', 'mrg.'],
+    'om formiddagen': ['að morgni', 'mrg.'],
+    // Mismatch at 12:00 — da: 'om eftermiddagen', is: 'hádegi'
+    'om eftermiddagen': ['síðdegis', 'sd.'],
+    'om aftenen': ['að kvöldi', 'kv.'],
+};
 const partMappers = {
     month: (value) => {
-        const islMonth = months[value.slice(0, 3)];
-        if (islMonth) {
-            return value.endsWith('.') ? `${islMonth.slice(0, 3)}.` : islMonth;
+        const isl = months[value.slice(0, 3)];
+        if (isl) {
+            return value.endsWith('.') ? `${isl.slice(0, 3)}.` : isl;
         }
     },
     weekday: (value) => {
@@ -150,8 +161,12 @@ const partMappers = {
                     : 'eftir Krist';
         }
     },
-    dayPeriod: (value) => {
-        return { AM: 'f.h.', PM: 'e.h.' }[value] || value;
+    dayPeriod: (value, _, options) => {
+        const isl = dayPeriods[value];
+        if (isl) {
+            const [long, narrow] = isl;
+            return options.dayPeriod === 'narrow' ? narrow : long;
+        }
     },
     literal: (value, lastType) => {
         if (value === ' den ') {
@@ -166,10 +181,11 @@ const reformatDateTimeParts = function (parts) {
     if (!this.mapped) {
         return parts;
     }
+    const options = this.super.resolvedOptions();
     parts.forEach((part, idx) => {
         var _a;
         const mapper = partMappers[part.type];
-        const newValue = mapper && mapper(part.value, (_a = parts[idx - 1]) === null || _a === void 0 ? void 0 : _a.type);
+        const newValue = mapper && mapper(part.value, (_a = parts[idx - 1]) === null || _a === void 0 ? void 0 : _a.type, options);
         if (newValue != null) {
             part.value = newValue;
         }

package/fixIcelandicLocale.privates.js

@@ -133,11 +133,22 @@ const weekdays = {
     lør: 'laugardagur',
     søn: 'sunnudagur',
 };
+const dayPeriods = {
+    AM: ['f.h.'],
+    PM: ['e.h.'],
+    'om natten': ['að nóttu', 'n.'],
+    // Mismatch at 05:00 — da: 'om morgenen', is: 'að nóttu'
+    'om morgenen': ['að morgni', 'mrg.'],
+    'om formiddagen': ['að morgni', 'mrg.'],
+    // Mismatch at 12:00 — da: 'om eftermiddagen', is: 'hádegi'
+    'om eftermiddagen': ['síðdegis', 'sd.'],
+    'om aftenen': ['að kvöldi', 'kv.'],
+};
 const partMappers = {
     month: (value) => {
-        const islMonth = months[value.slice(0, 3)];
-        if (islMonth) {
-            return value.endsWith('.') ? `${islMonth.slice(0, 3)}.` : islMonth;
+        const isl = months[value.slice(0, 3)];
+        if (isl) {
+            return value.endsWith('.') ? `${isl.slice(0, 3)}.` : isl;
         }
     },
     weekday: (value) => {
@@ -155,8 +166,12 @@ const partMappers = {
                     : 'eftir Krist';
         }
     },
-    dayPeriod: (value) => {
-        return { AM: 'f.h.', PM: 'e.h.' }[value] || value;
+    dayPeriod: (value, _, options) => {
+        const isl = dayPeriods[value];
+        if (isl) {
+            const [long, narrow] = isl;
+            return options.dayPeriod === 'narrow' ? narrow : long;
+        }
     },
     literal: (value, lastType) => {
         if (value === ' den ') {
@@ -171,10 +186,11 @@ const reformatDateTimeParts = function (parts) {
     if (!this.mapped) {
         return parts;
     }
+    const options = this.super.resolvedOptions();
     parts.forEach((part, idx) => {
         var _a;
         const mapper = partMappers[part.type];
-        const newValue = mapper && mapper(part.value, (_a = parts[idx - 1]) === null || _a === void 0 ? void 0 : _a.type);
+        const newValue = mapper && mapper(part.value, (_a = parts[idx - 1]) === null || _a === void 0 ? void 0 : _a.type, options);
         if (newValue != null) {
             part.value = newValue;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@reykjavik/webtools",
-	"version": "0.1.16",
+	"version": "0.1.17",
 	"description": "Misc. JS/TS helpers used by Reykjavík City's web dev teams.",
 	"main": "index.js",
 	"repository": "ssh://git@github.com:reykjavikcity/webtools.git",