Improve range formatting

craftcms · Sep 20, 2022 · 4f16229 · 4f16229
1 parent 7032a00
commit 4f16229
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/i18n/I18N.php b/src/i18n/I18N.php
@@ -350,6 +350,9 @@ public function translate($category, $message, $params, $language)
             }
         }
 
+        // Normalize ranges to use thin spaces and en-dashes (see https://clagnut.com/blog/2419)
+        $translation = preg_replace('/(?<=\d) ?(?:-|–|—) ?(?=\d)/', ' – ', $translation);
+
         if ($this->_shouldAddTranslationDebugOutput()) {
             switch ($category) {
                 case 'site':

diff --git a/src/web/assets/cp/dist/cp.js b/src/web/assets/cp/dist/cp.js
diff --git a/src/web/assets/cp/dist/cp.js.map b/src/web/assets/cp/dist/cp.js.map
diff --git a/src/web/assets/cp/src/js/Craft.js b/src/web/assets/cp/src/js/Craft.js
@@ -83,10 +83,11 @@ $.extend(Craft, {
     }
 
     if (params) {
-      return this.formatMessage(message, params);
+      message = this.formatMessage(message, params);
     }
 
-    return message;
+    // Normalize ranges to use thin spaces and en-dashes (see https://clagnut.com/blog/2419)
+    return message.replace(/(\d) ?(?:-|–|—) ?(\d)/, '$1 – $2', message);
   },
 
   formatMessage: function (pattern, args) {