@atlassian/aui 9.13.0 → 9.13.2

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@atlassian/aui",
     "description": "Atlassian User Interface library",
-    "version": "9.13.0",
+    "version": "9.13.2",
     "author": "Atlassian Pty Ltd.",
     "homepage": "https://aui.atlassian.com",
     "license": "Apache-2.0",

package/src/js/aui/date-picker.js

@@ -508,6 +508,12 @@ DatePicker.prototype.localisations = {
     yearSuffix: I18n.getText('ajs.datepicker.localisations.year-suffix'),
 };
 
+// TODO Workaround a localisation issue in WRM related to empty strings not being considered as valid localisation values
+// TODO Remove once this WRM PR is pulled in via platform (most probably) 8: https://bitbucket.org/atlassian/atlassian-plugins-webresource/pull-requests/1761/overview
+if (DatePicker.prototype.localisations.yearSuffix === 'ajs.datepicker.localisations.year-suffix') {
+    DatePicker.prototype.localisations.yearSuffix = '';
+}
+
 // -------------------------------------------------------------------------
 // finally, integrate with jQuery for convenience --------------------------
 // -------------------------------------------------------------------------

package/src/js/aui/i18n.js

@@ -1,7 +1,7 @@
 // Import the I18n system from the WRM, webpack handles this
 import 'wrmI18n';
 import format from './format';
-import { putOnI18nIfAbsent } from './internal/globalize';
+import { globalizeI18n } from './internal/globalize';
 import keys from './internal/i18n/aui';
 
 /**
@@ -9,7 +9,7 @@ import keys from './internal/i18n/aui';
  * the key is returned - this could occur in plugin mode if the I18n transform is not performed;
  * or in flatpack mode if the i18n JS file is not loaded.
  */
-const I18n = {
+const auiI18n = {
     keys: keys,
     getText: function (key, ...params) {
         if (Object.prototype.hasOwnProperty.call(this.keys, key)) {
@@ -20,16 +20,12 @@ const I18n = {
     },
 };
 
-export { I18n, format };
-
 /**
  * Deprecated - do not use AJS.I18n.getText from global scope within AUI code. Use import { I18n } from '../i18n'
  * Also keep in mind that WRM is looking for patterns like "I18n.getText" so do not create
  * aliases for I18n or export it from here using 'default'. Webpack transforms it then to
  * 'd.default.getText' and it won't match.
  **/
-// eslint-disable-next-line guard-for-in
-for (const property in I18n) {
-    // AUI-5431 Add to global namespace, but do not override what is set by the WRM
-    putOnI18nIfAbsent(property, I18n[property]);
-}
+const I18n = globalizeI18n(auiI18n);
+
+export { I18n, format };

package/src/js/aui/internal/globalize.js

@@ -26,14 +26,21 @@ export default function globalize(name, value) {
     return (window[NAMESPACE][name] = value);
 }
 
-export function putOnI18nIfAbsent(name, value) {
+export function globalizeI18n(localI18n) {
     initNamespace();
 
     if (typeof window[NAMESPACE][I18N_OBJECT_NAME] !== 'object') {
         window[NAMESPACE][I18N_OBJECT_NAME] = {};
     }
 
-    if (typeof window[NAMESPACE][I18N_OBJECT_NAME][name] === 'undefined') {
-        window[NAMESPACE][I18N_OBJECT_NAME][name] = value;
+    const globalI18n = window[NAMESPACE][I18N_OBJECT_NAME];
+
+    for (const property in localI18n) {
+        // AUI-5431 Add to global namespace, but do not override what is set by the WRM
+        if (typeof globalI18n[property] === 'undefined') {
+            globalI18n[property] = localI18n[property];
+        }
     }
+
+    return globalI18n;
 }